bump version

tweak http timeouts so sideshift does not timeout (#881 )
add unlockTime (#880 )
2025-09-02 15:53:04 +02:00 · 2023-01-07 11:07:19 +01:00 · 2023-01-07 10:22:21 +01:00 · 2023-01-07 10:19:22 +01:00 · 2022-12-04 21:04:15 +01:00 · 2022-10-22 11:33:11 +02:00
256 changed files with 6894 additions and 3070 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,13 +3,11 @@ jobs:
  build:
    working_directory: ~/code
    docker:
-      - image: circleci/android:api-28-ndk
+      - image: cimg/android:2022.03-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:
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -121,7 +121,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
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
    buildToolsVersion '30.0.3'
    ndkVersion '17.2.4988734'
    defaultConfig {
        applicationId "com.m2049r.xmrwallet"
        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 1101
-        versionName "2.1.1 'Vertant'"
+        targetSdkVersion 31
+        versionCode 3100
+        versionName "3.1.0 'Fluorine Fermi'"
        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,49 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
+    namespace 'com.m2049r.xmrwallet'
 }

-def getId(name) {
-    def Properties props = new Properties()
+static def getId(name) {
+    Properties props = new Properties()
    props.load(new FileInputStream(new File('monerujo.id')))
    return props[name]
 }

 dependencies {
-    implementation 'androidx.core:core:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.core:core:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.preference:preference:1.2.0'
+
+    implementation 'com.google.android.material:material:1.6.0'

    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "io.github.rburgst:okhttp-digest:2.5"
-    implementation "com.jakewharton.timber:timber:4.7.1"
+    implementation "com.squareup.okhttp3:okhttp:4.9.3"
+    implementation "io.github.rburgst:okhttp-digest:2.6"
+    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.5.2'

    implementation 'dnsjava:dnsjava:2.1.9'
    implementation 'org.jitsi:dnssecjava:1.2.0'
-    implementation 'org.slf4j:slf4j-nop:1.7.30'
+    implementation 'org.slf4j:slf4j-nop:1.7.36'
    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.9.3"
+    testImplementation 'org.json:json:20211205'
+    testImplementation 'net.jodah:concurrentunit:0.4.6'

-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
-    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'
+    compileOnly 'org.projectlombok:lombok:1.18.22'
+    annotationProcessor 'org.projectlombok:lombok:1.18.22'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.m2049r.xmrwallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -11,6 +10,23 @@
    <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:name=".XmrWalletApplication"
        android:allowBackup="false"
@@ -18,15 +34,17 @@
        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>
@@ -38,24 +56,25 @@
            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" />
@@ -88,4 +107,5 @@
                android:resource="@xml/filepaths" />
        </provider>
    </application>
-</manifest>
+
+</manifest>
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
--- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
+++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
@@ -78,7 +78,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;
--- a/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
+++ b/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
--- a/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
@@ -27,6 +27,7 @@ import android.nfc.NfcAdapter;
 import android.nfc.Tag;
 import android.nfc.tech.Ndef;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -180,7 +181,7 @@ public class BaseActivity extends SecureActivity
            return;
        nfcPendingIntent = PendingIntent.getActivity(this, 0,
                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP),
-                0);
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0);
    }

    private void processNfcIntent(Intent intent) {
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
--- 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
--- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
+++ b/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));
-            } catch (NullPointerException ex) {
+                requireActivity().runOnUiThread(() -> nodesAdapter.allowClick(true));
+            } 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() {
-                @Override
-                public boolean run() {
-                    try {
-                        nodeInfo.setHost(host);
-                        return true;
-                    } catch (UnknownHostException ex) {
-                        etNodeHost.setError(getString(R.string.node_host_unresolved));
-                        return false;
-                    }
+            final boolean setHostSuccess = Helper.runWithNetwork(() -> {
+                try {
+                    nodeInfo.setHost(host);
+                    return true;
+                } catch (UnknownHostException ex) {
+                    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() {
-                        @Override
-                        public void onClick(View view) {
-                            test();
-                        }
-                    });
+                    testButton.setOnClickListener(view -> test());

                    Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
-                    button.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            apply();
-                        }
-                    });
+                    button.setOnClickListener(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() {
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        editDialog.getButton(DialogInterface.BUTTON_NEUTRAL).requestFocus();
-                        test();
-                        return true;
-                    }
-                    return false;
+            etNodePass.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    editDialog.getButton(DialogInterface.BUTTON_NEUTRAL).requestFocus();
+                    test();
+                    return true;
                }
+                return false;
            });
        }

@@ -589,6 +571,7 @@ public class NodeFragment extends Fragment
                    } else {
                        nodesAdapter.setNodes();
                    }
