disable ledger support (#547)

m2049r · Mar 5, 2019 · de8de02 · de8de02
1 parent 06456e3
commit de8de02
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 171
-        versionName "1.11.1 'Chernushka'"
+        versionCode 172
+        versionName "1.11.2 'Chernushka'"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -1361,30 +1361,31 @@ public void onReceive(Context context, Intent intent) {
     };
 
     private void connectLedger(UsbManager usbManager, final UsbDevice usbDevice) {
-        try {
-            Ledger.connect(usbManager, usbDevice);
-            registerDetachReceiver();
-            onLedgerAction();
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(LoginActivity.this,
-                            getString(R.string.toast_ledger_attached, usbDevice.getProductName()),
-                            Toast.LENGTH_SHORT)
-                            .show();
-                }
-            });
-        } catch (IOException ex) {
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(LoginActivity.this,
-                            getString(R.string.open_wallet_ledger_missing),
-                            Toast.LENGTH_SHORT)
-                            .show();
-                }
-            });
-        }
+        if (Ledger.ENABLED)
+            try {
+                Ledger.connect(usbManager, usbDevice);
+                registerDetachReceiver();
+                onLedgerAction();
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(LoginActivity.this,
+                                getString(R.string.toast_ledger_attached, usbDevice.getProductName()),
+                                Toast.LENGTH_SHORT)
+                                .show();
+                    }
+                });
+            } catch (IOException ex) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(LoginActivity.this,
+                                getString(R.string.open_wallet_ledger_missing),
+                                Toast.LENGTH_SHORT)
+                                .show();
+                    }
+                });
+            }
     }
 
     @Override

diff --git a/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java b/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java
@@ -34,6 +34,7 @@
 import timber.log.Timber;
 
 public class Ledger {
+    static final public boolean ENABLED = false;
     // 5:20 is same as wallet2.cpp::restore()
     static public final int LOOKAHEAD_ACCOUNTS = 5;
     static public final int LOOKAHEAD_SUBADDRESSES = 20;
@@ -44,6 +45,7 @@ public class Ledger {
     public static final int OK[] = {SW_OK};
 
     public static UsbDevice findDevice(UsbManager usbManager) {
+        if (!ENABLED) return null;
         return BTChipTransportAndroidHID.getDevice(usbManager);
     }