Option to remember and reuse selected fiat (#967 )

bump version
more permission checks
2025-09-03 08:23:04 +02:00 · 2024-11-08 12:01:35 +01:00 · 2024-11-05 08:46:32 +01:00 · 2024-11-05 08:42:14 +01:00 · 2024-11-03 16:19:35 +01:00 · 2024-11-01 19:51:28 +01:00
301 changed files with 11200 additions and 6762 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
  build:
    working_directory: ~/code
    docker:
-      - image: cimg/android:2022.03-ndk
+      - image: cimg/android:2023.12-ndk
    environment:
      JVM_OPTS: -Xmx3200m
    steps:
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,9 @@
 .DS_Store
 /app/build
 /app/release
-/app/alpha
-/app/prod
-/app/alphaMainnet
-/app/prodMainnet
-/app/alphaStagenet
-/app/prodStagenet
+/app/alpha*
+/app/prod*
 /app/.cxx
 /monerujo.id
+/external-libs/VERSION
+/external-libs/include/wallet2_api.h
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
    ndkVersion '17.2.4988734'
    defaultConfig {
        applicationId "com.m2049r.xmrwallet"
+        buildToolsVersion = '35.0.0'
+        compileSdk 35
        minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 3200
-        versionName "3.2.0 'Decoy Selection'"
+        targetSdkVersion 35
+        versionCode 4105
+        versionName "4.1.5 'Exolix'"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
@@ -24,7 +24,7 @@ android {
        }
    }

-    flavorDimensions 'type', 'net'
+    flavorDimensions = ['type', 'net']
    productFlavors {
        mainnet {
            dimension 'net'
@@ -58,7 +58,7 @@ android {
            applicationIdSuffix ".debug"
        }
        applicationVariants.all { variant ->
-            variant.buildConfigField "String", "ID_A", "\"" + getId("ID_A") + "\""
+            variant.buildConfigField "String", "ID_F", "\"" + getId("ID_F") + "\""
        }
    }

@@ -112,6 +112,17 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
    }
    namespace 'com.m2049r.xmrwallet'
+    buildFeatures {
+        buildConfig true
+    }
+
+    testOptions {
+        unitTests {
+            all {
+                jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+            }
+        }
+    }
 }

 static def getId(name) {
@@ -121,41 +132,40 @@ static def getId(name) {
 }

 dependencies {
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))

-    implementation 'androidx.core:core:1.10.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'

-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'

    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    implementation "com.squareup.okhttp3:okhttp:4.9.3"
-    implementation "io.github.rburgst:okhttp-digest:2.6"
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation "io.github.rburgst:okhttp-digest:3.1.0"
    implementation "com.jakewharton.timber:timber:5.0.1"

    implementation 'info.guardianproject.netcipher:netcipher:2.1.0'
    //implementation 'info.guardianproject.netcipher:netcipher-okhttp3:2.1.0'
    implementation fileTree(dir: 'libs/classes', include: ['*.jar'])
-    implementation 'com.nulab-inc:zxcvbn:1.5.2'
+    implementation 'com.nulab-inc:zxcvbn:1.8.2'

-    implementation 'dnsjava:dnsjava:2.1.9'
-    implementation 'org.jitsi:dnssecjava:1.2.0'
-    implementation 'org.slf4j:slf4j-nop:1.7.36'
+    implementation 'dnsjava:dnsjava:3.5.3'
+    implementation 'org.slf4j:slf4j-nop:2.0.11'
    implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'

    //noinspection GradleDependency
    testImplementation "junit:junit:4.13.2"
    testImplementation "org.mockito:mockito-all:1.10.19"
-    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
-    testImplementation 'org.json:json:20211205'
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
+    testImplementation 'org.json:json:20231013'
    testImplementation 'net.jodah:concurrentunit:0.4.6'

-    compileOnly 'org.projectlombok:lombok:1.18.22'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">

+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
@@ -8,6 +17,7 @@
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />

    <queries>
        <intent>
@@ -94,7 +104,12 @@
            android:name=".service.WalletService"
            android:description="@string/service_description"
            android:exported="false"
-            android:label="Monero Wallet Service" />
+            android:foregroundServiceType="specialUse"
+            android:label="Monero Wallet Service">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Keeps app in sync with the blockchain" />
+        </service>

        <provider
            android:name="androidx.core.content.FileProvider"
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
--- a/app/src/main/cpp/monerujo.h
+++ b/app/src/main/cpp/monerujo.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 m2049r
+ * Copyright (c) 2017-2024 m2049r
 * <p>
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@

 #include <jni.h>

+#include <string>
+
 /*
 #include <android/log.h>

@@ -28,6 +30,10 @@
 #define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
 */

+void ThrowException(JNIEnv *jenv, const char* type, const char* msg) {
+    jenv->ThrowNew(jenv->FindClass(type), msg);
+}
+
 jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
    jclass c = env->GetObjectClass(obj);
    return env->GetFieldID(c, fieldName, "J"); // of type long
@@ -35,8 +41,16 @@ jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handl

 template<typename T>
 T *getHandle(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
+    return reinterpret_cast<T *>(env->GetLongField(obj, getHandleField(env, obj, fieldName)));
+}
+
+template<typename T>
+void destroyNativeObject(JNIEnv *env, T nativeObjectHandle, jobject obj, const char *fieldName = "handle") {
    jlong handle = env->GetLongField(obj, getHandleField(env, obj, fieldName));
-    return reinterpret_cast<T *>(handle);
+    if (handle != 0) {
+        ThrowException(env, "java/lang/IllegalStateException", "invalid handle (destroy)");
+    }
+    delete reinterpret_cast<T *>(nativeObjectHandle);
 }

 void setHandleFromLong(JNIEnv *env, jobject obj, jlong handle) {
@@ -54,7 +68,7 @@ extern "C"
 {
 #endif

-extern const char* const MONERO_VERSION; // the actual monero core version
+extern const char *const MONERO_VERSION; // the actual monero core version

 // from monero-core crypto/hash-ops.h - avoid #including monero code here
 enum {
@@ -62,18 +76,40 @@ enum {
    HASH_DATA_AREA = 136
 };

-void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed, uint64_t height);
+void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed,
+                  uint64_t height);

 inline void slow_hash(const void *data, const size_t length, char *hash) {
    cn_slow_hash(data, length, hash, 0 /*variant*/, 0 /*prehashed*/, 0 /*height*/);
 }

 inline void slow_hash_broken(const void *data, char *hash, int variant) {
-    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/, 0 /*height*/);
+    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/,
+                 0 /*height*/);
 }
-
 #ifdef __cplusplus
 }
 #endif

+namespace Monerujo {
+    class SidekickWallet {
+    public:
+        enum Status {
+            Status_Ok,
+            Status_Error,
+            Status_Critical
+        };
+
+        SidekickWallet(uint8_t networkType, std::string a, std::string b);
+
+        ~SidekickWallet();
+
+        std::string call(int commandId, const std::string &request);
+
+        void reset();
+
+        Status status() const;
+
+    };
+}
 #endif //XMRWALLET_WALLET_LIB_H
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
@@ -16,12 +16,26 @@

 package com.m2049r.xmrwallet;

+import android.Manifest;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;

+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;

 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
@@ -35,18 +49,13 @@ public class BaseActivity extends SecureActivity

    ProgressDialog progressDialog = null;

-    private class SimpleProgressDialog extends ProgressDialog {
+    private static class SimpleProgressDialog extends ProgressDialog {

        SimpleProgressDialog(Context context, int msgId) {
            super(context);
            setCancelable(false);
            setMessage(context.getString(msgId));
        }
-
-        @Override
-        public void onBackPressed() {
-            // prevent back button
-        }
    }

    @Override
@@ -59,13 +68,15 @@ public class BaseActivity extends SecureActivity
        progressDialog = new SimpleProgressDialog(BaseActivity.this, msgId);
        if (delayMillis > 0) {
            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                public void run() {
-                    if (progressDialog != null) progressDialog.show();
+            handler.postDelayed(() -> {
+                if (progressDialog != null) {
+                    progressDialog.show();
+                    disableBackPressed();
                }
            }, delayMillis);
        } else {
            progressDialog.show();
+            disableBackPressed();
        }
    }

@@ -75,6 +86,7 @@ public class BaseActivity extends SecureActivity
        progressDialog = new LedgerProgressDialog(BaseActivity.this, mode);
        Ledger.setListener((Ledger.Listener) progressDialog);
        progressDialog.show();
+        disableBackPressed();
    }

    @Override
@@ -87,6 +99,28 @@ public class BaseActivity extends SecureActivity
            progressDialog.dismiss();
        }
        progressDialog = null;