+                    nodesAdapter.notifyItemChanged(nodeInfo);
                }
            }
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
@@ -46,10 +46,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 +86,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 +126,7 @@ public class ReceiveFragment extends Fragment {
        evAmount.setOnNewAmountListener(xmr -> {
            Timber.d("new amount = %s", xmr);
            generateQr();
+            if (shareRequested && (xmr != null)) share();
        });

        evAmount.setOnFailedExchangeListener(() -> {
@@ -211,39 +210,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
-        MenuItem item = menu.findItem(R.id.menu_item_share);
-
-        // Fetch and store ShareActionProvider
-        shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
-
-        shareActionProvider.setOnShareTargetSelectedListener(new ShareActionProvider.OnShareTargetSelectedListener() {
-            @Override
-            public boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent) {
-                saveQrCode(); // save it only if we need it
-                return false;
+        shareItem = menu.findItem(R.id.menu_item_share);
+        shareItem.setOnMenuItemClickListener(item -> {
+            if (shareRequested) return true;
+            shareRequested = true;
+            if (!qrValid) {
+                evAmount.doExchange();
+            } else {
+                share();
            }
+            return true;
        });
    }

-    private void setShareIntent() {
-        if (shareActionProvider != null) {
-            if (qrValid) {
-                shareActionProvider.setShareIntent(getShareIntent());
-            } else {
-                shareActionProvider.setShareIntent(null);
-            }
+    private void share() {
+        shareRequested = false;
+        if (saveQrCode()) {
+            final Intent sendIntent = getSendIntent();
+            if (sendIntent != 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 +253,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() {
-        File imagePath = new File(getActivity().getCacheDir(), "images");
+    private Intent getSendIntent() {
+        File imagePath = new File(requireActivity().getCacheDir(), "images");
        File png = new File(imagePath, "QR.png");
-        Uri contentUri = FileProvider.getUriForFile(getActivity(),
-                BuildConfig.APPLICATION_ID + ".fileprovider", png);
+        Uri contentUri = FileProvider.getUriForFile(requireActivity(), 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 +291,6 @@ public class ReceiveFragment extends Fragment {
        if (qrValid) {
            ivQrCode.setImageBitmap(null);
            qrValid = false;
-            setShareIntent();
            if (isLoaded)
                tvQrCode.setVisibility(View.VISIBLE);
        }
@@ -300,7 +299,6 @@ public class ReceiveFragment extends Fragment {
    void setQR(Bitmap qr) {
        ivQrCode.setImageBitmap(qr);
        qrValid = true;
-        setShareIntent();
        tvQrCode.setVisibility(View.GONE);
    }

@@ -462,8 +460,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(ContextCompat.getColor(context, R.color.monerujoBackground) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(context, R.attr.positiveColor) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(context, android.R.attr.colorBackground) & 0xFFFFFF),
                subaddress.getDisplayLabel(), subaddress.getAddress()));
        tvAddress.setText(label);
        generateQr();
--- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java
@@ -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);
-            } else {
-                config.locale = locale;
-            }
+            config.setLocale(locale);
        }
        return config;
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/SettingsFragment.java
+++ b/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);
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
+++ b/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;
    }
+
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java
+++ b/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;
@@ -102,10 +102,8 @@ public class SubaddressInfoFragment extends Fragment
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        final MaterialContainerTransform transform = new MaterialContainerTransform();
-        transform.setDrawingViewId(R.id.fragment_container);
-        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        Transition transform = TransitionInflater.from(requireContext())
+                .inflateTransition(R.transition.details);
        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();
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
@@ -35,16 +35,17 @@ 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;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.service.WalletService;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
@@ -84,6 +85,9 @@ public class TxFragment extends Fragment {
    private TextView tvTxTransfers;
    private TextView etTxNotes;

+    private View llWarning;
+    private TextView tvWarning;
+
    // XMRTO stuff
    private View cvXmrTo;
    private TextView tvTxXmrToKey;
@@ -97,13 +101,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);
@@ -124,9 +121,11 @@ public class TxFragment extends Fragment {
        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(ContextCompat.getColor(ctx, R.color.monerujoBackground) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(ctx, R.attr.positiveColor) & 0xFFFFFF),
+                Integer.toHexString(ThemeHelper.getThemedColor(ctx, android.R.attr.colorBackground) & 0xFFFFFF),
                subaddress.getDisplayLabel()));
        tvAccount.setText(label);
        tvAccount.setOnClickListener(v -> activityCallback.showSubaddress(v, info.addressIndex));
@@ -266,13 +265,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 +306,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 +361,8 @@ public class TxFragment extends Fragment {
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
-        final MaterialContainerTransform transform = new MaterialContainerTransform();
-        transform.setDrawingViewId(R.id.fragment_container);
-        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        Transition transform = TransitionInflater.from(requireContext())
+                .inflateTransition(R.transition.details);
        setSharedElementEnterTransition(transform);
    }

@@ -380,6 +391,7 @@ public class TxFragment extends Fragment {

        void showSubaddress(View view, final int subaddressIndex);

+        long getDaemonHeight();
    }

    @Override
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -356,6 +356,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 +386,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:
@@ -505,6 +506,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 +539,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
    }

@@ -609,9 +611,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
    @Override
    public void onWalletStored(final boolean success) {
        runOnUiThread(() -> {
-            if (success) {
-                Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_unloaded), Toast.LENGTH_SHORT).show();
-            } else {
+            if (!success) {
                Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_unload_failed), Toast.LENGTH_LONG).show();
            }
        });
@@ -800,10 +800,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
@@ -941,6 +937,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
    @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) {
@@ -959,7 +956,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");
    }

--- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
+++ b/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,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.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;

 import java.text.NumberFormat;
@@ -62,7 +62,7 @@ import java.util.List;
 import timber.log.Timber;

 public class WalletFragment extends Fragment
-        implements TransactionInfoAdapter.OnInteractionListener {
+        implements TransactionInfoAdapter.Listener {
    private TransactionInfoAdapter adapter;
    private final NumberFormat formatter = NumberFormat.getInstance();

@@ -111,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(), 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);
@@ -202,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) {
@@ -222,27 +229,23 @@ public class WalletFragment extends Fragment
        setStreetModeBackground(streetMode);
    }

-    void showUnconfirmed(double unconfirmedAmount) {
-        if (!activityCallback.isStreetMode()) {
-            String unconfirmed = Helper.getFormattedAmount(unconfirmedAmount, true);
-            tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed));
-        } else {
+    void showUnconfirmed() {
+        double unconfirmedAmount = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
+        if (activityCallback.isStreetMode() || unconfirmedAmount == 0) {
            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;
-        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
-        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);
+        showBalance();
+        showUnconfirmed();
    }

    String balanceCurrency = Helper.BASE_CRYPTO;
@@ -251,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();
-            showBalance(Helper.getFormattedAmount(amountXmr, true));
+            balanceCurrency = Helper.BASE_CRYPTO;
+            balanceRate = 1.0;
+            showBalance();
+            showUnconfirmed();
        } else { // not XMR
            String currency = (String) sCurrency.getSelectedItem();
            Timber.d(currency);
@@ -300,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(Helper.getFormattedAmount(amountXmr, true));
+        showBalance();
        hideExchanging();
    }

@@ -329,19 +331,9 @@ 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;

@@ -458,9 +450,9 @@ public class WalletFragment extends Fragment
        Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus();
        if (daemonConnected == Wallet.ConnectionStatus.ConnectionStatus_Connected) {
            if (!wallet.isSynchronized()) {
-                long daemonHeight = activityCallback.getDaemonHeight();
-                long walletHeight = wallet.getBlockChainHeight();
-                long n = daemonHeight - walletHeight;
+                final long daemonHeight = getDaemonHeight();
+                final long walletHeight = wallet.getBlockChainHeight();
+                final long n = daemonHeight - walletHeight;
                sync = getString(R.string.status_syncing) + " " + formatter.format(n) + " " + getString(R.string.status_remaining);
                if (firstBlock == 0) {
                    firstBlock = walletHeight;
@@ -534,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);
@@ -570,4 +560,9 @@ public class WalletFragment extends Fragment
        } else
            ivStreetGunther.setImageDrawable(null);
    }
+
+    @Override
+    public long getDaemonHeight() {
+        return activityCallback.getDaemonHeight();
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java
@@ -21,22 +21,29 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;

-import com.m2049r.xmrwallet.BuildConfig;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
+
 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 timber.log.Timber;

 public class XmrWalletApplication extends Application {
+
    @Override
    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 +52,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));
--- a/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java
@@ -28,7 +28,11 @@ 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"),
+    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");

    @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
@@ -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() {
-        if (name == null)
-            this.name = hostAddress.getHostName();
+    public void setDefaultName() {
+        if (name != null) return;
+        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;
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
@@ -16,14 +16,19 @@

 package com.m2049r.xmrwallet.data;

-import com.burgstaller.okhttp.AuthenticationCacheInterceptor;
-import com.burgstaller.okhttp.CachingAuthenticatorDecorator;
-import com.burgstaller.okhttp.digest.CachingAuthenticator;
-import com.burgstaller.okhttp.digest.Credentials;
-import com.burgstaller.okhttp.digest.DigestAuthenticator;
+import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
 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 +37,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 +94,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 +180,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 +196,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 +240,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 +261,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, 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);
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/dialog/HelpFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/dialog/HelpFragment.java
@@ -17,13 +17,17 @@
 package com.m2049r.xmrwallet.dialog;

 import android.app.Dialog;
-import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -31,15 +35,20 @@ import androidx.fragment.app.FragmentTransaction;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.NetCipherHelper;

 public class HelpFragment extends DialogFragment {
    static final String TAG = "HelpFragment";
    private static final String HELP_ID = "HELP_ID";
+    private static final String TOR_BUTTON = "TOR";

    public static HelpFragment newInstance(int helpResourceId) {
        HelpFragment fragment = new HelpFragment();
        Bundle bundle = new Bundle();
        bundle.putInt(HELP_ID, helpResourceId);
+        // a hack for the tor button
+        if (helpResourceId == R.string.help_tor)
+            bundle.putInt(TOR_BUTTON, 7);
        fragment.setArguments(bundle);
        return fragment;
    }
@@ -54,27 +63,53 @@ public class HelpFragment extends DialogFragment {
        HelpFragment.newInstance(helpResourceId).show(ft, TAG);
    }

+    private Spanned getHtml(String html, double textSize) {
+        final Html.ImageGetter imageGetter = source -> {
+            final int imageId = getResources().getIdentifier(source.replace("/", ""), "drawable", requireActivity().getPackageName());
+            // Don't die if we don't find the image - use a heart instead
+            final Drawable drawable = ContextCompat.getDrawable(requireActivity(), imageId > 0 ? imageId : R.drawable.ic_favorite_24dp);
+            final double f = textSize / drawable.getIntrinsicHeight();
+            drawable.setBounds(0, 0, (int) (f * drawable.getIntrinsicWidth()), (int) textSize);
+            return drawable;
+        };
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY, imageGetter, null);
+        } else {
+            return Html.fromHtml(html, imageGetter, null);
+        }
+    }
+
+    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_help, null);

        int helpId = 0;
