bump version

add ds-jetzt node as clear & onion

.circleci/config.yml

@@ -3,13 +3,11 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-28-ndk
+      - image: cimg/android:2023.12-ndk
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
       - checkout
-      - run: yes | sdkmanager --licenses || exit 0
-      - run: yes | sdkmanager --update || exit 0
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:

.gitignore

@@ -16,3 +16,5 @@
 /app/prodStagenet
 /app/.cxx
 /monerujo.id
+/external-libs/VERSION
+/external-libs/include/wallet2_api.h

app/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.4.1)
+project(monerujo)
 message(STATUS ABI_INFO  = ${ANDROID_ABI})
 
 add_library( monerujo
@@ -121,7 +122,7 @@ set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
 
 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libunbound.a)
 
 add_library(epee STATIC IMPORTED)
 set_target_properties(epee PROPERTIES IMPORTED_LOCATION
@@ -171,6 +172,10 @@ add_library(wallet-crypto STATIC IMPORTED)
 set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
         ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet-crypto.a)
 
+add_library(cryptonote_format_utils_basic STATIC IMPORTED)
+set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_format_utils_basic.a)
+
 #############
 # System
 #############
@@ -193,6 +198,7 @@ target_link_libraries(  monerujo
                         wallet
                         cryptonote_core
                         cryptonote_basic
+                        cryptonote_format_utils_basic
                         mnemonics
                         ringct
                         ringct_basic

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '29.0.3'
     ndkVersion '17.2.4988734'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
+        buildToolsVersion = '34.0.0'
+        compileSdk 34
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
-        versionCode 1004
+        versionCode 3311
-        versionName "2.0.4.0 'Puginarug'"
+        versionName "3.3.11 'Argentina'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -72,7 +72,7 @@ android {
         abi {
             enable true
             reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
@@ -111,44 +111,61 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.m2049r.xmrwallet'
+    buildFeatures {
+        buildConfig true
+    }
+
+    testOptions {
+        unitTests {
+            all {
+                jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+            }
+        }
+    }
 }
 
-def getId(name) {
+static def getId(name) {
-    def Properties props = new Properties()
+    Properties props = new Properties()
     props.load(new FileInputStream(new File('monerujo.id')))
     return props[name]
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.3.2'
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.core:core:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.preference:preference:1.2.1'
+
+    implementation 'com.google.android.material:material:1.11.0'
 
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
-    implementation "io.github.rburgst:okhttp-digest:2.5"
+    implementation "io.github.rburgst:okhttp-digest:3.1.0"
-    implementation "com.jakewharton.timber:timber:4.7.1"
+    implementation "com.jakewharton.timber:timber:5.0.1"
 
-    implementation 'com.nulab-inc:zxcvbn:1.3.0'
+    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.8.2'
 
-    implementation 'dnsjava:dnsjava:2.1.9'
+    implementation 'dnsjava:dnsjava:3.5.3'
-    implementation 'org.jitsi:dnssecjava:1.2.0'
+    implementation 'org.slf4j:slf4j-nop:2.0.11'
-    implementation 'org.slf4j:slf4j-nop:1.7.30'
     implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
 
-    implementation 'com.github.aelstad:keccakj:1.1.0'
+    //noinspection GradleDependency
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.mockito:mockito-all:1.10.19"
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
+    testImplementation 'org.json:json:20231013'
+    testImplementation 'net.jodah:concurrentunit:0.4.6'
 
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    compileOnly 'org.projectlombok:lombok:1.18.30'
-    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
-    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
-    testImplementation 'org.json:json:20180813'
-    testImplementation 'net.jodah:concurrentunit:0.4.4'
-
-    compileOnly 'org.projectlombok:lombok:1.18.16'
-    annotationProcessor 'org.projectlombok:lombok:1.18.16'
 }

app/src/main/AndroidManifest.xml

@@ -1,31 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.m2049r.xmrwallet">
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <queries>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.START" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.STATUS" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_HS_PORT" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_V3_ONION_SERVICE" />
+        </intent>
+
+        <package android:name="org.torproject.android" />
+    </queries>
+
     <application
-        android:preserveLegacyExternalStorage="true"
         android:name=".XmrWalletApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:preserveLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/MyMaterialTheme"
+        android:theme="@style/MyMaterialThemeClassic"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|uiMode"
+            android:exported="true"
             android:launchMode="singleTop"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -34,27 +56,28 @@
             android:configChanges="orientation|keyboardHidden|uiMode"
             android:label="@string/wallet_activity_name"
             android:launchMode="singleTask"
-            android:screenOrientation="behind"/>
+            android:screenOrientation="behind" />
         <activity
             android:name=".LoginActivity"
-            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
-
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <data android:scheme="monero" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <data android:scheme="bitcoin" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -87,4 +110,5 @@
                 android:resource="@xml/filepaths" />
         </provider>
     </application>
-</manifest>
+
+</manifest>

app/src/main/java/com/btchip/comm/BTChipTransport.java

@@ -20,8 +20,6 @@
 
 package com.btchip.comm;
 
-import com.btchip.BTChipException;
-
 public interface BTChipTransport {
     byte[] exchange(byte[] command);
 

app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java

@@ -28,7 +28,6 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbRequest;
 
-import com.btchip.BTChipException;
 import com.btchip.comm.BTChipTransport;
 import com.btchip.comm.LedgerHelper;
 import com.btchip.utils.Dump;
@@ -78,7 +77,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
     }
 
     private static final int VID = 0x2C97;
-    private static final int[] PID_HIDS = {0x0001, 0x0004};
+    private static final int[] PID_HIDS = {0x0001, 0x0004, 0x0005};
 
     private UsbDeviceConnection connection;
     private UsbInterface dongleInterface;

app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java

@@ -77,7 +77,7 @@ public class Dispatcher implements PeerRetriever.OnGetPeers {
                     final NodeInfo nodeInfo = retrievedPeer.getNodeInfo();
                     Timber.d("Retrieved %s", nodeInfo);
                     if ((nodeInfo.isValid() || nodeInfo.isFavourite())) {
-                        nodeInfo.setName();
+                        nodeInfo.setDefaultName();
                         rpcNodes.add(nodeInfo);
                         Timber.d("RPC: %s", nodeInfo);
                         // the following is not totally correct but it works (otherwise we need to

app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java

@@ -16,35 +16,18 @@
 
 package com.m2049r.xmrwallet;
 
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.nfc.FormatException;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.Tag;
-import android.nfc.tech.Ndef;
-import android.os.AsyncTask;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
-import android.widget.Toast;
 
 import androidx.annotation.CallSuper;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
-import com.m2049r.xmrwallet.fragment.send.SendFragment;
 import com.m2049r.xmrwallet.ledger.Ledger;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
 
-import java.io.IOException;
-
 import timber.log.Timber;
 
 public class BaseActivity extends SecureActivity
@@ -140,91 +123,6 @@ public class BaseActivity extends SecureActivity
         Timber.d("WakeLock released");
     }
 
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initNfc();
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        if (nfcAdapter != null) {
-            nfcAdapter.enableForegroundDispatch(this, nfcPendingIntent, null, null);
-            // intercept all techs so we can tell the user their tag is no good
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        Timber.d("onPause()");
-        if (nfcAdapter != null)
-            nfcAdapter.disableForegroundDispatch(this);
-        super.onPause();
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        processNfcIntent(intent);
-    }
-
-    // NFC stuff
-    private NfcAdapter nfcAdapter;
-    private PendingIntent nfcPendingIntent;
-
-    public void initNfc() {
-        nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-        if (nfcAdapter == null) // no NFC support
-            return;
-        nfcPendingIntent = PendingIntent.getActivity(this, 0,
-                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP),
-                0);
-    }
-
-    private void processNfcIntent(Intent intent) {
-        String action = intent.getAction();
-        Timber.d("ACTION=%s", action);
-        if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)
-                || NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)
-                || NfcAdapter.ACTION_TECH_DISCOVERED.equals(action)) {
-            Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-            Ndef ndef = Ndef.get(tag);
-            if (ndef == null) {
-                Toast.makeText(this, getString(R.string.nfc_tag_unsupported), Toast.LENGTH_LONG).show();
-                return;
-            }
-
-            Fragment f = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
-            if (f instanceof ReceiveFragment) {
-                // We want to write a Tag from the ReceiveFragment
-                BarcodeData bc = ((ReceiveFragment) f).getBarcodeData();
-                if (bc != null) {
-                    new AsyncWriteTag(ndef, bc.getUri()).execute();
-                } // else wallet is not loaded yet or receive is otherwise not ready - ignore
-            } else if (f instanceof SendFragment) {
-                // We want to read a Tag for the SendFragment
-                NdefMessage ndefMessage = ndef.getCachedNdefMessage();
-                if (ndefMessage == null) {
-                    Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show();
-                    return;
-                }
-                NdefRecord firstRecord = ndefMessage.getRecords()[0];
-                Uri uri = firstRecord.toUri(); // we insist on the first record
-                if (uri == null) {
-                    Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show();
-                } else {
-                    BarcodeData bc = BarcodeData.fromString(uri.toString());
-                    if (bc == null)
-                        Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show();
-                    else
-                        onUriScanned(bc);
-                }
-            }
-        }
-    }
-
     // this gets called only if we get data
     @CallSuper
     void onUriScanned(BarcodeData barcodeData) {
@@ -238,75 +136,4 @@ public class BaseActivity extends SecureActivity
         barcodeData = null;
         return popped;
     }
