Remove local/remote setup choice (#280)

LN-Zap · Dec 14, 2020 · 419fda6 · 419fda6
1 parent 200403b
commit 419fda6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/zapsolutions/zap/fragments/WalletFragment.java b/app/src/main/java/zapsolutions/zap/fragments/WalletFragment.java
@@ -288,6 +288,7 @@ public void onSingleClick(View v) {
             public void onClick(View v) {
                 Intent intent = new Intent(getActivity(), SetupActivity.class);
                 intent.putExtra(RefConstants.SETUP_MODE, SetupActivity.FULL_SETUP);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
                 startActivity(intent);
             }
         });

diff --git a/app/src/main/java/zapsolutions/zap/setup/SetupActivity.java b/app/src/main/java/zapsolutions/zap/setup/SetupActivity.java
@@ -1,5 +1,6 @@
 package zapsolutions.zap.setup;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -60,7 +61,11 @@ private void showEnterPin() {
     }
 
     private void showConnectChoice() {
-        changeFragment(new ConnectFragment());
+        // The choice is skipped right now. Instead we immediately go to the scan activity
+        //changeFragment(new ConnectFragment());
+
+        Intent intent = new Intent(SetupActivity.this, ConnectRemoteNodeActivity.class);
+        startActivity(intent);
     }
 
     private void changeFragment(Fragment fragment) {

diff --git a/app/src/main/java/zapsolutions/zap/walletManagement/ManageWalletsActivity.java b/app/src/main/java/zapsolutions/zap/walletManagement/ManageWalletsActivity.java
@@ -55,6 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onClick(View view) {
                 // Add a new wallet
                 Intent intent = new Intent(ManageWalletsActivity.this, SetupActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
                 startActivity(intent);
             }
         });