+        boolean torButton = false;
        Bundle arguments = getArguments();
        if (arguments != null) {
            helpId = arguments.getInt(HELP_ID);
+            torButton = arguments.getInt(TOR_BUTTON) > 0;
        }
+        final TextView helpTv = view.findViewById(R.id.tvHelp);
        if (helpId > 0)
-            ((TextView) view.findViewById(R.id.tvHelp)).setText(Html.fromHtml(getString(helpId)));
+            helpTv.setText(getHtml(getString(helpId), helpTv.getTextSize()));

-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity())
-                .setView(view)
-                .setNegativeButton(R.string.help_ok,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int id) {
+        MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity())
+                        .setView(view);
+        if (torButton) {
+            builder.setNegativeButton(R.string.help_nok,
+                    (dialog, id) -> dialog.dismiss())
+                    .setPositiveButton(R.string.help_getorbot,
+                            (dialog, id) -> {
                                dialog.dismiss();
-                            }
-                        });
+                                NetCipherHelper.getInstance().installOrbot(requireActivity());
+                            });
+        } else {
+            builder.setNegativeButton(R.string.help_ok,
+                    (dialog, id) -> dialog.dismiss());
+        }
        return builder.create();
    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
@@ -22,6 +22,7 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.Html;
 import android.text.InputType;