+        enableBackPressed();
+    }
+
+    OnBackPressedCallback backPressedCallback = new OnBackPressedCallback(false) {
+        @Override
+        public void handleOnBackPressed() {
+            // no going back
+        }
+    };
+
+    public void disableBackPressed() {
+        backPressedCallback.setEnabled(true);
+    }
+
+    public void enableBackPressed() {
+        backPressedCallback.setEnabled(false);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getOnBackPressedDispatcher().addCallback(this, backPressedCallback);
    }

    static final int RELEASE_WAKE_LOCK_DELAY = 5000; // millisconds
@@ -136,4 +170,87 @@ public class BaseActivity extends SecureActivity
        barcodeData = null;
        return popped;
    }
+
+    public boolean isNetworkAvailable() {
+        ConnectivityManager connectivityManager = (ConnectivityManager) getApplication().getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Network network = connectivityManager.getActiveNetwork();
+            if (network == null) return false;
+            NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(network);
+            return networkCapabilities != null && (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH));
+        } else {
+            NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+            return networkInfo != null && networkInfo.isConnected();
+        }
+    }
+
+    static private final int REQUEST_CODE_BLUETOOTH_PERMISSIONS = 32423;
+
+    void btPermissionGranted() {
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == REQUEST_CODE_BLUETOOTH_PERMISSIONS) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
+                btPermissionGranted();
+            } // else onResume() takes care of trying again
+        }
+    }
+
+    private void showBtPermissionsDialog() {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+        alertDialogBuilder.setMessage(R.string.bluetooth_permissions);
+        alertDialogBuilder.setPositiveButton(R.string.bluetooth_permissions_ok,
+                (dialog, which) -> requestBtPermissions());
+        alertDialogBuilder.setCancelable(false);
+        AlertDialog alertDialog = alertDialogBuilder.create();
+        alertDialog.show();
+    }
+
+    private void showAppInfoDialog() {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+        alertDialogBuilder.setMessage(R.string.bluetooth_permissions);
+        alertDialogBuilder.setPositiveButton(R.string.bluetooth_permissions_settings, (dialog, which) -> {
+            Intent i = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            i.addCategory(Intent.CATEGORY_DEFAULT);
+            i.setData(Uri.parse("package:" + getPackageName()));
+            startActivity(i);
+        });
+        alertDialogBuilder.setNegativeButton(R.string.bluetooth_permissions_cancel, (dialog, which) -> {
+            finish();
+        });
+        alertDialogBuilder.setCancelable(false);
+        AlertDialog alertDialog = alertDialogBuilder.create();
+        alertDialog.show();
+    }
+
+    private void requestBtPermissions() {
+        ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN}, REQUEST_CODE_BLUETOOTH_PERMISSIONS);
+    }
+
+    private boolean firstCheck = true;
+
+    void checkBtPermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            if ((ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) ||
+                    (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED)) {
+                if (shouldShowRequestPermissionRationale(android.Manifest.permission.BLUETOOTH_SCAN) || shouldShowRequestPermissionRationale(Manifest.permission.BLUETOOTH_CONNECT)) {
+                    showBtPermissionsDialog();
+                } else {
+                    if (firstCheck) {
+                        requestBtPermissions();
+                    } else {
+                        showAppInfoDialog();
+                    }
+                }
+            } else {
+                btPermissionGranted();
+            }
+            firstCheck = false;
+        } else {
+            btPermissionGranted();
+        }
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/BluetoothFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/BluetoothFragment.java
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
@@ -18,7 +18,6 @@ package com.m2049r.xmrwallet;

 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.Html;