-
-    private class AsyncWriteTag extends AsyncTask<Void, Void, Boolean> {
-
-        Ndef ndef;
-        Uri uri;
-        String errorMessage = null;
-
-        AsyncWriteTag(Ndef ndef, Uri uri) {
-            this.ndef = ndef;
-            this.uri = uri;
-        }
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            showProgressDialog(R.string.progress_nfc_write);
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            if (params.length != 0) return false;
-            try {
-                writeNdef(ndef, uri);
-                return true;
-            } catch (IOException | FormatException ex) {
-                Timber.e(ex);
-            } catch (IllegalArgumentException ex) {
-                errorMessage = ex.getMessage();
-                Timber.d(errorMessage);
-            } finally {
-                try {
-                    ndef.close();
-                } catch (IOException ex) {
-                    Timber.e(ex);
-                }
-            }
-            return false;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            super.onPostExecute(result);
-            if (isDestroyed()) {
-                return;
-            }
-            dismissProgressDialog();
-            if (!result) {
-                if (errorMessage != null)
-                    Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
-                else
-                    Toast.makeText(getApplicationContext(), getString(R.string.nfc_write_failed), Toast.LENGTH_LONG).show();
-            } else {
-                Toast.makeText(getApplicationContext(), getString(R.string.nfc_write_successful), Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-    void writeNdef(Ndef ndef, Uri uri) throws IOException, FormatException {
-        NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-        if (nfcAdapter == null) return; // no NFC support here
-
-        NdefRecord recordNFC = NdefRecord.createUri(uri);
-        NdefMessage message = new NdefMessage(recordNFC);
-        ndef.connect();
-        int tagSize = ndef.getMaxSize();
-        int msgSize = message.getByteArrayLength();
-        Timber.d("tagSize=%d, msgSIze=%d, uriSize=%d", tagSize, msgSize, uri.toString().length());
-        if (tagSize < msgSize)
-            throw new IllegalArgumentException(getString(R.string.nfc_tag_size, tagSize, msgSize));
-        ndef.writeNdefMessage(message);
-    }
 }

app/src/main/java/com/m2049r/xmrwallet/MainActivity.java

@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import com.m2049r.xmrwallet.onboarding.OnBoardingActivity;
 import com.m2049r.xmrwallet.onboarding.OnBoardingManager;

app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -59,7 +58,6 @@ import java.text.NumberFormat;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Objects;
 import java.util.Set;
 
 import timber.log.Timber;
@@ -219,8 +217,8 @@ public class NodeFragment extends Fragment
             activityCallback.setNode(nodeItem); // this marks it as selected & saves it as well
             nodeItem.setSelecting(false);
             try {
-                Objects.requireNonNull(getActivity()).runOnUiThread(() -> nodesAdapter.allowClick(true));
+                requireActivity().runOnUiThread(() -> nodesAdapter.allowClick(true));
-            } catch (NullPointerException ex) {
+            } catch (IllegalStateException ex) {
                 // it's ok
             }
         });
@@ -403,16 +401,12 @@ public class NodeFragment extends Fragment
                 etNodeHost.setError(getString(R.string.node_host_empty));
                 return false;
             }
-            final boolean setHostSuccess = Helper.runWithNetwork(new Helper.Action() {
+            final boolean setHostSuccess = Helper.runWithNetwork(() -> {
-                @Override
+                try {
-                public boolean run() {
+                    nodeInfo.setHost(host);
-                    try {
+                    return true;
-                        nodeInfo.setHost(host);
+                } catch (UnknownHostException ex) {
-                        return true;
+                    return false;
-                    } catch (UnknownHostException ex) {
-                        etNodeHost.setError(getString(R.string.node_host_unresolved));
-                        return false;
-                    }
                 }
             });
             if (!setHostSuccess) {
@@ -532,20 +526,10 @@ public class NodeFragment extends Fragment
                 @Override
                 public void onShow(final DialogInterface dialog) {
                     Button testButton = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_NEUTRAL);
-                    testButton.setOnClickListener(new View.OnClickListener() {
+                    testButton.setOnClickListener(view -> test());
-                        @Override
-                        public void onClick(View view) {
-                            test();
-                        }
-                    });
 
                     Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
-                    button.setOnClickListener(new View.OnClickListener() {
+                    button.setOnClickListener(view -> apply());
-                        @Override
-                        public void onClick(View view) {
-                            apply();
-                        }
-                    });
                 }
             });
 
@@ -553,15 +537,13 @@ public class NodeFragment extends Fragment
                 editDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
             }
 
-            etNodePass.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            etNodePass.getEditText().setOnEditorActionListener((v, actionId, event) -> {
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    editDialog.getButton(DialogInterface.BUTTON_NEUTRAL).requestFocus();
-                        editDialog.getButton(DialogInterface.BUTTON_NEUTRAL).requestFocus();
+                    test();
-                        test();
+                    return true;
-                        return true;
-                    }
-                    return false;
                 }
+                return false;
             });
         }
 
@@ -589,6 +571,7 @@ public class NodeFragment extends Fragment
                     } else {
                         nodesAdapter.setNodes();
                     }
+                    nodesAdapter.notifyItemChanged(nodeInfo);
                 }
             }
         }

app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java