+import android.text.Spanned;
 import android.text.TextWatcher;
 import android.util.Patterns;
 import android.view.KeyEvent;
@@ -91,6 +92,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
    private TextInputLayout etAddress;
    private TextInputLayout etNotes;
    private TextView tvXmrTo;
+    private TextView tvTor;
    private Map<Crypto, ImageButton> ibCrypto;
    final private Set<Crypto> possibleCryptos = new HashSet<>();
    private Crypto selectedCrypto = null;
@@ -117,11 +119,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {

        View view = inflater.inflate(R.layout.fragment_send_address, container, false);

-        if (Helper.ALLOW_SHIFT) {
-            tvXmrTo = view.findViewById(R.id.tvXmrTo);
-            ibCrypto = new HashMap<>();
-            for (Crypto crypto : Crypto.values()) {
-                final ImageButton button = view.findViewById(crypto.getButtonId());
+        tvTor = view.findViewById(R.id.tvTor);
+        tvXmrTo = view.findViewById(R.id.tvXmrTo);
+        ibCrypto = new HashMap<>();
+        for (Crypto crypto : Crypto.values()) {
+            final ImageButton button = view.findViewById(crypto.getButtonId());
+            if (Helper.ALLOW_SHIFT || (crypto == Crypto.XMR)) {
                ibCrypto.put(crypto, button);
                button.setOnClickListener(v -> {
                    if (possibleCryptos.contains(crypto)) {
@@ -137,14 +140,21 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                        } else {
                            tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help_xmr)));
                            tvXmrTo.setVisibility(View.VISIBLE);
+                            tvTor.setVisibility(View.INVISIBLE);
                        }
                    }
                });
+            } else {
+                button.setImageResource(crypto.getIconDisabledId());
+                button.setImageAlpha(128);
+                button.setEnabled(false);
            }