@@ -67,8 +66,20 @@ public class GenerateFragment extends Fragment {
    static final String TYPE_KEY = "key";
    static final String TYPE_SEED = "seed";
    static final String TYPE_LEDGER = "ledger";
+    static final String TYPE_SIDEKICK = "sidekick";
    static final String TYPE_VIEWONLY = "view";

+    static Wallet.Device getDeviceType(String type) {
+        switch (type) {
+            case TYPE_SIDEKICK:
+                return Wallet.Device.Sidekick;
+            case TYPE_LEDGER:
+                return Wallet.Device.Ledger;
+            default:
+                return Wallet.Device.Software;
+        }
+    }
+
    private TextInputLayout etWalletName;
    private PasswordEntryView etWalletPassword;
    private LinearLayout llFingerprintAuth;
@@ -195,6 +206,7 @@ public class GenerateFragment extends Fragment {
                etWalletPassword.getEditText().setImeOptions(EditorInfo.IME_ACTION_UNSPECIFIED);
                break;
            case TYPE_LEDGER:
+            case TYPE_SIDEKICK:
                etWalletPassword.getEditText().setImeOptions(EditorInfo.IME_ACTION_DONE);
                etWalletPassword.getEditText().setOnEditorActionListener((v, actionId, event) -> {
                    if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
@@ -308,7 +320,7 @@ public class GenerateFragment extends Fragment {
    private boolean checkName() {
        String name = etWalletName.getEditText().getText().toString();
        boolean ok = true;
-        if (name.length() == 0) {
+        if (name.isEmpty()) {
            etWalletName.setError(getString(R.string.generate_wallet_name));
            ok = false;
        } else if (name.charAt(0) == '.') {
@@ -450,11 +462,12 @@ public class GenerateFragment extends Fragment {
                activityCallback.onGenerate(name, crazyPass, seed, offset, height);
                break;
            case TYPE_LEDGER:
+            case TYPE_SIDEKICK:
                bGenerate.setEnabled(false);
                if (fingerprintAuthAllowed) {
                    KeyStoreHelper.saveWalletUserPass(requireActivity(), name, password);
                }
-                activityCallback.onGenerateLedger(name, crazyPass, height);
+                activityCallback.onGenerateDevice(getDeviceType(type), name, crazyPass, height);
                break;
            case TYPE_KEY:
            case TYPE_VIEWONLY:
@@ -498,6 +511,8 @@ public class GenerateFragment extends Fragment {
                return getString(R.string.generate_wallet_type_seed);
            case TYPE_LEDGER:
                return getString(R.string.generate_wallet_type_ledger);
+            case TYPE_SIDEKICK:
+                return getString(R.string.generate_wallet_type_sidekick);
            case TYPE_VIEWONLY:
                return getString(R.string.generate_wallet_type_view);
            default:
@@ -515,7 +530,7 @@ public class GenerateFragment extends Fragment {

        void onGenerate(String name, String password, String address, String viewKey, String spendKey, long height);

-        void onGenerateLedger(String name, String password, long height);
+        void onGenerateDevice(Wallet.Device device, String name, String password, long height);

        void setTitle(String title);

@@ -555,6 +570,9 @@ public class GenerateFragment extends Fragment {
            case TYPE_LEDGER:
                inflater.inflate(R.menu.create_wallet_ledger, menu);
                break;
+            case TYPE_SIDEKICK:
+                inflater.inflate(R.menu.create_wallet_sidekick, menu);
+                break;
            case TYPE_VIEWONLY:
                inflater.inflate(R.menu.create_wallet_view, menu);
                break;
@@ -581,13 +599,11 @@ public class GenerateFragment extends Fragment {
                .setCancelable(false)
                .setPositiveButton(getString(R.string.label_ok), null)
                .setNegativeButton(getString(R.string.label_cancel),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Helper.hideKeyboardAlways(activity);
-                                etWalletMnemonic.getEditText().getText().clear();
-                                dialog.cancel();
-                                ledgerDialog = null;
-                            }
+                        (dialog, id) -> {
+                            Helper.hideKeyboardAlways(activity);
+                            etWalletMnemonic.getEditText().getText().clear();
+                            dialog.cancel();
+                            ledgerDialog = null;
                        });

        ledgerDialog = alertDialogBuilder.create();
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
@@ -40,6 +40,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -98,6 +99,13 @@ public class GenerateReviewFragment extends Fragment {
    private String walletPath;
    private String walletName;

+    private final OnBackPressedCallback backPressedCallback = new OnBackPressedCallback(false) {
+        @Override
+        public void handleOnBackPressed() {
+            // nothing
+        }
+    };
+
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
@@ -156,10 +164,14 @@ public class GenerateReviewFragment extends Fragment {
        });

        Bundle args = getArguments();
+        assert args != null;
        type = args.getString(REQUEST_TYPE);
        walletPath = args.getString(REQUEST_PATH);
        localPassword = args.getString(REQUEST_PASSWORD);
        showDetails();
+        if (type.equals(GenerateReviewFragment.VIEW_TYPE_ACCEPT)) {
+            backPressedCallback.setEnabled(true);
+        }
        return view;
    }

@@ -243,7 +255,7 @@ public class GenerateReviewFragment extends Fragment {
            showProgress();
            if ((walletPath != null)
                    && (WalletManager.getInstance().queryWalletDevice(walletPath + ".keys", getPassword())
-                    == Wallet.Device.Device_Ledger)
+                    == Wallet.Device.Ledger)
                    && (progressCallback != null)) {
                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
                dialogOpened = true;
@@ -275,10 +287,11 @@ public class GenerateReviewFragment extends Fragment {
            height = wallet.getRestoreHeight();
            seed = wallet.getSeed(getSeedOffset());
            switch (wallet.getDeviceType()) {
-                case Device_Ledger:
+                case Ledger:
                    viewKey = Ledger.Key();
                    break;
-                case Device_Software:
+                case Software:
+                case Sidekick:
                    viewKey = wallet.getSecretViewKey();
                    break;
                default:
@@ -420,14 +433,11 @@ public class GenerateReviewFragment extends Fragment {
        pbProgress.setVisibility(View.INVISIBLE);
    }

-    boolean backOk() {
-        return !type.equals(GenerateReviewFragment.VIEW_TYPE_ACCEPT);
-    }
-
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        requireActivity().getOnBackPressedDispatcher().addCallback(this, backPressedCallback);
    }

    @Override
--- a/app/src/main/java/com/m2049r/xmrwallet/LockFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LockFragment.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import timber.log.Timber;
+
+public class LockFragment extends Fragment {
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+        final FrameLayout frame = new FrameLayout(requireContext());
+        frame.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        return frame;
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
@@ -35,6 +35,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -45,6 +46,7 @@ import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.m2049r.xmrwallet.data.NodeInfo;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
 import com.m2049r.xmrwallet.layout.WalletInfoAdapter;
+import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.KeyStoreHelper;
@@ -60,6 +62,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;

+import lombok.Getter;
 import timber.log.Timber;

 public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInteractionListener,
@@ -114,7 +117,9 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

        Set<NodeInfo> getOrPopulateFavourites();

-        boolean hasLedger();
+        boolean hasDevice(Wallet.Device type);
+
+        boolean isNetworkAvailable();

        void runOnNetCipher(Runnable runnable);
    }
@@ -145,9 +150,15 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        activityCallback.setToolbarButton(Toolbar.BUTTON_SETTINGS);
        activityCallback.showNet();
        showNetwork();
-        //activityCallback.runOnNetCipher(this::pingSelectedNode);
    }

+    private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(false) {
+        @Override
+        public void handleOnBackPressed() {
+            animateFAB();
+        }
+    };
+
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
@@ -164,6 +175,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        fabSeed = view.findViewById(R.id.fabSeed);
        fabImport = view.findViewById(R.id.fabImport);
        fabLedger = view.findViewById(R.id.fabLedger);
+        fabSidekick = view.findViewById(R.id.fabSidekick);

        fabNewL = view.findViewById(R.id.fabNewL);
        fabViewL = view.findViewById(R.id.fabViewL);
@@ -171,6 +183,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        fabSeedL = view.findViewById(R.id.fabSeedL);
        fabImportL = view.findViewById(R.id.fabImportL);
        fabLedgerL = view.findViewById(R.id.fabLedgerL);
+        fabSidekickL = view.findViewById(R.id.fabSidekickL);

        fab_pulse = AnimationUtils.loadAnimation(getContext(), R.anim.fab_pulse);
        fab_open_screen = AnimationUtils.loadAnimation(getContext(), R.anim.fab_open_screen);
@@ -186,6 +199,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        fabSeed.setOnClickListener(this);
        fabImport.setOnClickListener(this);
        fabLedger.setOnClickListener(this);
+        fabSidekick.setOnClickListener(this);
        fabScreen.setOnClickListener(this);

        RecyclerView recyclerView = view.findViewById(R.id.list);
@@ -194,6 +208,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        recyclerView.setAdapter(adapter);

        ViewGroup llNotice = view.findViewById(R.id.llNotice);
+
        Notice.showAll(llNotice, ".*_login");

        view.findViewById(R.id.llNode).setOnClickListener(v -> startNodePrefs());
@@ -268,7 +283,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        }

        // remove information of non-existent wallet
-        Set<String> removedWallets = getActivity()
+        Set<String> removedWallets = requireActivity()
                .getSharedPreferences(KeyStoreHelper.SecurityConstants.WALLET_PASS_PREFS_NAME, Context.MODE_PRIVATE)
                .getAll().keySet();
        for (WalletManager.WalletInfo s : walletList) {
@@ -287,6 +302,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        requireActivity().getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
    }

    @Override
@@ -295,25 +311,30 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        super.onCreateOptionsMenu(menu, inflater);
    }

-    private boolean isFabOpen = false;
-    private FloatingActionButton fab, fabNew, fabView, fabKey, fabSeed, fabImport, fabLedger;
+    @Getter
+    private boolean fabOpen = false;
+    private FloatingActionButton fab, fabNew, fabView, fabKey, fabSeed, fabImport, fabLedger, fabSidekick;
    private RelativeLayout fabScreen;
-    private RelativeLayout fabNewL, fabViewL, fabKeyL, fabSeedL, fabImportL, fabLedgerL;
+    private RelativeLayout fabNewL, fabViewL, fabKeyL, fabSeedL, fabImportL, fabLedgerL, fabSidekickL;
    private Animation fab_open, fab_close, rotate_forward, rotate_backward, fab_open_screen, fab_close_screen;
    private Animation fab_pulse;

-    public boolean isFabOpen() {
-        return isFabOpen;
+    private void setFabOpen(boolean value) {
+        fabOpen = value;
+        onBackPressedCallback.setEnabled(value);
    }

    public void animateFAB() {
-        if (isFabOpen) { // close the fab
+        if (isFabOpen()) { // close the fab
            fabScreen.setClickable(false);
            fabScreen.startAnimation(fab_close_screen);
            fab.startAnimation(rotate_backward);
            if (fabLedgerL.getVisibility() == View.VISIBLE) {
                fabLedgerL.startAnimation(fab_close);
                fabLedger.setClickable(false);
+            } else if (fabSidekickL.getVisibility() == View.VISIBLE) {
+                fabSidekickL.startAnimation(fab_close);
+                fabSidekick.setClickable(false);
            } else {
                fabNewL.startAnimation(fab_close);
                fabNew.setClickable(false);
@@ -326,22 +347,30 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
                fabImportL.startAnimation(fab_close);
                fabImport.setClickable(false);
            }
-            isFabOpen = false;
+            setFabOpen(false);
        } else { // open the fab
            fabScreen.setClickable(true);
            fabScreen.startAnimation(fab_open_screen);
            fab.startAnimation(rotate_forward);
-            if (activityCallback.hasLedger()) {
-                fabLedgerL.setVisibility(View.VISIBLE);
+            if ((activityCallback.hasDevice(Wallet.Device.Ledger)
+                    || activityCallback.hasDevice(Wallet.Device.Sidekick))) {
                fabNewL.setVisibility(View.GONE);
                fabViewL.setVisibility(View.GONE);
                fabKeyL.setVisibility(View.GONE);
                fabSeedL.setVisibility(View.GONE);
                fabImportL.setVisibility(View.GONE);

-                fabLedgerL.startAnimation(fab_open);
-                fabLedger.setClickable(true);
+                if (activityCallback.hasDevice(Wallet.Device.Ledger)) {
+                    fabLedgerL.setVisibility(View.VISIBLE);
+                    fabLedgerL.startAnimation(fab_open);
+                    fabLedger.setClickable(true);
+                } else { // Sidekick
+                    fabSidekickL.setVisibility(View.VISIBLE);
+                    fabSidekickL.startAnimation(fab_open);
+                    fabSidekick.setClickable(true);
+                }
            } else {
+                fabSidekickL.setVisibility(View.GONE);
                fabLedgerL.setVisibility(View.GONE);
                fabNewL.setVisibility(View.VISIBLE);
                fabViewL.setVisibility(View.VISIBLE);
@@ -360,7 +389,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
                fabImportL.startAnimation(fab_open);
                fabImport.setClickable(true);
            }
-            isFabOpen = true;
+            setFabOpen(true);
        }
    }

@@ -372,7 +401,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
            animateFAB();
        } else if (id == R.id.fabNew) {
            fabScreen.setVisibility(View.INVISIBLE);
-            isFabOpen = false;
+            setFabOpen(false);
            activityCallback.onAddWallet(GenerateFragment.TYPE_NEW);
        } else if (id == R.id.fabView) {
            animateFAB();
@@ -390,6 +419,10 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
            Timber.d("FAB_LEDGER");
            animateFAB();
            activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
+        } else if (id == R.id.fabSidekick) {
+            Timber.d("FAB_SIDEKICK");
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_SIDEKICK);
        } else if (id == R.id.fabScreen) {
            animateFAB();
        }
@@ -412,7 +445,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    }

    private void setSubtext(String status) {
-        final Context ctx = getContext();
+        final Context ctx = requireContext();
        final Spanned text = Html.fromHtml(ctx.getString(R.string.status,
                Integer.toHexString(ThemeHelper.getThemedColor(ctx, R.attr.positiveColor) & 0xFFFFFF),
                Integer.toHexString(ThemeHelper.getThemedColor(ctx, android.R.attr.colorBackground) & 0xFFFFFF),
--- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
@@ -31,6 +31,8 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
@@ -67,7 +69,7 @@ public class NodeFragment extends Fragment

    static private int NODES_TO_FIND = 10;

-    static private NumberFormat FORMATTER = NumberFormat.getInstance();
+    static private final NumberFormat FORMATTER = NumberFormat.getInstance();

    private SwipeRefreshLayout pullToRefresh;
    private TextView tvPull;
@@ -103,7 +105,7 @@ public class NodeFragment extends Fragment
    }

    @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
        super.onAttach(context);
        if (context instanceof Listener) {
            this.activityCallback = (Listener) context;
@@ -145,6 +147,13 @@ public class NodeFragment extends Fragment
        }
    }

+    private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(false) {
+        @Override
+        public void handleOnBackPressed() {
+            Toast.makeText(requireActivity(), getString(R.string.node_refresh_wait), Toast.LENGTH_LONG).show();
+        }
+    };
+
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
@@ -187,6 +196,7 @@ public class NodeFragment extends Fragment

    private boolean refresh(int type) {
        if (asyncFindNodes != null) return false; // ignore refresh request as one is ongoing
+        onBackPressedCallback.setEnabled(true);
        asyncFindNodes = new AsyncFindNodes();
        updateRefreshElements();
        asyncFindNodes.execute(type);
@@ -197,10 +207,11 @@ public class NodeFragment extends Fragment
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        requireActivity().getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
    }

    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
        inflater.inflate(R.menu.node_menu, menu);
        super.onCreateOptionsMenu(menu, inflater);
    }
@@ -279,8 +290,7 @@ public class NodeFragment extends Fragment
            } else if (params[0] == SCAN) {
                // otherwise scan the network
                Timber.d("scanning");
-                Set<NodeInfo> seedList = new HashSet<>();
-                seedList.addAll(nodeList);
+                Set<NodeInfo> seedList = new HashSet<>(nodeList);
                nodeList.clear();
                Timber.d("seed %d", seedList.size());
                Dispatcher d = new Dispatcher(info -> publishProgress(info));
@@ -342,6 +352,7 @@ public class NodeFragment extends Fragment

        private void complete() {
            asyncFindNodes = null;
+            onBackPressedCallback.setEnabled(false);
            if (!isAdded()) return;
            //if (isCancelled()) return;
            tvPull.setText(getString(R.string.node_pull_hint));
@@ -444,7 +455,7 @@ public class NodeFragment extends Fragment

        private void closeDialog() {
            if (editDialog == null) throw new IllegalStateException();
-            Helper.hideKeyboardAlways(getActivity());
+            Helper.hideKeyboardAlways(requireActivity());
            editDialog.dismiss();
            editDialog = null;
            NodeFragment.this.editDialog = null;
@@ -575,6 +586,7 @@ public class NodeFragment extends Fragment
                }
            }
        }
+
    }

    void restoreDefaultNodes() {
--- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
@@ -32,12 +32,10 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -84,8 +82,6 @@ public class ReceiveFragment extends Fragment {
    private ImageView ivQrCode;
    private ImageView ivQrCodeFull;
    private EditText etDummy;
-    private ImageButton bCopyAddress;
-    private MenuItem shareItem;

    private Wallet wallet = null;
    private boolean isMyWallet = false;
@@ -116,11 +112,10 @@ public class ReceiveFragment extends Fragment {
        tvQrCode = view.findViewById(R.id.tvQrCode);
        ivQrCodeFull = view.findViewById(R.id.qrCodeFull);
        etDummy = view.findViewById(R.id.etDummy);
-        bCopyAddress = view.findViewById(R.id.bCopyAddress);

        etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);

-        bCopyAddress.setOnClickListener(v -> copyAddress());
+        view.findViewById(R.id.bCopyAddress).setOnClickListener(v -> copyAddress());

        evAmount.setOnNewAmountListener(xmr -> {
            Timber.d("new amount = %s", xmr);
@@ -211,8 +206,7 @@ public class ReceiveFragment extends Fragment {
        inflater.inflate(R.menu.receive_menu, menu);
        super.onCreateOptionsMenu(menu, inflater);

-        shareItem = menu.findItem(R.id.menu_item_share);
-        shareItem.setOnMenuItemClickListener(item -> {
+        menu.findItem(R.id.menu_item_share).setOnMenuItemClickListener(item -> {
            if (shareRequested) return true;
            shareRequested = true;
            if (!qrValid) {
@@ -238,7 +232,7 @@ public class ReceiveFragment extends Fragment {
    private boolean saveQrCode() {
        if (!qrValid) throw new IllegalStateException("trying to save null qr code!");

-        File cachePath = new File(getActivity().getCacheDir(), "images");
+        File cachePath = new File(requireActivity().getCacheDir(), "images");
        if (!cachePath.exists())
            if (!cachePath.mkdirs()) throw new IllegalStateException("cannot create images folder");
        File png = new File(cachePath, "QR.png");
@@ -452,7 +446,7 @@ public class ReceiveFragment extends Fragment {
                    .withEndAction(resetSize).start();
        }
        subaddress = newSubaddress;
-        final Context context = getContext();
+        final Context context = requireContext();
        Spanned label = Html.fromHtml(context.getString(R.string.receive_subaddress,
                Integer.toHexString(ThemeHelper.getThemedColor(context, R.attr.positiveColor) & 0xFFFFFF),
                Integer.toHexString(ThemeHelper.getThemedColor(context, android.R.attr.colorBackground) & 0xFFFFFF),
--- a/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java
@@ -24,6 +24,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;

+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;

 import com.google.zxing.BarcodeFormat;
@@ -43,7 +44,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
    private ZXingScannerView mScannerView;

    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        Timber.d("onCreateView");
        mScannerView = new ZXingScannerView(getActivity());
        return mScannerView;
@@ -85,7 +86,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
    }

    @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
        super.onAttach(context);
        if (context instanceof OnScannedListener) {
            this.onScannedListener = (OnScannedListener) context;
--- a/app/src/main/java/com/m2049r/xmrwallet/SettingsFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SettingsFragment.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;

+import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -60,7 +61,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
    private SettingsFragment.Listener activity;

    @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
        super.onAttach(context);
        if (context instanceof SettingsFragment.Listener) {
            activity = (SettingsFragment.Listener) context;
--- a/app/src/main/java/com/m2049r/xmrwallet/SidekickConnectFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SidekickConnectFragment.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.m2049r.xmrwallet.data.BluetoothInfo;
+import com.m2049r.xmrwallet.layout.BluetoothInfoAdapter;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SidekickConnectFragment extends Fragment
+        implements BluetoothInfoAdapter.OnInteractionListener {
+
+    private BluetoothAdapter bluetoothAdapter;
+
+    private SwipeRefreshLayout pullToRefresh;
+
+    private BluetoothInfoAdapter infoAdapter;
+
+    private Listener activityCallback;
+
+    public interface Listener {
+        void setToolbarButton(int type);
+
+        void setSubtitle(String title);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+        } else {
+            if (bluetoothAdapter.isDiscovering()) {
+                bluetoothAdapter.cancelDiscovery();
+            }
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.label_bluetooth));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+        final BluetoothFragment btFragment = (BluetoothFragment) getChildFragmentManager().findFragmentById(R.id.bt_fragment);
+        assert btFragment != null;
+        btFragment.start();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+        View view = inflater.inflate(R.layout.fragment_sidekick_connect, container, false);
+
+        RecyclerView recyclerView = view.findViewById(R.id.list);
+        infoAdapter = new BluetoothInfoAdapter(this);
+        recyclerView.setAdapter(infoAdapter);
+
+        pullToRefresh = view.findViewById(R.id.pullToRefresh);
+        pullToRefresh.setOnRefreshListener(() -> {
+            populateList();
+            pullToRefresh.setRefreshing(false);
+        });
+
+        return view;
+    }
+
+    private void populateList() {
+        List<BluetoothInfo> items = new ArrayList<>();
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+            return;
+        }
+        for (BluetoothDevice device : bluetoothAdapter.getBondedDevices()) {
+            final int deviceCLass = device.getBluetoothClass().getDeviceClass();
+            switch (deviceCLass) {
+                case BluetoothClass.Device.PHONE_SMART:
+                    //TODO verify these are correct
+                case BluetoothClass.Device.COMPUTER_HANDHELD_PC_PDA:
+                case BluetoothClass.Device.COMPUTER_PALM_SIZE_PC_PDA:
+                    items.add(new BluetoothInfo(device));
+            }
+        }
+        infoAdapter.setItems(items);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        Helper.hideKeyboard(getActivity());
+
+        // Get the local Bluetooth adapter
+        bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        populateList();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.sidekick_connect_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        // Make sure we're not doing discovery anymore
+        if (bluetoothAdapter != null) {
+            if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+                return;
+            }
+            bluetoothAdapter.cancelDiscovery();
+        }
+    }
+
+    @Override
+    public void onInteraction(final View view, final BluetoothInfo item) {
+        Timber.d("onInteraction %s", item);
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED)
+            throw new IllegalStateException("Bluetooth permission not granted");
+        bluetoothAdapter.cancelDiscovery();
+
+        final BluetoothFragment btFragment = (BluetoothFragment) getChildFragmentManager().findFragmentById(R.id.bt_fragment);
+        assert btFragment != null;
+        btFragment.connectDevice(item.getAddress());
+    }
+
+    public void allowClick() {
+        infoAdapter.allowClick(true);
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
@@ -195,7 +195,7 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
        @Override
        protected void onPreExecute() {
            super.onPreExecute();
-            if ((wallet.getDeviceType() == Wallet.Device.Device_Ledger) && (progressCallback != null)) {
+            if ((wallet.getDeviceType() == Wallet.Device.Ledger) && (progressCallback != null)) {
                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
                dialogOpened = true;
            }
@@ -226,7 +226,7 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte

    // Callbacks from SubaddressInfoAdapter
    @Override
-    public void onInteraction(final View view, final Subaddress subaddress) {
+    public void onInteraction(final View view, @NonNull final Subaddress subaddress) {
        if (managerMode)
            activityCallback.showSubaddress(view, subaddress.getAddressIndex());
        else
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java
@@ -52,7 +52,6 @@ public class SubaddressInfoFragment extends Fragment
    private Subaddress subaddress;

    private TextInputLayout etName;
-    private TextView tvAddress;
    private TextView tvTxLabel;

    @Override
@@ -61,7 +60,6 @@ public class SubaddressInfoFragment extends Fragment
        View view = inflater.inflate(R.layout.fragment_subaddressinfo, container, false);

        etName = view.findViewById(R.id.etName);
-        tvAddress = view.findViewById(R.id.tvAddress);
        tvTxLabel = view.findViewById(R.id.tvTxLabel);

        final RecyclerView list = view.findViewById(R.id.list);
@@ -71,11 +69,13 @@ public class SubaddressInfoFragment extends Fragment
        final Wallet wallet = activityCallback.getWallet();

        Bundle b = getArguments();
+        assert b != null;
        final int subaddressIndex = b.getInt("subaddressIndex");
        subaddress = wallet.getSubaddressObject(subaddressIndex);

        etName.getEditText().setText(subaddress.getDisplayLabel());
-        tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle,
+        final TextView tvAddress = view.findViewById(R.id.tvAddress);
+        tvAddress.setText(requireContext().getString(R.string.subbaddress_info_subtitle,
                subaddress.getAddressIndex(), subaddress.getAddress()));

        etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
--- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Paint;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.InputType;
@@ -34,6 +33,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.transition.Transition;
@@ -44,6 +44,8 @@ import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.service.shift.ShiftService;
+import com.m2049r.xmrwallet.service.shift.api.ShiftApi;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
@@ -61,6 +63,7 @@ public class TxFragment extends Fragment {

    static public final String ARG_INFO = "info";

+    @SuppressLint("SimpleDateFormat")
    private final SimpleDateFormat TS_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");

    public TxFragment() {
@@ -79,6 +82,7 @@ public class TxFragment extends Fragment {
    private TextView tvTxPaymentId;
    private TextView tvTxBlockheight;
    private TextView tvTxAmount;
+    private TextView tvTxPocketChangeAmount;
    private TextView tvTxFee;
    private TextView tvTxTransfers;
    private TextView etTxNotes;
@@ -105,6 +109,7 @@ public class TxFragment extends Fragment {
        tvTxAmountBtc = view.findViewById(R.id.tvTxAmountBtc);
        tvXmrToSupport = view.findViewById(R.id.tvXmrToSupport);
        tvXmrToKeyLabel = view.findViewById(R.id.tvXmrToKeyLabel);
+
        tvXmrToLogo = view.findViewById(R.id.tvXmrToLogo);

        tvAccount = view.findViewById(R.id.tvAccount);
@@ -116,6 +121,7 @@ public class TxFragment extends Fragment {
        tvTxPaymentId = view.findViewById(R.id.tvTxPaymentId);
        tvTxBlockheight = view.findViewById(R.id.tvTxBlockheight);
        tvTxAmount = view.findViewById(R.id.tvTxAmount);
+        tvTxPocketChangeAmount = view.findViewById(R.id.tvTxPocketChangeAmount);
        tvTxFee = view.findViewById(R.id.tvTxFee);
        tvTxTransfers = view.findViewById(R.id.tvTxTransfers);
        etTxNotes = view.findViewById(R.id.etTxNotes);
@@ -125,18 +131,20 @@ public class TxFragment extends Fragment {
        tvWarning = view.findViewById(R.id.tvWarning);

        tvTxXmrToKey.setOnClickListener(v -> {
-            Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
+            Helper.clipBoardCopy(requireActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
            Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
        });

-        info = getArguments().getParcelable(ARG_INFO);
+        final Bundle args = getArguments();
+        assert args != null;
+        info = args.getParcelable(ARG_INFO);
        show();
        return view;
    }

    void shareTxInfo() {
        if (this.info == null) return;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();

        sb.append(getString(R.string.tx_timestamp)).append(":\n");
        sb.append(TS_FORMATTER.format(new Date(info.timestamp * 1000))).append("\n\n");
@@ -214,7 +222,7 @@ public class TxFragment extends Fragment {

    private void showSubaddressLabel() {
        final Subaddress subaddress = activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex);
-        final Context ctx = getContext();
+        final Context ctx = requireContext();
        Spanned label = Html.fromHtml(ctx.getString(R.string.tx_account_formatted,
                info.accountIndex, info.addressIndex,
                Integer.toHexString(ThemeHelper.getThemedColor(ctx, R.attr.positiveColor) & 0xFFFFFF),
@@ -249,8 +257,10 @@ public class TxFragment extends Fragment {
        }
        String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");

-        long realAmount = info.amount;
-        tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));
+        tvTxAmount.setText(sign + Wallet.getDisplayAmount(info.amount));
+        final long pcAmount = info.getPocketChangeAmount();
+        tvTxPocketChangeAmount.setVisibility(pcAmount > 0 ? View.VISIBLE : View.GONE);
+        tvTxPocketChangeAmount.setText(getString(R.string.pocketchange_tx_detail, Wallet.getDisplayAmount(pcAmount)));

        if ((info.fee > 0)) {
            String fee = Wallet.getDisplayAmount(info.fee);
@@ -260,16 +270,17 @@ public class TxFragment extends Fragment {
            tvTxFee.setVisibility(View.GONE);
        }

+        final Context ctx = requireContext();
        if (info.isFailed) {
            tvTxAmount.setText(getString(R.string.tx_list_amount_failed, Wallet.getDisplayAmount(info.amount)));
            tvTxFee.setText(getString(R.string.tx_list_failed_text));
-            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor));
+            setTxColour(ThemeHelper.getThemedColor(ctx, R.attr.neutralColor));
        } else if (info.isPending) {
-            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor));
+            setTxColour(ThemeHelper.getThemedColor(ctx, R.attr.neutralColor));
        } else if (info.direction == TransactionInfo.Direction.Direction_In) {
-            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.positiveColor));
+            setTxColour(ThemeHelper.getThemedColor(ctx, R.attr.positiveColor));
        } else {
-            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.negativeColor));
+            setTxColour(ThemeHelper.getThemedColor(ctx, R.attr.negativeColor));
        }
        Set<String> destinations = new HashSet<>();
        StringBuilder sb = new StringBuilder();
@@ -324,31 +335,29 @@ public class TxFragment extends Fragment {
    void showBtcInfo() {
        if (userNotes.xmrtoKey != null) {
            cvXmrTo.setVisibility(View.VISIBLE);
-            String key = userNotes.xmrtoKey;
-            if ("xmrto".equals(userNotes.xmrtoTag)) { // legacy xmr.to service :(
-                key = "xmrto-" + key;
-            }
-            tvTxXmrToKey.setText(key);
+
+            ShiftService service = ShiftService.findWithTag(userNotes.xmrtoTag);
+            tvXmrToKeyLabel.setText(getString(R.string.label_send_btc_xmrto_key_lb, service.getLabel()));
+            if (service.getIconId() == 0)
+                tvXmrToLogo.setVisibility(View.GONE);
+            else
+                tvXmrToLogo.setImageResource(service.getLogoId());
+
+            tvTxXmrToKey.setText(userNotes.xmrtoKey);
+
            tvDestinationBtc.setText(userNotes.xmrtoDestination);
            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " " + userNotes.xmrtoCurrency);
-            switch (userNotes.xmrtoTag) {
-                case "xmrto":
-                    tvXmrToSupport.setVisibility(View.GONE);
-                    tvXmrToKeyLabel.setVisibility(View.INVISIBLE);
-                    tvXmrToLogo.setImageResource(R.drawable.ic_xmrto_logo);
-                    break;
-                case "side": // defaults in layout - just add underline
-                    tvXmrToSupport.setPaintFlags(tvXmrToSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-                    tvXmrToSupport.setOnClickListener(v -> {
-                        Uri uri = Uri.parse("https://sideshift.ai/orders/" + userNotes.xmrtoKey);
-                        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                        startActivity(intent);
-                    });
-                    break;
-                default:
-                    tvXmrToSupport.setVisibility(View.GONE);
-                    tvXmrToKeyLabel.setVisibility(View.INVISIBLE);
-                    tvXmrToLogo.setVisibility(View.GONE);
+
+            ShiftApi shiftApi = service.getShiftApi();
+            if (shiftApi != null) {
+                tvXmrToSupport.setText(getString(R.string.label_send_btc_xmrto_info, service.getLabel()));
+                tvXmrToSupport.setPaintFlags(tvXmrToSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+                tvXmrToSupport.setOnClickListener(v -> {
+                    startActivity(new Intent(Intent.ACTION_VIEW, shiftApi.getQueryOrderUri(userNotes.xmrtoKey)));
+                });
+            } else {
+                tvXmrToSupport.setVisibility(View.GONE);
+                tvXmrToKeyLabel.setVisibility(View.INVISIBLE);
            }
        } else {
            cvXmrTo.setVisibility(View.GONE);
@@ -365,7 +374,7 @@ public class TxFragment extends Fragment {
    }

    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
        inflater.inflate(R.menu.tx_info_menu, menu);
        super.onCreateOptionsMenu(menu, inflater);
    }
@@ -393,7 +402,7 @@ public class TxFragment extends Fragment {
    }

    @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
        super.onAttach(context);
        if (context instanceof TxFragment.Listener) {
            this.activityCallback = (TxFragment.Listener) context;
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -51,6 +51,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.StickyFiatHelper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;

@@ -112,7 +113,7 @@ public class WalletFragment extends Fragment
        flExchange = view.findViewById(R.id.flExchange);
        ((ProgressBar) view.findViewById(R.id.pbExchange)).getIndeterminateDrawable().
                setColorFilter(
-                        ThemeHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
+                        ThemeHelper.getThemedColor(requireContext(), com.google.android.material.R.attr.colorPrimaryVariant),
                        android.graphics.PorterDuff.Mode.MULTIPLY);

        tvProgress = view.findViewById(R.id.tvProgress);
@@ -131,6 +132,7 @@ public class WalletFragment extends Fragment
        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(requireContext(), R.layout.item_spinner_balance, currencies);
        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
        sCurrency.setAdapter(spinnerAdapter);
+        StickyFiatHelper.setPreferredCurrencyPosition(sCurrency);

        bSend = view.findViewById(R.id.bSend);
        bReceive = view.findViewById(R.id.bReceive);
@@ -182,6 +184,7 @@ public class WalletFragment extends Fragment
        sCurrency.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+                StickyFiatHelper.setPreferredFiatSymbol(requireContext(), (String) sCurrency.getSelectedItem());
                refreshBalance();
            }

@@ -315,13 +318,7 @@ public class WalletFragment extends Fragment
            balanceCurrency = Helper.BASE_CRYPTO;
            balanceRate = 1.0;
        } else {
-            int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
-            if (spinnerPosition < 0) { // requested currency not in list
-                Timber.e("Requested currency not in list %s", exchangeRate.getQuoteCurrency());
-                sCurrency.setSelection(0, true);
-            } else {
-                sCurrency.setSelection(spinnerPosition, true);
-            }
+            StickyFiatHelper.setCurrencyPosition(sCurrency, exchangeRate.getQuoteCurrency());
            balanceCurrency = exchangeRate.getQuoteCurrency();
            balanceRate = exchangeRate.getRate();
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java
@@ -22,7 +22,6 @@ import android.content.res.Configuration;
 import android.os.Build;

 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentManager;

 import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.util.LocaleHelper;
@@ -36,7 +35,6 @@ public class XmrWalletApplication extends Application {
    @Override
    public void onCreate() {
        super.onCreate();
-        FragmentManager.enableNewStateManager(false);
        if (BuildConfig.DEBUG) {
            Timber.plant(new Timber.DebugTree());
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
@@ -24,43 +24,38 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;

+import lombok.Getter;
 import lombok.ToString;
 import timber.log.Timber;

+@Getter
@ToString
 public class BarcodeData {
+
    public enum Security {
        NORMAL,
        OA_NO_DNSSEC,
        OA_DNSSEC
    }

-    final public Crypto asset;
-    final public List<Crypto> ambiguousAssets;
-    final public String address;
-    final public String addressName;
-    final public String amount;
-    final public String description;
-    final public Security security;
+    final private Set<Crypto> possibleAssets = new HashSet<>();
+    private String address = null;
+    private String addressName = null;
+    private String amount = null;
+    private String description = null;
+    private Security security = null;

    public BarcodeData(List<Crypto> assets, String address) {
        if (assets.isEmpty())
            throw new IllegalArgumentException("no assets specified");
-        this.addressName = null;
-        this.description = null;
-        this.amount = null;
-        this.security = Security.NORMAL;
+        security = Security.NORMAL;
        this.address = address;
-        if (assets.size() == 1) {
-            this.asset = assets.get(0);
-            this.ambiguousAssets = null;
-        } else {
-            this.asset = null;
-            this.ambiguousAssets = assets;
-        }
+        possibleAssets.addAll(assets);
    }

    public BarcodeData(Crypto asset, String address, String description, String amount) {
@@ -68,8 +63,7 @@ public class BarcodeData {
    }

    public BarcodeData(Crypto asset, String address, String addressName, String description, String amount, Security security) {
-        this.ambiguousAssets = null;
-        this.asset = asset;
+        possibleAssets.add(asset);
        this.address = address;
        this.addressName = addressName;
        this.description = description;
@@ -82,7 +76,7 @@ public class BarcodeData {
    }

    public String getUriString() {
-        if (asset != Crypto.XMR) throw new IllegalStateException("We can only do XMR stuff!");
+        if (getAsset() != Crypto.XMR) throw new IllegalStateException("We can only do XMR stuff!");
        StringBuilder sb = new StringBuilder();
        sb.append(Crypto.XMR.getUriScheme())
                .append(':')
@@ -227,6 +221,20 @@ public class BarcodeData {
    }

    public boolean isAmbiguous() {
-        return ambiguousAssets != null;
+        return possibleAssets.size() > 1;
+    }
+
+    public Crypto getAsset() {
+        if (possibleAssets.size() == 1) {
+            return possibleAssets.iterator().next();
+        } else {
+            return null;
+        }
+    }
+
+    // return true if we still have possible assets
+    public boolean filter(Set<Crypto> assets) {
+        possibleAssets.retainAll(assets);
+        return !possibleAssets.isEmpty();
    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/data/BluetoothInfo.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/BluetoothInfo.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import android.bluetooth.BluetoothDevice;
+
+import java.util.Comparator;
+
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+public class BluetoothInfo {
+    @Getter
+    final private String name;
+    @Getter
+    final private String address;
+    @Getter
+    private boolean bonded;
+
+    public BluetoothInfo(BluetoothDevice device) {
+        name = device.getName().trim();
+        address = device.getAddress();
+        bonded = device.getBondState() == BluetoothDevice.BOND_BONDED;
+    }
+
+    static public Comparator<BluetoothInfo> NameComparator = (o1, o2) -> o1.name.compareTo(o2.name);
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/data/Crypto.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/Crypto.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2024 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.xmrwallet.data;

 import androidx.annotation.NonNull;
@@ -5,35 +21,30 @@ import androidx.annotation.Nullable;

 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.util.validator.BitcoinAddressType;
-import com.m2049r.xmrwallet.util.validator.BitcoinAddressValidator;
-import com.m2049r.xmrwallet.util.validator.EthAddressValidator;
+
+import java.util.regex.Pattern;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
 public enum Crypto {
-    XMR("XMR", true, "monero:tx_amount:recipient_name:tx_description", R.id.ibXMR, R.drawable.ic_monero, R.drawable.ic_monero_bw, Wallet::isAddressValid),
-    BTC("BTC", true, "bitcoin:amount:label:message", R.id.ibBTC, R.drawable.ic_xmrto_btc, R.drawable.ic_xmrto_btc_off, address -> {
-        return BitcoinAddressValidator.validate(address, BitcoinAddressType.BTC);
-    }),
-    DASH("DASH", true, "dash:amount:label:message", R.id.ibDASH, R.drawable.ic_xmrto_dash, R.drawable.ic_xmrto_dash_off, address -> {
-        return BitcoinAddressValidator.validate(address, BitcoinAddressType.DASH);
-    }),
-    DOGE("DOGE", true, "dogecoin:amount:label:message", R.id.ibDOGE, R.drawable.ic_xmrto_doge, R.drawable.ic_xmrto_doge_off, address -> {
-        return BitcoinAddressValidator.validate(address, BitcoinAddressType.DOGE);
-    }),
-    ETH("ETH", false, "ethereum:amount:label:message", R.id.ibETH, R.drawable.ic_xmrto_eth, R.drawable.ic_xmrto_eth_off, EthAddressValidator::validate),
-    LTC("LTC", true, "litecoin:amount:label:message", R.id.ibLTC, R.drawable.ic_xmrto_ltc, R.drawable.ic_xmrto_ltc_off, address -> {
-        return BitcoinAddressValidator.validate(address, BitcoinAddressType.LTC);
-    });
+    XMR("XMR", "XMR", "XMR", "monero:tx_amount:recipient_name:tx_description", R.id.ibXMR, R.drawable.ic_monero, R.drawable.ic_monero_bw, Pattern.compile("^[48][a-zA-Z|\\d]{94}([a-zA-Z|\\d]{11})?$")),
+    BTC("BTC", "BTC", "BTC", "bitcoin:amount:label:message", R.id.ibBTC, R.drawable.ic_xmrto_btc, R.drawable.ic_xmrto_btc_off, Pattern.compile("^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$|^(bc1q)|(bc1p)[0-9A-Za-z]{37,62}$")),
+    LTC("LTC", "LTC", "LTC", "litecoin:amount:label:message", R.id.ibLTC, R.drawable.ic_xmrto_ltc, R.drawable.ic_xmrto_ltc_off, Pattern.compile("^([LM3])[A-Za-z0-9]{33}$|^(ltc1)[0-9A-Za-z]{39}$")),
+    ETH("ETH", "ETH", "ETH", "ethereum:amount:label:message", R.id.ibETH, R.drawable.ic_xmrto_eth, R.drawable.ic_xmrto_eth_off, Pattern.compile("^(0x)[0-9A-Fa-f]{40}$")),
+    USDT("USDT", "TRX", "USDT(TRC20)", "usdt:amount:label:message", R.id.ibUSDT, R.drawable.ic_xmrto_usdt_trc20, R.drawable.ic_xmrto_usdt_trc20_off, Pattern.compile("^T[1-9A-HJ-NP-Za-km-z]{33}$")),
+    SOLANA("SOL", "SOL", "SOL", "solana:amount:label:message", R.id.ibSOL, R.drawable.ic_xmrto_sol, R.drawable.ic_xmrto_sol_off, Pattern.compile("^[1-9A-HJ-NP-Za-km-z]{32,44}$"));

    @Getter
    @NonNull
    private final String symbol;
    @Getter
-    private final boolean casefull;
+    @NonNull
+    private final String network;
+    @Getter
+    @NonNull
+    private final String label;
    @NonNull
    private final String uriSpec;
    @Getter
@@ -43,7 +54,7 @@ public enum Crypto {
    @Getter
    private final int iconDisabledId;
    @NonNull
-    private final Validator validator;
+    private final Pattern regex;

    @Nullable
    public static Crypto withScheme(@NonNull String scheme) {
@@ -62,10 +73,6 @@ public enum Crypto {
        return null;
    }

-    interface Validator {
-        boolean validate(String address);
-    }
-
    // TODO maybe cache these segments
    String getUriScheme() {
        return uriSpec.split(":")[0];
@@ -83,7 +90,8 @@ public enum Crypto {
        return uriSpec.split(":")[3];
    }

-    boolean validate(String address) {
-        return validator.validate(address);
+    public boolean validate(String address) {
+        if (this == XMR) return Wallet.isAddressValid(address);
+        return regex.matcher(address).find();
    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/data/CryptoAmount.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/CryptoAmount.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import lombok.Value;
+
+@Value
+public class CryptoAmount {
+    Crypto crypto;
+    double amount;
+
+    public CryptoAmount newWithAmount(double amount) {
+        return new CryptoAmount(this.crypto, amount);
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java
@@ -19,21 +19,26 @@ package com.m2049r.xmrwallet.data;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

-// Nodes stolen from https://moneroworld.com/#nodes
-
+@Getter
@AllArgsConstructor
 public enum DefaultNodes {
-    MONERUJO("nodex.monerujo.io:18081"),
-    XMRTO("node.xmr.to:18081"),
-    SUPPORTXMR("node.supportxmr.com:18081"),
-    HASHVAULT("nodes.hashvault.pro:18081"),
-    MONEROWORLD("node.moneroworld.com:18089"),
-    XMRTW("opennode.xmr-tw.org:18089"),
-    MONERUJO_ONION("monerujods7mbghwe6cobdr6ujih6c22zu5rl7zshmizz2udf7v7fsad.onion:18081/mainnet/monerujo.onion"),
-    Criminales78("56wl7y2ebhamkkiza4b7il4mrzwtyvpdym7bm2bkg3jrei2je646k3qd.onion:18089/mainnet/Criminales78.onion"),
-    xmrfail("mxcd4577fldb3ppzy7obmmhnu3tf57gbcbd4qhwr2kxyjj2qi3dnbfqd.onion:18081/mainnet/xmrfail.onion"),
-    boldsuck("6dsdenp6vjkvqzy4wzsnzn6wixkdzihx3khiumyzieauxuxslmcaeiad.onion:18081/mainnet/boldsuck.onion");
+    AGORIST("xmr.agor.ist:18089/mainnet/agor.ist"),
+    BOLDSUCK("xmr-de.boldsuck.org:18080/mainnet/boldsuck.org"),
+    boldsuck("6dsdenp6vjkvqzy4wzsnzn6wixkdzihx3khiumyzieauxuxslmcaeiad.onion:18081/mainnet/boldsuck.onion"),
+    CAKE("xmr-node.cakewallet.com:18081/mainnet/cakewallet.com"),
+    DS_JETZT("monero.ds-jetzt.de:18089/mainnet/ds-jetzt.de"),
+    ds_jetzt("qvlr4w7yhnjrdg3txa72jwtpnjn4ezsrivzvocbnvpfbdo342fahhoad.onion:18089/mainnet/ds-jetzt.onion"),
+    MONERODEVS("node.monerodevs.org:18089/mainnet/monerodevs.org"),
+    MONERUJO("nodex.monerujo.io:18081/mainnet/monerujo.io"),
+    monerujo("monerujods7mbghwe6cobdr6ujih6c22zu5rl7zshmizz2udf7v7fsad.onion:18081/mainnet/monerujo.onion"),
+    SETH("node.sethforprivacy.com:18089/mainnet/sethforprivacy.com"),
+    seth("sfpp2p7wnfjv3lrvfan4jmmkvhnbsbimpa3cqyuf7nt6zd24xhcqcsyd.onion/mainnet/sethforprivacy.onion"),
+    STACK("monero.stackwallet.com:18081/mainnet/stackwallet.com"),
+    STORMYCLOUD("xmr.stormycloud.org:18089/mainnet/stormycloud.org"),
+    TENZ("monero.10z.com.ar:18089/mainnet/10z.com.ar"),
+    XMRROCKS("node.xmr.rocks:18089/mainnet/xmr.rocks"),
+    xmrrocks("xqnnz2xmlmtpy2p4cm4cphg2elkwu5oob7b7so5v4wwgt44p6vbx5ryd.onion/mainnet/xmr.rocks.onion"),
+    XMRTW("opennode.xmr-tw.org:18089/mainnet/xmr-tw.org");

-    @Getter
    private final String uri;
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/data/Node.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/Node.java
@@ -144,7 +144,7 @@ public class Node {
        if ((nodeString == null) || nodeString.isEmpty())
            throw new IllegalArgumentException("daemon is empty");
        String daemonAddress;
-        String a[] = nodeString.split("@");
+        String[] a = nodeString.split("@");
        if (a.length == 1) { // no credentials
            daemonAddress = a[0];
            username = "";
@@ -169,7 +169,7 @@ public class Node {
            throw new IllegalArgumentException("Too many '/' or too few");

        daemonAddress = daParts[0];
-        String da[] = daemonAddress.split(":");
+        String[] da = daemonAddress.split(":");
        if ((da.length > 2) || (da.length < 1))
            throw new IllegalArgumentException("Too many ':' or too few");
        String host = da[0];
--- a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
@@ -201,8 +201,13 @@ public class NodeInfo extends Node {
                .port(port)
                .addPathSegment("json_rpc")
                .build();
-        final String json = "{\"jsonrpc\":\"2.0\",\"id\":\"0\",\"method\":\"getlastblockheader\"}";
-        return new Request(url, json, getUsername(), getPassword());
+
+        try {
+            final JSONObject json = new JSONObject("{\"jsonrpc\":\"2.0\",\"id\":\"0\",\"method\":\"getlastblockheader\"}");
+            return new Request(url, json, getUsername(), getPassword());
+        } catch (JSONException ex) {
+            throw new IllegalStateException(ex);
+        }
    }

    private boolean testRpcService(int port) {
@@ -270,7 +275,7 @@ public class NodeInfo extends Node {
                (hostAddress.isOnion() ? "&nbsp;.onion&nbsp;&nbsp;" : ""), " " + info));
        view.setText(text);
        if (isError)
-            view.setTextColor(ThemeHelper.getThemedColor(ctx, R.attr.colorError));
+            view.setTextColor(ThemeHelper.getThemedColor(ctx, androidx.appcompat.R.attr.colorError));
        else
            view.setTextColor(ThemeHelper.getThemedColor(ctx, android.R.attr.textColorSecondary));
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
m2049r	989d52b33d	Option to remember and reuse selected fiat (#967 )	2024-11-08 12:01:35 +01:00
m2049r	a3c0ca7ebe	bump version	2024-11-05 08:46:32 +01:00
m2049r	c9132d7d97	more permission checks	2024-11-05 08:42:14 +01:00
m2049r	758b042680	fix some crashing if bluetooth pemissions are not given (#965 ) * show error instead of crashing * ignore if fragement is no longer * bump version	2024-11-03 16:19:35 +01:00
m2049r	84ce392192	Use EXOLIX as exchange (#964 )	2024-11-01 19:51:28 +01:00
m2049r	4ebcda2b14	bump version	2024-10-17 13:39:16 +02:00
m2049r	c49351a8a9	own orbothelper & fix receiver visibility (#961 )	2024-10-17 13:01:12 +02:00
m2049r	41e84f2e29	fix receiver visibility	2024-10-17 12:42:26 +02:00
m2049r	f08ddf93c8	bump version	2024-10-16 21:31:09 +02:00
m2049r	4bfc9c1bdd	fix RECEIVER_NOT_EXPORTED crash	2024-10-16 20:18:12 +02:00
m2049r	1a13bdde91	add some default nodes	2024-10-07 23:42:23 +02:00
m2049r	3e56d5a54b	update default nodes (#959 )	2024-09-24 09:00:22 +02:00
m2049r	c64fb1a769	Merge pull request #954 from m2049r/feature/show_connected show when sidekick is connected	2024-09-19 22:44:00 +02:00
m2049r	2d2a7d2db0	show when sidekick is connected	2024-09-15 20:46:00 +02:00
m2049r	ac9e24ee9f	Merge pull request #952 from m2049r/feature/sidekick_v Support for Sidekick device	2024-09-06 00:45:48 +02:00
m2049r	059438a09e	targetSdkVersion 35	2024-09-05 23:13:11 +02:00
m2049r	d22fdfe2dc	Sidekick Support for Monerokon	2024-09-05 23:12:42 +02:00
m2049r	48577e46aa	lock in background (#936 )	2024-04-05 16:03:30 +02:00
m2049r	451371cd92	refactor onBackPressed to use the callback dispatcher (#937 )	2024-04-05 15:57:37 +02:00
m2049r	cd6f646b63	bump version	2024-03-17 14:10:14 +01:00
m2049r	aa530caa28	improve german transaltion. remove permissions translations	2024-03-17 14:04:49 +01:00
m2049r	5df43f1274	fix translation errors	2024-03-17 13:38:36 +01:00
m2049r	3b0cb3ffdb	upgrade gradle	2024-03-17 13:28:22 +01:00
m2049r	300551dbe4	update zlib to 1.3.1	2024-03-17 13:06:05 +01:00
m2049r	942519adb7	ignore monero native stuff	2024-03-17 12:53:51 +01:00
m2049r	0652a8ba14	upgrade dnsjava (#924 )	2024-01-13 17:33:23 +01:00
m2049r	04d0bd2ffb	fix tests	2024-01-13 16:14:05 +01:00
m2049r	8473e66c69	upgrade dependencies	2024-01-13 15:58:00 +01:00
m2049r	2218ff615c	fix unescaped quotes	2024-01-13 15:41:23 +01:00
m2049r	54b55b9f8f	optimize build time	2024-01-13 15:33:21 +01:00
m2049r	5abf84f62b	optimize build time	2024-01-13 15:31:14 +01:00
m2049r	6ff75d221f	add RSD (#923 )	2024-01-13 14:28:30 +01:00
audioz	c90f107c3c	Hebrew Translation (#895 )	2024-01-13 14:13:56 +01:00
Digitale Souveränität - JETZT!	a3db18032e	add ds-jetzt node (#905 ) add ds-jetzt node as clear & onion	2024-01-13 14:13:18 +01:00
anhdres	9db2c10679	updated texts for eng and spa (#911 ) Co-authored-by: m2049r <m2049r@monerujo.io>	2024-01-13 14:11:41 +01:00
XD22	eab85c7f0a	Fix Docker libs Builds (#918 ) Co-authored-by: m2049r <m2049r@monerujo.io>	2024-01-13 14:08:02 +01:00
kuznetsovgm	6bf3229e77	fixed a translation error (#912 )	2024-01-13 14:05:52 +01:00
audioz	9f4f626acb	Docker build fix. (#896 ) * Hebrew Translation * ~~ https://zlib.net/ Version 1.2.13 has these key updates from 1.2.12: Fix a bug when getting a gzip header extra field with inflateGetHeader(). This remedies CVE-2022-37434. Fix a bug in block type selection when Z_FIXED used. Now the smallest block type is selected, for better compression. Fix a configure issue that discarded the provided CC definition. Correct incorrect inputs provided to the CRC functions. This mitigates a bug in Java. Repair prototypes and exporting of the new CRC functions. Fix inflateBack to detect invalid input with distances too far. Due to the first bug fix, any installations of 1.2.12 or earlier should be replaced with 1.2.13. * Delete app/src/main/res/values-he directory	2024-01-13 14:05:22 +01:00
XD22	434dab55ba	Fix TalkBack Screen reader (#917 ) * Fixing TalkBack p1 * Fix TalkBack español translate p2 * Fix TalkBack français translate p3 * Escape some apostrophe, Fix wrong Locale codes	2024-01-13 14:03:31 +01:00
m2049r	59cc6b1864	upgrade dependencies	2024-01-13 13:59:38 +01:00
m2049r	a6e9d0e77c	use yadio for pricing "exotic" fiat (#921 ) * yadio api * add more currencies * fix es typo * bump version & fix cicleci build	2023-12-10 14:24:35 +01:00
m2049r	17df7c3faf	Pocket Change V2 (#914 ) * show PC on btc confirm * random slots to refill	2023-08-28 19:24:45 +02:00
m2049r	bf1829f775	PocketChange (#901 )	2023-06-05 05:03:51 +02:00