@@ -22,7 +22,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.nfc.NfcManager;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.Html;
@@ -46,10 +45,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.ShareActionProvider;
-import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.textfield.TextInputLayout;
@@ -89,6 +85,7 @@ public class ReceiveFragment extends Fragment {
     private ImageView ivQrCodeFull;
     private EditText etDummy;
     private ImageButton bCopyAddress;
+    private MenuItem shareItem;
 
     private Wallet wallet = null;
     private boolean isMyWallet = false;
@@ -128,6 +125,7 @@ public class ReceiveFragment extends Fragment {
         evAmount.setOnNewAmountListener(xmr -> {
             Timber.d("new amount = %s", xmr);
             generateQr();
+            if (shareRequested && (xmr != null)) share();
         });
 
         evAmount.setOnFailedExchangeListener(() -> {
@@ -192,11 +190,6 @@ public class ReceiveFragment extends Fragment {
             throw new IllegalStateException("no wallet info");
         }
 
-        View tvNfc = view.findViewById(R.id.tvNfc);
-        NfcManager manager = (NfcManager) getContext().getSystemService(Context.NFC_SERVICE);
-        if ((manager != null) && (manager.getDefaultAdapter() != null))
-            tvNfc.setVisibility(View.VISIBLE);
-
         return view;
     }
 
@@ -211,39 +204,38 @@ public class ReceiveFragment extends Fragment {
         setSharedElementEnterTransition(transform);
     }
 
-    private ShareActionProvider shareActionProvider;
+    private boolean shareRequested = false;
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.receive_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
 
-        // Locate MenuItem with ShareActionProvider
+        shareItem = menu.findItem(R.id.menu_item_share);
-        MenuItem item = menu.findItem(R.id.menu_item_share);
+        shareItem.setOnMenuItemClickListener(item -> {
-
+            if (shareRequested) return true;
-        // Fetch and store ShareActionProvider
+            shareRequested = true;
-        shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
+            if (!qrValid) {
-
+                evAmount.doExchange();
-        shareActionProvider.setOnShareTargetSelectedListener(new ShareActionProvider.OnShareTargetSelectedListener() {
+            } else {
-            @Override
+                share();
-            public boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent) {
-                saveQrCode(); // save it only if we need it
-                return false;
             }
+            return true;
         });
     }
 
-    private void setShareIntent() {
+    private void share() {
-        if (shareActionProvider != null) {
+        shareRequested = false;
-            if (qrValid) {
+        if (saveQrCode()) {
-                shareActionProvider.setShareIntent(getShareIntent());
+            final Intent sendIntent = getSendIntent();
-            } else {
+            if (sendIntent != null)
-                shareActionProvider.setShareIntent(null);
+                startActivity(Intent.createChooser(sendIntent, null));
-            }
+        } else {
+            Toast.makeText(getActivity(), getString(R.string.message_qr_failed), Toast.LENGTH_SHORT).show();
         }
     }
 
-    private void saveQrCode() {
+    private boolean saveQrCode() {
         if (!qrValid) throw new IllegalStateException("trying to save null qr code!");
 
         File cachePath = new File(getActivity().getCacheDir(), "images");
@@ -255,33 +247,35 @@ public class ReceiveFragment extends Fragment {
             Bitmap qrBitmap = ((BitmapDrawable) ivQrCode.getDrawable()).getBitmap();
             qrBitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
             stream.close();
+            return true;
         } catch (IOException ex) {
             Timber.e(ex);
             // make sure we don't share an old qr code
             if (!png.delete()) throw new IllegalStateException("cannot delete old qr code");
             // if we manage to delete it, the URI points to nothing and the user gets a toast with the error
         }
+        return false;
     }
 
-    private Intent getShareIntent() {
+    private Intent getSendIntent() {
-        File imagePath = new File(getActivity().getCacheDir(), "images");
+        File imagePath = new File(requireActivity().getCacheDir(), "images");
         File png = new File(imagePath, "QR.png");
-        Uri contentUri = FileProvider.getUriForFile(getActivity(),
+        Uri contentUri = FileProvider.getUriForFile(requireActivity(), BuildConfig.APPLICATION_ID + ".fileprovider", png);
-                BuildConfig.APPLICATION_ID + ".fileprovider", png);
         if (contentUri != null) {
             Intent shareIntent = new Intent();
             shareIntent.setAction(Intent.ACTION_SEND);
             shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); // temp permission for receiving app to read this file
-            shareIntent.setDataAndType(contentUri, getActivity().getContentResolver().getType(contentUri));
+            shareIntent.setTypeAndNormalize("image/png");
             shareIntent.putExtra(Intent.EXTRA_STREAM, contentUri);
-            shareIntent.putExtra(Intent.EXTRA_TEXT, bcData.getUriString());
+            if (bcData != null)
+                shareIntent.putExtra(Intent.EXTRA_TEXT, bcData.getUriString());
             return shareIntent;
         }
         return null;
     }
 
     void copyAddress() {
-        Helper.clipBoardCopy(Objects.requireNonNull(getActivity()), getString(R.string.label_copy_address), subaddress.getAddress());
+        Helper.clipBoardCopy(requireActivity(), getString(R.string.label_copy_address), subaddress.getAddress());
         Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
     }
 
@@ -291,7 +285,6 @@ public class ReceiveFragment extends Fragment {
         if (qrValid) {
             ivQrCode.setImageBitmap(null);
             qrValid = false;
-            setShareIntent();
             if (isLoaded)
                 tvQrCode.setVisibility(View.VISIBLE);
         }
@@ -300,7 +293,6 @@ public class ReceiveFragment extends Fragment {
     void setQR(Bitmap qr) {
         ivQrCode.setImageBitmap(qr);
         qrValid = true;
-        setShareIntent();
         tvQrCode.setVisibility(View.GONE);
     }
 
@@ -405,7 +397,7 @@ public class ReceiveFragment extends Fragment {
 
     private Bitmap getMoneroLogo() {
         if (logo == null) {
-            logo = Helper.getBitmap(getContext(), R.drawable.ic_monero_logo_b);
+            logo = Helper.getBitmap(getContext(), R.drawable.ic_monerujo_qr);
         }
         return logo;
     }
@@ -462,8 +454,8 @@ public class ReceiveFragment extends Fragment {
         subaddress = newSubaddress;
         final Context context = getContext();
         Spanned label = Html.fromHtml(context.getString(R.string.receive_subaddress,
-                Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoGreen) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(context, R.attr.positiveColor) & 0xFFFFFF),
-                Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoBackground) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(context, android.R.attr.colorBackground) & 0xFFFFFF),
                 subaddress.getDisplayLabel(), subaddress.getAddress()));
         tvAddress.setText(label);
         generateQr();

app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java

@@ -19,12 +19,13 @@ package com.m2049r.xmrwallet;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 

app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet;
 
+import static android.view.WindowManager.LayoutParams;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
@@ -29,8 +31,6 @@ import com.m2049r.xmrwallet.util.LocaleHelper;
 
 import java.util.Locale;
 
-import static android.view.WindowManager.LayoutParams;
-
 public abstract class SecureActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -66,11 +66,7 @@ public abstract class SecureActivity extends AppCompatActivity {
 
         Locale locale = LocaleHelper.getPreferredLocale(this);
         if (locale != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            config.setLocale(locale);
-                config.setLocale(locale);
-            } else {
-                config.locale = locale;
-            }
         }
         return config;
     }

app/src/main/java/com/m2049r/xmrwallet/SettingsFragment.java

@@ -0,0 +1,125 @@
+package com.m2049r.xmrwallet;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+
+import androidx.annotation.StyleRes;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
+import com.m2049r.xmrwallet.dialog.AboutFragment;
+import com.m2049r.xmrwallet.dialog.CreditsFragment;
+import com.m2049r.xmrwallet.dialog.PrivacyFragment;
+import com.m2049r.xmrwallet.util.DayNightMode;
+import com.m2049r.xmrwallet.util.LocaleHelper;
+import com.m2049r.xmrwallet.util.NightmodeHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+
+import timber.log.Timber;
+
+public class SettingsFragment extends PreferenceFragmentCompat
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.root_preferences, rootKey);
+
+        findPreference(getString(R.string.about_info)).setOnPreferenceClickListener(preference -> {
+            AboutFragment.display(getParentFragmentManager());
+            return true;
+        });
+        findPreference(getString(R.string.privacy_info)).setOnPreferenceClickListener(preference -> {
+            PrivacyFragment.display(getParentFragmentManager());
+            return true;
+        });
+        findPreference(getString(R.string.credits_info)).setOnPreferenceClickListener(preference -> {
+            CreditsFragment.display(getParentFragmentManager());
+            return true;
+        });
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.preferred_locale))) {
+            activity.recreate();
+        } else if (key.equals(getString(R.string.preferred_nightmode))) {
+            NightmodeHelper.setNightMode(DayNightMode.valueOf(sharedPreferences.getString(key, "AUTO")));
+        } else if (key.equals(getString(R.string.preferred_theme))) {
+            ThemeHelper.setTheme((Activity) activity, sharedPreferences.getString(key, "Classic"));
+            activity.recreate();
+        }
+    }
+
+    private SettingsFragment.Listener activity;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof SettingsFragment.Listener) {
+            activity = (SettingsFragment.Listener) context;
+        } else {
+            throw new ClassCastException(context + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activity.setSubtitle(getString(R.string.menu_settings));
+        activity.setToolbarButton(Toolbar.BUTTON_BACK);
+        populateLanguages();
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    public interface Listener {
+        void setToolbarButton(int type);
+
+        void setSubtitle(String title);
+
+        void recreate();
+
+        void setTheme(@StyleRes final int resId);
+    }
+
+    public void populateLanguages() {
+        ListPreference language = findPreference(getString(R.string.preferred_locale));
+        assert language != null;
+
+        final ArrayList<Locale> availableLocales = LocaleHelper.getAvailableLocales(requireContext());
+        Collections.sort(availableLocales, (locale1, locale2) -> {
+            String localeString1 = LocaleHelper.getDisplayName(locale1, true);
+            String localeString2 = LocaleHelper.getDisplayName(locale2, true);
+            return localeString1.compareTo(localeString2);
+        });
+
+        String[] localeDisplayNames = new String[1 + availableLocales.size()];
+        localeDisplayNames[0] = getString(R.string.language_system_default);
+        for (int i = 1; i < localeDisplayNames.length; i++) {
+            localeDisplayNames[i] = LocaleHelper.getDisplayName(availableLocales.get(i - 1), true);
+        }
+        language.setEntries(localeDisplayNames);
+
+        String[] languageTags = new String[1 + availableLocales.size()];
+        languageTags[0] = "";
+        for (int i = 1; i < languageTags.length; i++) {
+            languageTags[i] = availableLocales.get(i - 1).toLanguageTag();
+        }
+        language.setEntryValues(languageTags);
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java

@@ -30,7 +30,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.transition.MaterialElevationScale;
 import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.layout.SubaddressInfoAdapter;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
@@ -67,6 +66,8 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
         void setToolbarButton(int type);
 
         void showSubaddress(View view, final int subaddressIndex);
+
+        void saveWallet();
     }
 
     public interface ProgressListener {
@@ -115,14 +116,6 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
         managerMode = ((b != null) && (MODE_MANAGER.equals(b.getString(KEY_MODE))));
 
         View view = inflater.inflate(R.layout.fragment_subaddress, container, false);
-
-        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
-        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setExitTransition(exitTransition);
-        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
-        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setReenterTransition(reenterTransition);
-
         view.findViewById(R.id.fab).setOnClickListener(this);
 
         if (managerMode) {
@@ -152,11 +145,6 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        postponeEnterTransition();
-        view.getViewTreeObserver().addOnPreDrawListener(() -> {
-            startPostponedEnterTransition();
-            return true;
-        });
     }
 
     public void loadList() {
@@ -217,7 +205,9 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
         protected Boolean doInBackground(Void... params) {
             if (params.length != 0) return false;
             wallet.getNewSubaddress();
-            wallet.store();
+            if (activityCallback != null) {
+                activityCallback.saveWallet();
+            }
             return true;
         }
 
@@ -248,4 +238,5 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
         activityCallback.showSubaddress(view, subaddress.getAddressIndex());
         return false;
     }
+
 }

app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java

@@ -29,15 +29,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.transition.Transition;
+import androidx.transition.TransitionInflater;
 
 import com.google.android.material.textfield.TextInputLayout;
-import com.google.android.material.transition.MaterialContainerTransform;
 import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.util.ArrayList;
@@ -46,7 +46,7 @@ import java.util.List;
 import timber.log.Timber;
 
 public class SubaddressInfoFragment extends Fragment
-        implements TransactionInfoAdapter.OnInteractionListener, OnBlockUpdateListener {
+        implements TransactionInfoAdapter.Listener, OnBlockUpdateListener {
     private TransactionInfoAdapter adapter;
 
     private Subaddress subaddress;
@@ -76,7 +76,7 @@ public class SubaddressInfoFragment extends Fragment
 
         etName.getEditText().setText(subaddress.getDisplayLabel());
         tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle,
-                subaddress.getAddressIndex(), subaddress.getSquashedAddress()));
+                subaddress.getAddressIndex(), subaddress.getAddress()));
 
         etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