-            updateCryptoButtons(true);
-        } else {
-            view.findViewById(R.id.llExchange).setVisibility(View.GONE);
        }
+        if (!Helper.ALLOW_SHIFT) {
+            tvTor.setVisibility(View.VISIBLE);
+        }
+        updateCryptoButtons(true);
+
        etAddress = view.findViewById(R.id.etAddress);
        etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
        etAddress.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -455,6 +465,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                Timber.d("BUT ONLY XMR SUPPORTED");
                barcodeData = null;
                sendListener.setBarcodeData(barcodeData);
+                return;
            }
            if (barcodeData.address != null) {
                etAddress.getEditText().setText(barcodeData.address);
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java
@@ -35,7 +35,6 @@ import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.OkHttpHelper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 import com.m2049r.xmrwallet.widget.ExchangeOtherEditText;
 import com.m2049r.xmrwallet.widget.SendProgressView;
@@ -255,8 +254,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
        if (xmrToApi == null) {
            synchronized (this) {
                if (xmrToApi == null) {
-                    xmrToApi = new SideShiftApiImpl(OkHttpHelper.getOkHttpClient(),
-                            ServiceHelper.getXmrToBaseUrl());
+                    xmrToApi = new SideShiftApiImpl(ServiceHelper.getXmrToBaseUrl());
                }
            }
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
@@ -37,7 +37,6 @@ import com.m2049r.xmrwallet.service.shift.sideshift.api.RequestQuote;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.OkHttpHelper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 import com.m2049r.xmrwallet.widget.SendProgressView;

@@ -543,8 +542,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
        if (xmrToApi == null) {
            synchronized (this) {
                if (xmrToApi == null) {
-                    xmrToApi = new SideShiftApiImpl(OkHttpHelper.getOkHttpClient(),
-                            ServiceHelper.getXmrToBaseUrl());
+                    xmrToApi = new SideShiftApiImpl(ServiceHelper.getXmrToBaseUrl());
                }
            }
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java
@@ -39,8 +39,8 @@ import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.OkHttpHelper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;

 import java.text.NumberFormat;
 import java.util.Locale;
@@ -213,19 +213,27 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
        if (status.isError()) {
            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_error, status.toString()));
            statusResource = R.drawable.ic_error_red_24dp;
-            pbXmrto.getIndeterminateDrawable().setColorFilter(0xff8b0000, android.graphics.PorterDuff.Mode.MULTIPLY);
+            pbXmrto.getIndeterminateDrawable().setColorFilter(
+                    ThemeHelper.getThemedColor(getContext(), android.R.attr.colorError),
+                    android.graphics.PorterDuff.Mode.MULTIPLY);
        } else if (status.isSent() || status.isPaid()) {
            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_sent, btcData.getBtcSymbol()));
-            statusResource = R.drawable.ic_success_green_24dp;
-            pbXmrto.getIndeterminateDrawable().setColorFilter(0xFF417505, android.graphics.PorterDuff.Mode.MULTIPLY);
+            statusResource = R.drawable.ic_success;
+            pbXmrto.getIndeterminateDrawable().setColorFilter(
+                    ThemeHelper.getThemedColor(getContext(), R.attr.positiveColor),
+                    android.graphics.PorterDuff.Mode.MULTIPLY);
        } else if (status.isWaiting()) {
            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_unpaid));
-            statusResource = R.drawable.ic_pending_orange_24dp;
-            pbXmrto.getIndeterminateDrawable().setColorFilter(0xFFFF6105, android.graphics.PorterDuff.Mode.MULTIPLY);
+            statusResource = R.drawable.ic_pending;
+            pbXmrto.getIndeterminateDrawable().setColorFilter(
+                    ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor),
+                    android.graphics.PorterDuff.Mode.MULTIPLY);
        } else if (status.isPending()) {
            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_paid));
-            statusResource = R.drawable.ic_pending_orange_24dp;
-            pbXmrto.getIndeterminateDrawable().setColorFilter(0xFFFF6105, android.graphics.PorterDuff.Mode.MULTIPLY);
+            statusResource = R.drawable.ic_pending;
+            pbXmrto.getIndeterminateDrawable().setColorFilter(
+                    ThemeHelper.getThemedColor(getContext(), R.attr.neutralColor),
+                    android.graphics.PorterDuff.Mode.MULTIPLY);
        } else {
            throw new IllegalStateException("status is broken: " + status.toString());
        }
