onion stuff (#796)

Author: m2049r

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1102
-        versionName "2.1.2 'Vertant'"
+        versionCode 1201
+        versionName "2.2.1 'René'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -113,34 +113,38 @@ android {
     }
 }
 
-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.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
     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.constraintlayout:constraintlayout:2.1.1'
 
     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 '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.3.0'
 
     implementation 'dnsjava:dnsjava:2.1.9'
     implementation 'org.jitsi:dnssecjava:1.2.0'
     implementation 'org.slf4j:slf4j-nop:1.7.30'
     implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
 
+    //noinspection GradleDependency
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
@@ -150,3 +154,4 @@ dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.16'
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
 }
+

app/src/main/AndroidManifest.xml

@@ -11,6 +11,24 @@
     <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"

app/src/main/cpp/monerujo.cpp

@@ -531,6 +531,17 @@ Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobj
     return env->NewStringUTF(resolvedAlias.c_str());
 }
 
+JNIEXPORT jboolean JNICALL
+Java_com_m2049r_xmrwallet_model_WalletManager_setProxy(JNIEnv *env, jobject instance,
+                                                               jstring address) {
+    const char *_address = env->GetStringUTFChars(address, nullptr);
+    bool rc =
+            Bitmonero::WalletManagerFactory::getWalletManager()->setProxy(std::string(_address));
+    env->ReleaseStringUTFChars(address, _address);
+    return rc;
+}
+
+
 //TODO static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, const std::string &subdir);
 
 JNIEXPORT jboolean JNICALL
@@ -727,6 +738,16 @@ Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject
 //TODO virtual void setTrustedDaemon(bool arg) = 0;
 //TODO virtual bool trustedDaemon() const = 0;
 
+JNIEXPORT jboolean JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_setProxy(JNIEnv *env, jobject instance,
+                                                       jstring address) {
+    const char *_address = env->GetStringUTFChars(address, nullptr);
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    bool rc = wallet->setProxy(std::string(_address));
+    env->ReleaseStringUTFChars(address, _address);
+    return rc;
+}
+
 JNIEXPORT jlong JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getBalance(JNIEnv *env, jobject instance,
                                                   jint accountIndex) {

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

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

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

@@ -65,6 +65,7 @@
 import com.m2049r.xmrwallet.util.LegacyStorageHelper;
 import com.m2049r.xmrwallet.util.LocaleHelper;
 import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.util.NetCipherHelper;
 import com.m2049r.xmrwallet.util.NightmodeHelper;
 import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.ZipBackup;
@@ -701,6 +702,7 @@ protected void onResume() {
             new AsyncWaitForService().execute();
         }
         if (!Ledger.isConnected()) attachLedger();
+        registerTor();
     }
 
     private class AsyncWaitForService extends AsyncTask<Void, Void, Void> {
@@ -1469,4 +1471,69 @@ private UsbManager getUsbManager() {
         }
         return usbManager;
     }
+
+    //
+    // Tor (Orbot) stuff
+    //
+
+    void torNotify() {
+        final Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
+        if (fragment == null) return;
+
+        if (fragment instanceof LoginFragment) {
+            runOnUiThread(((LoginFragment) fragment)::showNetwork);
+        }
+    }
+
+    private void deregisterTor() {
+        NetCipherHelper.deregister();
+    }
+
+    private void registerTor() {
+        NetCipherHelper.register(new NetCipherHelper.OnStatusChangedListener() {
+            @Override
+            public void connected() {
+                Timber.d("CONNECTED");
+                WalletManager.getInstance().setProxy(NetCipherHelper.getProxy());
+                torNotify();
+                if (waitingUiTask != null) {
+                    Timber.d("RUN");
+                    runOnUiThread(waitingUiTask);
+                    waitingUiTask = null;
+                }
+            }
+
+            @Override
+            public void disconnected() {
+                Timber.d("DISCONNECTED");
+                WalletManager.getInstance().setProxy("");
+                torNotify();
+            }
+
+            @Override
+            public void notInstalled() {
+                Timber.d("NOT INSTALLED");
+                WalletManager.getInstance().setProxy("");
+                torNotify();
+            }
+
+            @Override
+            public void notEnabled() {
+                Timber.d("NOT ENABLED");
+                notInstalled();
+            }
+        });
+    }
+
+    private Runnable waitingUiTask;
+
+    @Override
+    public void runOnNetCipher(Runnable uiTask) {
+        if (waitingUiTask != null) throw new IllegalStateException("only one tor task at a time");
+        if (NetCipherHelper.hasClient()) {
+            runOnUiThread(uiTask);
+        } else {
+            waitingUiTask = uiTask;
+        }
+    }
 }