@@ -102,10 +102,8 @@ public class SubaddressInfoFragment extends Fragment
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        Transition transform = TransitionInflater.from(requireContext())
-        transform.setDrawingViewId(R.id.fragment_container);
+                .inflateTransition(R.transition.details);
-        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
         setSharedElementEnterTransition(transform);
     }
 
@@ -147,6 +145,8 @@ public class SubaddressInfoFragment extends Fragment
         void setTitle(String title, String subtitle);
 
         void setSubtitle(String subtitle);
+
+        long getDaemonHeight();
     }
 
     @Override
@@ -172,4 +172,9 @@ public class SubaddressInfoFragment extends Fragment
     public void onPause() {
         super.onPause();
     }
+
+    @Override
+    public long getDaemonHeight() {
+        return activityCallback.getDaemonHeight();
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/TxFragment.java

@@ -35,11 +35,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.transition.Transition;
+import androidx.transition.TransitionInflater;
 
-import com.google.android.material.transition.MaterialContainerTransform;
-import com.google.android.material.transition.MaterialElevationScale;
 import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
@@ -80,10 +79,14 @@ 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;
 
+    private View llWarning;
+    private TextView tvWarning;
+
     // XMRTO stuff
     private View cvXmrTo;
     private TextView tvTxXmrToKey;
@@ -97,13 +100,6 @@ public class TxFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_tx_info, container, false);
 
-        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
-        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setExitTransition(exitTransition);
-        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
-        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setReenterTransition(reenterTransition);
-
         cvXmrTo = view.findViewById(R.id.cvXmrTo);
         tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
         tvDestinationBtc = view.findViewById(R.id.tvDestinationBtc);
@@ -121,12 +117,15 @@ 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);
-
         etTxNotes.setRawInputType(InputType.TYPE_CLASS_TEXT);
 
+        llWarning = view.findViewById(R.id.llWarning);
+        tvWarning = view.findViewById(R.id.tvWarning);
+
         tvTxXmrToKey.setOnClickListener(v -> {
             Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
             Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
@@ -220,8 +219,8 @@ public class TxFragment extends Fragment {
         final Context ctx = getContext();
         Spanned label = Html.fromHtml(ctx.getString(R.string.tx_account_formatted,
                 info.accountIndex, info.addressIndex,
-                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoGreen) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(ctx, R.attr.positiveColor) & 0xFFFFFF),
-                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoBackground) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(ctx, android.R.attr.colorBackground) & 0xFFFFFF),
                 subaddress.getDisplayLabel()));
         tvAccount.setText(label);
         tvAccount.setOnClickListener(v -> activityCallback.showSubaddress(v, info.addressIndex));