@@ -245,8 +253,7 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
        if (xmrToApi == null) {
            synchronized (this) {
                if (xmrToApi == null) {
-                    xmrToApi = new SideShiftApiImpl(OkHttpHelper.getOkHttpClient(),
-                            ServiceHelper.getXmrToBaseUrl());
+                    xmrToApi = new SideShiftApiImpl(ServiceHelper.getXmrToBaseUrl());
                }
            }
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
@@ -55,7 +55,6 @@ import com.m2049r.xmrwallet.widget.DotBar;
 import com.m2049r.xmrwallet.widget.Toolbar;

 import java.lang.ref.WeakReference;
-import java.util.Objects;

 import timber.log.Timber;

@@ -202,14 +201,14 @@ public class SendFragment extends Fragment
        CharSequence nextLabel = pagerAdapter.getPageTitle(position + 1);
        bNext.setText(nextLabel);
        if (nextLabel != null) {
-            bNext.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_navigate_next_white_24dp, 0);
+            bNext.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_navigate_next, 0);
        } else {
            bNext.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
        }
        CharSequence prevLabel = pagerAdapter.getPageTitle(position - 1);
        bPrev.setText(prevLabel);
        if (prevLabel != null) {
-            bPrev.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_navigate_prev_white_24dp, 0, 0, 0);
+            bPrev.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_navigate_prev, 0, 0, 0);
        } else {
            bPrev.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
        }
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
@@ -25,26 +25,22 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;

 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.NodeInfo;