@@ -252,8 +251,10 @@ public class TxFragment extends Fragment {
         }
         String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");
 
-        long realAmount = info.amount;
+        tvTxAmount.setText(sign + Wallet.getDisplayAmount(info.amount));
-        tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));
+        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);
@@ -266,13 +267,13 @@ public class TxFragment extends Fragment {
         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(ContextCompat.getColor(getContext(), R.color.tx_failed));
+            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor));
         } else if (info.isPending) {
-            setTxColour(ContextCompat.getColor(getContext(), R.color.tx_pending));
+            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor));
         } else if (info.direction == TransactionInfo.Direction.Direction_In) {
-            setTxColour(ContextCompat.getColor(getContext(), R.color.tx_plus));
+            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.positiveColor));
         } else {
-            setTxColour(ContextCompat.getColor(getContext(), R.color.tx_minus));
+            setTxColour(ThemeHelper.getThemedColor(getContext(), R.attr.negativeColor));
         }
         Set<String> destinations = new HashSet<>();
         StringBuilder sb = new StringBuilder();
@@ -307,6 +308,20 @@ public class TxFragment extends Fragment {
         tvTxTransfers.setText(sb.toString());
         tvDestination.setText(dstSb.toString());
         showBtcInfo();
+
+        showLock();
+    }
+
+    private void showLock() {
+        llWarning.setVisibility(View.GONE);
+        if (info.unlockTime == 0) return;
+        final long blockheight = activityCallback.getDaemonHeight();
+        final long blocks = info.unlockTime - blockheight;
+        final double unlockDays = blocks / (30. * 24);
+        if (unlockDays > 0) {
+            llWarning.setVisibility(View.VISIBLE);
+            tvWarning.setText(getString(R.string.tx_locked, info.unlockTime, blocks, unlockDays));
+        }
     }
 
     @SuppressLint("SetTextI18n")
@@ -348,10 +363,8 @@ public class TxFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
-        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        Transition transform = TransitionInflater.from(requireContext())
-        transform.setDrawingViewId(R.id.fragment_container);
+                .inflateTransition(R.transition.details);
-        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
         setSharedElementEnterTransition(transform);
     }
 
@@ -380,6 +393,7 @@ public class TxFragment extends Fragment {
 
         void showSubaddress(View view, final int subaddressIndex);
 
+        long getDaemonHeight();
     }
 
     @Override

app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java

@@ -52,8 +52,8 @@ import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.UserNotes;
-import com.m2049r.xmrwallet.dialog.CreditsFragment;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.dialog.PocketChangeFragment;
 import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment;
 import com.m2049r.xmrwallet.fragment.send.SendFragment;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
@@ -82,7 +82,8 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         WalletFragment.DrawerLocker,
         NavigationView.OnNavigationItemSelectedListener,
         SubaddressFragment.Listener,
-        SubaddressInfoFragment.Listener {
+        SubaddressInfoFragment.Listener,
+        PocketChangeFragment.Listener {
 
     public static final String REQUEST_ID = "id";
     public static final String REQUEST_PW = "pw";
@@ -285,8 +286,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             onWalletRescan();
         } else if (itemId == R.id.action_info) {
             onWalletDetails();
-        } else if (itemId == R.id.action_credits) {
-            CreditsFragment.display(getSupportFragmentManager());
         } else if (itemId == R.id.action_share) {
             onShareTxInfo();
         } else if (itemId == R.id.action_help_tx_info) {
@@ -301,6 +300,8 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             HelpFragment.display(getSupportFragmentManager(), R.string.help_send);
         } else if (itemId == R.id.action_rename) {
             onAccountRename();
+        } else if (itemId == R.id.action_pocketchange) {
+            PocketChangeFragment.display(getSupportFragmentManager(), getWallet().getPocketChangeSetting());
         } else if (itemId == R.id.action_subaddresses) {
             showSubaddresses(true);
         } else if (itemId == R.id.action_streetmode) {
@@ -356,6 +357,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Timber.d("onCreate()");
+        ThemeHelper.setPreferred(this);
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             // activity restarted
@@ -385,7 +387,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                     case Toolbar.BUTTON_CLOSE:
                         finish();
                         break;
-                    case Toolbar.BUTTON_CREDITS:
+                    case Toolbar.BUTTON_SETTINGS:
                         Toast.makeText(WalletActivity.this, getString(R.string.label_credits), Toast.LENGTH_SHORT).show();
                     case Toolbar.BUTTON_NONE:
                     default:
@@ -421,7 +423,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                 break;
             case NetworkType_Stagenet:
             case NetworkType_Testnet:
-                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, androidx.appcompat.R.attr.colorPrimaryDark));
                 break;
             default:
                 throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
@@ -450,7 +452,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             if (extras != null) {
                 String walletId = extras.getString(REQUEST_ID);
                 if (walletId != null) {
-                    setTitle(walletId, getString(R.string.status_wallet_connecting));
+                    setTitle(walletId);
                 }
             }
             updateProgress();
@@ -505,6 +507,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         Timber.d("onResume()");
     }
 