-import com.m2049r.xmrwallet.util.ThemeHelper;
-import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.util.NetCipherHelper;

 import java.net.HttpURLConnection;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.TimeZone;

 public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHolder> {
-    private final SimpleDateFormat TS_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
    public interface OnInteractionListener {
        void onInteraction(View view, NodeInfo item);

@@ -54,14 +50,16 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
    private final List<NodeInfo> nodeItems = new ArrayList<>();
    private final OnInteractionListener listener;

-    private final Context context;
+    private final FragmentActivity activity;

-    public NodeInfoAdapter(Context context, OnInteractionListener listener) {
-        this.context = context;
+    public NodeInfoAdapter(FragmentActivity activity, OnInteractionListener listener) {
+        this.activity = activity;
        this.listener = listener;
-        Calendar cal = Calendar.getInstance();
-        TimeZone tz = cal.getTimeZone(); //get the local time zone.
-        TS_FORMATTER.setTimeZone(tz);
+    }
+
+    public void notifyItemChanged(NodeInfo nodeInfo) {
+        final int pos = nodeItems.indexOf(nodeInfo);
+        if (pos >= 0) notifyItemChanged(pos);
    }

    private static class NodeDiff extends DiffCallback<NodeInfo> {
@@ -142,7 +140,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
        final ImageButton ibBookmark;
        final View pbBookmark;
        final TextView tvName;
-        final TextView tvIp;
+        final TextView tvInfo;
        final ImageView ivPing;
        NodeInfo nodeItem;

@@ -151,7 +149,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
            ibBookmark = itemView.findViewById(R.id.ibBookmark);
            pbBookmark = itemView.findViewById(R.id.pbBookmark);
            tvName = itemView.findViewById(R.id.tvName);
-            tvIp = itemView.findViewById(R.id.tvAddress);
+            tvInfo = itemView.findViewById(R.id.tvInfo);
            ivPing = itemView.findViewById(R.id.ivPing);
            ibBookmark.setOnClickListener(v -> {
                nodeItem.toggleFavourite();
@@ -179,13 +177,12 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
            ivPing.setImageResource(getPingIcon(nodeItem));
            if (nodeItem.isTested()) {
                if (nodeItem.isValid()) {
-                    Helper.showTimeDifference(tvIp, nodeItem.getTimestamp());
+                    nodeItem.showInfo(tvInfo);
                } else {
-                    tvIp.setText(getResponseErrorText(context, nodeItem.getResponseCode()));
-                    tvIp.setTextColor(ThemeHelper.getThemedColor(context, R.attr.colorError));
+                    nodeItem.showInfo(tvInfo, getResponseErrorText(activity, nodeItem.getResponseCode()), true);
                }
            } else {
-                tvIp.setText(context.getResources().getString(R.string.node_testing, nodeItem.getHostAddress()));
+                nodeItem.showInfo(tvInfo);
            }
            itemView.setSelected(nodeItem.isSelected());
            itemView.setClickable(itemsClickable);
@@ -201,6 +198,16 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
                int position = getAdapterPosition(); // gets item position
                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
                    final NodeInfo node = nodeItems.get(position);
+                    if (node.isOnion()) {
+                        switch (NetCipherHelper.getStatus()) {
+                            case NOT_INSTALLED:
+                                HelpFragment.display(activity.getSupportFragmentManager(), R.string.help_tor);
+                                return;
+                            case DISABLED:
+                                HelpFragment.display(activity.getSupportFragmentManager(), R.string.help_tor_enable);
+                                return;
+                        }
+                    }
                    node.setSelecting(true);
                    allowClick(false);
                    listener.onInteraction(view, node);
@@ -222,21 +229,21 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo

    static public int getPingIcon(NodeInfo nodeInfo) {
        if (nodeInfo.isUnauthorized()) {
-            return R.drawable.ic_wifi_lock_black_24dp;
+            return R.drawable.ic_wifi_lock;
        }
        if (nodeInfo.isValid()) {
            final double ping = nodeInfo.getResponseTime();
            if (ping < NodeInfo.PING_GOOD) {
-                return R.drawable.ic_signal_wifi_4_bar_24dp;
+                return R.drawable.ic_wifi_4_bar;
            } else if (ping < NodeInfo.PING_MEDIUM) {
-                return R.drawable.ic_signal_wifi_3_bar_24dp;
+                return R.drawable.ic_wifi_3_bar;
            } else if (ping < NodeInfo.PING_BAD) {
-                return R.drawable.ic_signal_wifi_2_bar_24dp;
+                return R.drawable.ic_wifi_2_bar;
            } else {
-                return R.drawable.ic_signal_wifi_1_bar_24dp;
+                return R.drawable.ic_wifi_1_bar;
            }
        } else {
-            return R.drawable.ic_signal_wifi_off_24dp;
+            return R.drawable.ic_wifi_off;
        }
    }

@@ -245,6 +252,8 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
            return ctx.getResources().getString(R.string.node_general_error);
        } else if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
            return ctx.getResources().getString(R.string.node_auth_error);
+        } else if (responseCode == 418) {
+            return ctx.getResources().getString(R.string.node_tor_error);
        } else {
            return ctx.getResources().getString(R.string.node_test_error, responseCode);
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
m2049r	ffda0e965b	bump version	2023-01-07 11:07:19 +01:00
m2049r	cc7cdb383c	tweak http timeouts so sideshift does not timeout (#881 )	2023-01-07 10:22:21 +01:00
m2049r	ac1ea05ef6	add unlockTime (#880 ) show lock icon for currently locked txs	2023-01-07 10:19:22 +01:00
m2049r	1ddd4f30b9	use monero v0.18.1.2 (#878 )	2022-12-04 21:04:15 +01:00
m2049r	1dc081834f	bump version	2022-10-22 11:33:11 +02:00
m2049r	ce084927e1	fix langauge list	2022-10-22 11:32:44 +02:00
Kartal Kaan Bozdoğan	3610781f43	Display the unconfirmed amount in the chosen currency (#844 ) Changed the translations accordingly	2022-10-22 10:59:25 +02:00
m2049r	ef3ddbac71	fix versions	2022-08-13 23:24:57 +02:00
m2049r	0512af1496	Monero v0.18.1.0	2022-08-13 10:20:21 +02:00
m2049r	bd2c49669a	Feature v18 (#860 ) * versions * remove x86 builds	2022-08-10 16:50:18 +02:00
Kartal Kaan Bozdoğan	ac7831d0f9	Upgrade to 0.18.0.0 Fluorine Fermi (#856 ) * Upgrade to Monero wallet 0.18.0.0 Fluorine Fermi	2022-08-05 01:09:56 +02:00
Kartal Kaan Bozdoğan	0f0b9a38c7	Fix new wallet restore height (#858 ) * New wallets: set current block height as the restore height. Go back 4 days for estimated heights	2022-08-05 01:09:10 +02:00
Kartal Kaan Bozdoğan	807db19603	Fixed zlib hashes (#845 )	2022-08-05 01:02:34 +02:00
m2049r	c956f38899	remove S for Nano	2022-05-23 19:47:53 +02:00
m2049r	db68f517d3	bump version	2022-05-23 19:31:22 +02:00
m2049r	d4b293af80	new strings (#839 )	2022-05-23 19:20:28 +02:00
m2049r	f7bbfc2fac	remove untranslatables (#838 )	2022-05-23 19:16:49 +02:00
m2049r	e08964749e	Fix entities (#837 ) * remove &check; * resolve nbsp	2022-05-23 19:03:45 +02:00
Dave Scotese	a05fa9d177	Exchange rate was hard to find. (#763 ) The FAQ I added uses both "exchange" and "rate," neither of which appeared in the FAQ otherwise.	2022-05-23 18:42:30 +02:00
kivojo	7fe2fbe37d	Translation to Farsi/Persian (#815 ) * about.xml translated to Farsi * minor improvements in translation * one small typo * help.xml translated to Farsi * <br/> tags fixed * better translation of word Mnemonic to Farsi * strings.xml translated to Farsi READY for PR! * oops, my bad! deleted the untranslatable strings. Co-authored-by: kivojo <user@example.com>	2022-05-23 18:41:06 +02:00
kingoflove819	40e30fed08	Create about.xml (#809 ) * Create about.xml * Update about.xml * Completed translating about.xml for tamil	2022-05-23 18:39:38 +02:00
kingoflove819	320c7865ff	Create help.xml (#810 ) * Create help.xml * Update help.xml * Update help.xml * Update help.xml * Update help.xml	2022-05-23 18:39:23 +02:00
kingoflove819	5e8cf8010e	Create strings.xml (#811 ) * Create strings.xml * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml * Completed strings.xml	2022-05-23 18:39:07 +02:00
Age Bosma	e671fa19e0	Specify wallet folder (#835 ) * Specify wallet folder * Update FAQ.md	2022-05-23 18:36:22 +02:00
m2049r	20d5b9a100	fix sweep to be invisible by default	2022-05-15 21:56:38 +02:00
m2049r	5d489a634b	bump version	2022-05-15 17:25:28 +02:00
m2049r	59b6f484fd	update to monero v0.17.3.2	2022-05-15 17:24:54 +02:00
m2049r	ecaa49d67d	upgrade build files	2022-05-15 15:57:11 +02:00
jont4	d2dc53599e	Update PT-rBR strings (#813 ) * Update pt-rBR * Update app/src/main/res/values-pt-rBR/strings.xml Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> * Update app/src/main/res/values-pt-rBR/strings.xml Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> * Update strings.xml fix as suggested Co-authored-by: jontaix <31804298+jontaix@users.noreply.github.com> Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> Co-authored-by: m2049r <m2049r@monerujo.io>	2022-05-01 11:51:49 +02:00
Лапки	4d8b26f97f	Update strings.xml (#826 )	2022-05-01 11:44:52 +02:00
Justin Berman	581c76e7be	setName uses async network helper in case of reverse DNS lookup (#818 , #827 ) (#828 )	2022-05-01 11:44:27 +02:00
AnonimaUzanto	6f66862870	Adding support for Ledger Nano S Plus (#832 )	2022-05-01 11:35:01 +02:00
m2049r	dd92f7bb36	bump version	2022-03-13 15:37:28 +01:00
m2049r	46808d306b	clean transitions	2022-03-12 23:10:34 +01:00
m2049r	20503d2cbd	remove send/receive transitions	2022-03-11 00:25:50 +01:00
m2049r	604691ca7e	fix FABs	2022-03-10 21:06:19 +01:00
m2049r	1b626ba2b0	improve transitions	2022-03-10 20:57:57 +01:00
m2049r	0ed7bdfcee	remove test Dockerfile	2022-03-10 09:07:14 +01:00
m2049r	524c3dd79f	upgrade ci image to 2022.03-ndk (#822 )	2022-03-10 09:04:43 +01:00
m2049r	197dffeae1	fix tests	2022-03-10 07:53:52 +01:00
m2049r	cdb29bbc2e	themes (#821 ) * Support multiple colour themes * Fix sharing * Add settings * Fantastic UI tweaks	2022-03-09 19:10:30 +01:00
m2049r	7b96baeca7	fix watch only	2022-01-03 12:53:31 +01:00
m2049r	0712efec78	allow seed offset generation & wallet restore (#804 )	2022-01-02 20:50:07 +01:00
Katant Savelev	341df6c6a3	Update RU translation (#798 ) * Update help.xml * Update strings.xml	2022-01-02 14:10:33 +01:00
m2049r	ab8fb82c1b	fix unit tests (#803 )	2022-01-02 14:07:23 +01:00
m2049r	22d9173cea	store only through service & setPassword (#802 )	2022-01-02 13:05:46 +01:00
m2049r	05720e63ab	onion stuff (#796 )	2021-12-05 22:24:26 +01:00
Diego Delmondes	cdc2b23257	Improve Brazillian Portuguese translation (#778 ) * Improve translation Fix typos, improve the translation in general and translate some English strings. * Update strings.xml	2021-12-05 19:23:03 +01:00
m2049r	9f0e89719c	remove arabic (#795 )	2021-12-05 19:00:10 +01:00
m2049r	190726e61c	Merge branch 'Fushko-it-transl'	2021-12-05 18:59:36 +01:00
m2049r	729fafdb48	fix apostrophes	2021-12-05 18:59:26 +01:00
m2049r	b7ae23ac64	Merge branch 'it-transl' of https://github.com/Fushko/xmrwallet into Fushko-it-transl	2021-12-05 18:58:32 +01:00
m2049r	27885f2c86	create wallet only by button & refactoring (#793 )	2021-12-05 18:10:25 +01:00
Francesco Fusco	ce9046c7b5	Update italian translation	2021-12-01 21:36:22 +01:00
m2049r	506e6ce017	bump version	2021-10-27 08:37:52 +02:00
m2049r	f07b439731	correct settleAmount formatting for non-US locales (#791 )	2021-10-26 17:36:03 +02:00