+    @Override
     public void saveWallet() {
         if (mIsBound) { // no point in talking to unbound service
             Intent intent = new Intent(getApplicationContext(), WalletService.class);
@@ -537,7 +540,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
 
     @Override
     public void onSendRequest(View view) {
-        replaceFragmentWithTransition(view, SendFragment.newInstance(uri), null, null);
+        replaceFragment(SendFragment.newInstance(uri), null, null);
         uri = null; // only use uri once
     }
 
@@ -578,7 +581,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         try {
             final WalletFragment walletFragment = getWalletFragment();
             if (wallet.isSynchronized()) {
-                Timber.d("onRefreshed() synced");
                 releaseWakeLock(RELEASE_WAKE_LOCK_DELAY); // the idea is to stay awake until synced
                 if (!synced) { // first sync
                     onProgress(-1);
@@ -610,9 +612,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     @Override
     public void onWalletStored(final boolean success) {
         runOnUiThread(() -> {
-            if (success) {
+            if (!success) {
-                Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_unloaded), Toast.LENGTH_SHORT).show();
-            } else {
                 Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_unload_failed), Toast.LENGTH_LONG).show();
             }
         });
@@ -647,6 +647,8 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             haveWallet = true;
             invalidateOptionsMenu();
 
+            loadPocketChangeSettings();
+
             if (requestStreetMode) onEnableStreetMode();
 
             final WalletFragment walletFragment = getWalletFragment();
@@ -801,10 +803,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         int transition;
         if (newFragment instanceof TxFragment)
             transition = R.string.tx_details_transition_name;
-        else if (newFragment instanceof ReceiveFragment)
-            transition = R.string.receive_transition_name;
-        else if (newFragment instanceof SendFragment)
-            transition = R.string.send_transition_name;
         else if (newFragment instanceof SubaddressInfoFragment)
             transition = R.string.subaddress_info_transition_name;
         else
@@ -930,18 +928,15 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     @Override
     void onUriScanned(BarcodeData barcodeData) {
         super.onUriScanned(barcodeData);
-        boolean processed = false;
         if (onUriScannedListener != null) {
-            processed = onUriScannedListener.onUriScanned(barcodeData);
+            onUriScannedListener.onUriScanned(barcodeData);
-        }
-        if (!processed || (onUriScannedListener == null)) {
-            Toast.makeText(this, getString(R.string.nfc_tag_read_what), Toast.LENGTH_LONG).show();
         }
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         Timber.d("onRequestPermissionsResult()");
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == Helper.PERMISSIONS_REQUEST_CAMERA) { // If request is cancelled, the result arrays are empty.
             if (grantResults.length > 0
                     && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -960,7 +955,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         Bundle b = new Bundle();
         b.putString("address", address);
         b.putString("name", getWalletName());
-        replaceFragmentWithTransition(view, new ReceiveFragment(), null, b);
+        replaceFragment(new ReceiveFragment(), null, b);
         Timber.d("ReceiveFragment placed");
     }
 
@@ -1032,13 +1027,14 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         final Wallet wallet = getWallet();
         if (wallet != null) {
             final int n = wallet.getNumAccounts();
+            final int currentAccount = getWallet().getAccountIndex();
             final boolean showBalances = (n > 1) && !isStreetMode();
             for (int i = 0; i < n; i++) {
                 final String label = (showBalances ?
                         getString(R.string.label_account, wallet.getAccountLabel(i), Helper.getDisplayAmount(wallet.getBalance(i), 2))
                         : wallet.getAccountLabel(i));
                 final MenuItem item = menu.add(R.id.accounts_list, getAccountId(i), 2 * i, label);
-                item.setIcon(R.drawable.ic_account_balance_wallet_black_24dp);
+                item.setIcon(i == currentAccount ? R.drawable.ic_outline_folder_open_24 : R.drawable.ic_outline_folder_24);
                 if (i == wallet.getAccountIndex())
                     item.setChecked(true);
             }
@@ -1111,6 +1107,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
 
     public void setAccountIndex(int accountIndex) {
         getWallet().setAccountIndex(accountIndex);
+        loadPocketChangeSettings();
         selectedSubaddressIndex = 0;
     }
 
@@ -1221,4 +1218,19 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         b.putInt("subaddressIndex", subaddressIndex);
         replaceFragmentWithTransition(view, new SubaddressInfoFragment(), null, b);
     }
+
+    @Override
+    public void setPocketChange(Wallet.PocketChangeSetting setting) {
+        SharedPreferences.Editor editor = getPrefs().edit();
+        editor.putString(getWallet().getAddress() + "_PC", setting.toPrefString());
+        editor.apply();
+        getWallet().setPocketChangeSetting(setting);
+    }
+
+
+    public void loadPocketChangeSettings() {
+        final String settings = getPrefs().getString(getWallet().getAddress() + "_PC", "0");
+        getWallet().setPocketChangeSetting(Wallet.PocketChangeSetting.from(settings));
+    }
+
 }

app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java

@@ -43,7 +43,6 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.github.brnunes.swipeablerecyclerview.SwipeableRecyclerViewTouchListener;
-import com.google.android.material.transition.MaterialElevationScale;
 import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Wallet;
@@ -52,18 +51,18 @@ 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.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 import timber.log.Timber;
 
 public class WalletFragment extends Fragment
-        implements TransactionInfoAdapter.OnInteractionListener {
+        implements TransactionInfoAdapter.Listener {
     private TransactionInfoAdapter adapter;
     private final NumberFormat formatter = NumberFormat.getInstance();
 
@@ -112,15 +111,16 @@ public class WalletFragment extends Fragment
         llBalance = view.findViewById(R.id.llBalance);
         flExchange = view.findViewById(R.id.flExchange);
         ((ProgressBar) view.findViewById(R.id.pbExchange)).getIndeterminateDrawable().
-                setColorFilter(getResources().getColor(R.color.progress_circle),
+                setColorFilter(
+                        ThemeHelper.getThemedColor(getContext(), com.google.android.material.R.attr.colorPrimaryVariant),
                         android.graphics.PorterDuff.Mode.MULTIPLY);
 
         tvProgress = view.findViewById(R.id.tvProgress);
         pbProgress = view.findViewById(R.id.pbProgress);
         tvBalance = view.findViewById(R.id.tvBalance);
-        showBalance(Helper.getDisplayAmount(0));
+        showBalance();
         tvUnconfirmedAmount = view.findViewById(R.id.tvUnconfirmedAmount);
-        showUnconfirmed(0);
+        showUnconfirmed();
         ivSynced = view.findViewById(R.id.ivSynced);
 
         sCurrency = view.findViewById(R.id.sCurrency);
@@ -128,7 +128,7 @@ public class WalletFragment extends Fragment
         currencies.add(Helper.BASE_CRYPTO);
         if (Helper.SHOW_EXCHANGERATES)
             currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
-        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(Objects.requireNonNull(getContext()), R.layout.item_spinner_balance, currencies);
+        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(requireContext(), R.layout.item_spinner_balance, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         sCurrency.setAdapter(spinnerAdapter);
 
@@ -203,14 +203,20 @@ public class WalletFragment extends Fragment
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        postponeEnterTransition();
-        view.getViewTreeObserver().addOnPreDrawListener(() -> {
-            startPostponedEnterTransition();
-            return true;
-        });
     }
 
-    void showBalance(String balance) {
+    String amountToString(double amount) {
+        if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR
+            double amountB = amount * balanceRate;
+            return Helper.getFormattedAmount(amountB, false);
+        } else { // XMR
+            return Helper.getFormattedAmount(amount, true);
+        }
+    }
+
+    void showBalance() {
+        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
+        String balance = amountToString(amountA);
         tvBalance.setText(balance);
         final boolean streetMode = activityCallback.isStreetMode();
         if (!streetMode) {
@@ -223,27 +229,23 @@ public class WalletFragment extends Fragment
         setStreetModeBackground(streetMode);
     }
 
-    void showUnconfirmed(double unconfirmedAmount) {
+    void showUnconfirmed() {
-        if (!activityCallback.isStreetMode()) {
+        double unconfirmedAmount = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
-            String unconfirmed = Helper.getFormattedAmount(unconfirmedAmount, true);
+        if (activityCallback.isStreetMode() || unconfirmedAmount == 0) {
-            tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed));
-        } else {
             tvUnconfirmedAmount.setText(null);
+            tvUnconfirmedAmount.setVisibility(View.GONE);
+        } else {
+            String unconfirmed = amountToString(unconfirmedAmount);
+            tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed, balanceCurrency));
+            tvUnconfirmedAmount.setVisibility(View.VISIBLE);
         }
     }
 
     void updateBalance() {
         if (isExchanging) return; // wait for exchange to finish - it will fire this itself then.
         // at this point selection is XMR in case of error
-        String displayB;
+        showBalance();
-        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
+        showUnconfirmed();
-        if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR
-            double amountB = amountA * balanceRate;
-            displayB = Helper.getFormattedAmount(amountB, false);
-        } else { // XMR
-            displayB = Helper.getFormattedAmount(amountA, true);
-        }
-        showBalance(displayB);
     }
 
     String balanceCurrency = Helper.BASE_CRYPTO;
@@ -252,11 +254,11 @@ public class WalletFragment extends Fragment
     private final ExchangeApi exchangeApi = ServiceHelper.getExchangeApi();
 
     void refreshBalance() {
-        double unconfirmedXmr = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
-        showUnconfirmed(unconfirmedXmr);
         if (sCurrency.getSelectedItemPosition() == 0) { // XMR
-            double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
+            balanceCurrency = Helper.BASE_CRYPTO;
-            showBalance(Helper.getFormattedAmount(amountXmr, true));
+            balanceRate = 1.0;
+            showBalance();
+            showUnconfirmed();
         } else { // not XMR
             String currency = (String) sCurrency.getSelectedItem();
             Timber.d(currency);
@@ -301,8 +303,7 @@ public class WalletFragment extends Fragment
 
     public void exchangeFailed() {
         sCurrency.setSelection(0, true); // default to XMR
-        double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
+        showBalance();
-        showBalance(Helper.getFormattedAmount(amountXmr, true));
         hideExchanging();
     }
 
@@ -330,29 +331,24 @@ public class WalletFragment extends Fragment
     // Callbacks from TransactionInfoAdapter
     @Override
     public void onInteraction(final View view, final TransactionInfo infoItem) {
-        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
-        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setExitTransition(exitTransition);
-        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
-        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setReenterTransition(reenterTransition);
-
         activityCallback.onTxDetailsRequest(view, infoItem);
     }
 
-    // called from activity
-
-
     // if account index has changed scroll to top?
     private int accountIndex = 0;
 
-    public void onRefreshed(final Wallet wallet, final boolean full) {
+    public void onRefreshed(final Wallet wallet, boolean full) {
         Timber.d("onRefreshed(%b)", full);
 
+        if (adapter.needsTransactionUpdateOnNewBlock()) {
+            wallet.refreshHistory();
+            full = true;
+        }
         if (full) {
             List<TransactionInfo> list = new ArrayList<>();
             final long streetHeight = activityCallback.getStreetModeHeight();
             Timber.d("StreetHeight=%d", streetHeight);
+            wallet.refreshHistory();
             for (TransactionInfo info : wallet.getHistory().getAll()) {
                 Timber.d("TxHeight=%d, Label=%s", info.blockheight, info.subaddressLabel);
                 if ((info.isPending || (info.blockheight >= streetHeight))
@@ -451,12 +447,13 @@ public class WalletFragment extends Fragment
         String sync;
         if (!activityCallback.hasBoundService())
             throw new IllegalStateException("WalletService not bound.");
+        ivSynced.setVisibility(View.GONE);
         Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus();
         if (daemonConnected == Wallet.ConnectionStatus.ConnectionStatus_Connected) {
             if (!wallet.isSynchronized()) {
-                long daemonHeight = activityCallback.getDaemonHeight();
+                final long daemonHeight = getDaemonHeight();
-                long walletHeight = wallet.getBlockChainHeight();
+                final long walletHeight = wallet.getBlockChainHeight();
-                long n = daemonHeight - walletHeight;
+                final long n = daemonHeight - walletHeight;
                 sync = getString(R.string.status_syncing) + " " + formatter.format(n) + " " + getString(R.string.status_remaining);
                 if (firstBlock == 0) {
                     firstBlock = walletHeight;
@@ -464,7 +461,6 @@ public class WalletFragment extends Fragment
                 int x = 100 - Math.round(100f * n / (1f * daemonHeight - firstBlock));
                 if (x == 0) x = 101; // indeterminate
                 setProgress(x);
-                ivSynced.setVisibility(View.GONE);
             } else {
                 sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight());
                 ivSynced.setVisibility(View.VISIBLE);
@@ -530,8 +526,6 @@ public class WalletFragment extends Fragment
     @Override
     public void onResume() {
         super.onResume();
-        setExitTransition(null);
-        setReenterTransition(null);
         Timber.d("onResume()");
         activityCallback.setTitle(walletTitle, walletSubtitle);
         activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
@@ -561,9 +555,14 @@ public class WalletFragment extends Fragment
         //TODO figure out why gunther disappears on return from send although he is still set
         if (enable) {
             if (streetGunther == null)
-                streetGunther = ContextCompat.getDrawable(Objects.requireNonNull(getContext()), R.drawable.ic_gunther_streetmode);
+                streetGunther = ContextCompat.getDrawable(requireContext(), R.drawable.ic_gunther_streetmode);
             ivStreetGunther.setImageDrawable(streetGunther);
         } else
             ivStreetGunther.setImageDrawable(null);
     }
+
+    @Override
+    public long getDaemonHeight() {
+        return activityCallback.getDaemonHeight();
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java

@@ -21,22 +21,35 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
 
-import com.m2049r.xmrwallet.BuildConfig;
+import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStateManagerControl;
+
 import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.util.LocaleHelper;
+import com.m2049r.xmrwallet.util.NetCipherHelper;
 import com.m2049r.xmrwallet.util.NightmodeHelper;
+import com.m2049r.xmrwallet.util.ServiceHelper;
+
+import java.util.Arrays;
 
 import timber.log.Timber;
 
 public class XmrWalletApplication extends Application {
+
     @Override
+    @OptIn(markerClass = FragmentStateManagerControl.class)
     public void onCreate() {
         super.onCreate();
-
+        FragmentManager.enableNewStateManager(false);
         if (BuildConfig.DEBUG) {
             Timber.plant(new Timber.DebugTree());
         }
+
         NightmodeHelper.setPreferredNightmode(this);
+
+        NetCipherHelper.createInstance(this);
     }
 
     @Override
@@ -45,7 +58,7 @@ public class XmrWalletApplication extends Application {
     }
 
     @Override
-    public void onConfigurationChanged(Configuration configuration) {
+    public void onConfigurationChanged(@NonNull Configuration configuration) {
         super.onConfigurationChanged(configuration);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             LocaleHelper.updateSystemDefaultLocale(configuration.getLocales().get(0));

app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java

@@ -28,7 +28,13 @@ public enum DefaultNodes {
     SUPPORTXMR("node.supportxmr.com:18081"),
     HASHVAULT("nodes.hashvault.pro:18081"),
     MONEROWORLD("node.moneroworld.com:18089"),
-    XMRTW("opennode.xmr-tw.org:18089");
+    XMRTW("opennode.xmr-tw.org:18089"),
+    ds_jetzt("monero.ds-jetzt.de: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"),
+    ds_jetzt_onion("qvlr4w7yhnjrdg3txa72jwtpnjn4ezsrivzvocbnvpfbdo342fahhoad.onion:18089/mainnet/ds-jetzt.onion");
 
     @Getter
     private final String uri;

app/src/main/java/com/m2049r/xmrwallet/data/Node.java

@@ -18,6 +18,7 @@ package com.m2049r.xmrwallet.data;
 
 import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.OnionHelper;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
@@ -35,11 +36,63 @@ public class Node {
     static public final String STAGENET = "stagenet";
     static public final String TESTNET = "testnet";
 
+    static class Address {
+        final private InetAddress inet;
+        final private String onion;
+
+        public boolean isOnion() {
+            return onion != null;
+        }
+
+        public String getHostName() {
+            if (inet != null) {
+                return inet.getHostName();
+            } else {
+                return onion;
+            }
+        }
+
+        public String getHostAddress() {
+            if (inet != null) {
+                return inet.getHostAddress();
+            } else {
+                return onion;
+            }
+        }
+
+        private Address(InetAddress address, String onion) {
+            this.inet = address;
+            this.onion = onion;
+        }
+
+        static Address of(InetAddress address) {
+            return new Address(address, null);
+        }
+
+        static Address of(String host) throws UnknownHostException {
+            if (OnionHelper.isOnionHost(host)) {
+                return new Address(null, host);
+            } else {
+                return new Address(InetAddress.getByName(host), null);
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return getHostAddress().hashCode();
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            return (other instanceof Address) && (getHostAddress().equals(((Address) other).getHostAddress()));
+        }
+    }
+
     @Getter
     private String name = null;
     @Getter
     final private NetworkType networkType;
-    InetAddress hostAddress;
+    Address hostAddress;
     @Getter
     private String host;
     @Getter
@@ -74,6 +127,10 @@ public class Node {
                 && (networkType == anotherNode.networkType));
     }
 
+    public boolean isOnion() {
+        return hostAddress.isOnion();
+    }
+
     static public Node fromString(String nodeString) {
         try {
             return new Node(nodeString);
@@ -205,7 +262,7 @@ public class Node {
     // constructor used for created nodes from retrieved peer lists
     public Node(InetSocketAddress socketAddress) {
         this();
-        this.hostAddress = socketAddress.getAddress();
+        this.hostAddress = Address.of(socketAddress.getAddress());
         this.host = socketAddress.getHostString();
         this.rpcPort = 0; // unknown
         this.levinPort = socketAddress.getPort();
@@ -225,17 +282,25 @@ public class Node {
         if ((host == null) || (host.isEmpty()))
             throw new UnknownHostException("loopback not supported (yet?)");
         this.host = host;
-        this.hostAddress = InetAddress.getByName(host);
+        this.hostAddress = Address.of(host);
     }
 
-    public void setName() {
+    public void setDefaultName() {
-        if (name == null)
+        if (name != null) return;
-            this.name = hostAddress.getHostName();
+        String nodeName = hostAddress.getHostName();
+        if (hostAddress.isOnion()) {
+            nodeName = nodeName.substring(0, nodeName.length() - ".onion".length());
+            if (nodeName.length() > 16) {
+                nodeName = nodeName.substring(0, 8) + "…" + nodeName.substring(nodeName.length() - 6);
+            }
+            nodeName = nodeName + ".onion";
+        }
+        this.name = nodeName;
     }
 
     public void setName(String name) {
         if ((name == null) || (name.isEmpty()))
-            this.name = hostAddress.getHostName();
+            setDefaultName();
         else
             this.name = name;
     }

app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java

@@ -16,14 +16,17 @@
 
 package com.m2049r.xmrwallet.data;
 
-import com.burgstaller.okhttp.AuthenticationCacheInterceptor;
+import android.content.Context;
-import com.burgstaller.okhttp.CachingAuthenticatorDecorator;
+import android.text.Html;
-import com.burgstaller.okhttp.digest.CachingAuthenticator;
+import android.text.Spanned;
-import com.burgstaller.okhttp.digest.Credentials;
+import android.widget.TextView;
-import com.burgstaller.okhttp.digest.DigestAuthenticator;
+
 import com.m2049r.levin.scanner.LevinPeer;
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.NetCipherHelper;
+import com.m2049r.xmrwallet.util.NetCipherHelper.Request;
 import com.m2049r.xmrwallet.util.NodePinger;
-import com.m2049r.xmrwallet.util.OkHttpHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -32,17 +35,12 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.Calendar;
 import java.util.Comparator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import lombok.Getter;
 import lombok.Setter;
 import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import timber.log.Timber;
@@ -94,7 +92,7 @@ public class NodeInfo extends Node {
     synchronized public SocketAddress getLevinSocketAddress() {
         if (levinSocketAddress == null) {
             // use default peer port if not set - very few peers use nonstandard port
-            levinSocketAddress = new InetSocketAddress(hostAddress, getDefaultLevinPort());
+            levinSocketAddress = new InetSocketAddress(hostAddress.getHostAddress(), getDefaultLevinPort());
         }
         return levinSocketAddress;
     }
@@ -180,7 +178,7 @@ public class NodeInfo extends Node {
         return sb.toString();
     }
 
-    private static final int HTTP_TIMEOUT = OkHttpHelper.HTTP_TIMEOUT;
+    private static final int HTTP_TIMEOUT = 1000; //ms
     public static final double PING_GOOD = HTTP_TIMEOUT / 3.0; //ms
     public static final double PING_MEDIUM = 2 * PING_GOOD; //ms
     public static final double PING_BAD = HTTP_TIMEOUT;
@@ -196,32 +194,29 @@ public class NodeInfo extends Node {
         return result;
     }
 
+    private Request rpcServiceRequest(int port) {
+        final HttpUrl url = new HttpUrl.Builder()
+                .scheme("http")
+                .host(getHost())
+                .port(port)
+                .addPathSegment("json_rpc")
+                .build();
+        final String json = "{\"jsonrpc\":\"2.0\",\"id\":\"0\",\"method\":\"getlastblockheader\"}";
+        return new Request(url, json, getUsername(), getPassword());
+    }
+
     private boolean testRpcService(int port) {
         Timber.d("Testing %s", toNodeString());
         clear();
+        if (hostAddress.isOnion() && !NetCipherHelper.isTor()) {
+            tested = true; // sortof
+            responseCode = 418; // I'm a teapot - or I need an Onion - who knows
+            return false; // autofail
+        }
         try {
-            OkHttpClient client = OkHttpHelper.getEagerClient();
-            if (!getUsername().isEmpty()) {
-                final DigestAuthenticator authenticator =
-                        new DigestAuthenticator(new Credentials(getUsername(), getPassword()));
-                final Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
-                client = client.newBuilder()
-                        .authenticator(new CachingAuthenticatorDecorator(authenticator, authCache))
-                        .addInterceptor(new AuthenticationCacheInterceptor(authCache))
-                        .build();
-            }
-            HttpUrl url = new HttpUrl.Builder()
-                    .scheme("http")
-                    .host(getHostAddress())
-                    .port(port)
-                    .addPathSegment("json_rpc")
-                    .build();
-            final RequestBody reqBody = RequestBody
-                    .create(MediaType.parse("application/json"),
-                            "{\"jsonrpc\":\"2.0\",\"id\":\"0\",\"method\":\"getlastblockheader\"}");
-            Request request = OkHttpHelper.getPostRequest(url, reqBody);
             long ta = System.nanoTime();
-            try (Response response = client.newCall(request).execute()) {
+            try (Response response = rpcServiceRequest(port).execute()) {
+                Timber.d("%s: %s", response.code(), response.request().url());
                 responseTime = (System.nanoTime() - ta) / 1000000.0;
                 responseCode = response.code();
                 if (response.isSuccessful()) {
@@ -243,7 +238,7 @@ public class NodeInfo extends Node {
                 }
             }
         } catch (IOException | JSONException ex) {
-            Timber.d(ex);
+            Timber.d("EX: %s", ex.getMessage()); //TODO: do something here (show error?)
         } finally {
             tested = true;
         }
@@ -264,4 +259,43 @@ public class NodeInfo extends Node {
         }
         return false;
     }
+
+    static public final int STALE_NODE_HOURS = 2;
+
+    public void showInfo(TextView view, String info, boolean isError) {
+        final Context ctx = view.getContext();
+        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),
+                (hostAddress.isOnion() ? "&nbsp;.onion&nbsp;&nbsp;" : ""), " " + info));
+        view.setText(text);
+        if (isError)
+            view.setTextColor(ThemeHelper.getThemedColor(ctx, androidx.appcompat.R.attr.colorError));
+        else
+            view.setTextColor(ThemeHelper.getThemedColor(ctx, android.R.attr.textColorSecondary));
+    }
+
+    public void showInfo(TextView view) {
+        if (!isTested()) {
+            showInfo(view, "", false);
+            return;
+        }
+        final Context ctx = view.getContext();
+        final long now = Calendar.getInstance().getTimeInMillis() / 1000;
+        final long secs = (now - timestamp);
+        final long mins = secs / 60;
+        final long hours = mins / 60;
+        final long days = hours / 24;
+        String info;
+        if (mins < 2) {
+            info = ctx.getString(R.string.node_updated_now, secs);
+        } else if (hours < 2) {
+            info = ctx.getString(R.string.node_updated_mins, mins);
+        } else if (days < 2) {
+            info = ctx.getString(R.string.node_updated_hours, hours);
+        } else {
+            info = ctx.getString(R.string.node_updated_days, days);
+        }
+        showInfo(view, info, hours >= STALE_NODE_HOURS);
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/data/TxDataBtc.java

@@ -41,10 +41,6 @@ public class TxDataBtc extends TxData {
         super();
     }
 
-    public TxDataBtc(TxDataBtc txDataBtc) {
-        super(txDataBtc);
-    }
-
     @Override
     public void writeToParcel(Parcel out, int flags) {
         super.writeToParcel(out, flags);

app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java

@@ -19,15 +19,16 @@ package com.m2049r.xmrwallet.dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;