From e4c9d1d522ee6caeadd30337a398e442b76355a9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 Aug 2018 10:13:20 +0200
Subject: [PATCH] move requestSwap method to static Intent-sending method
 pattern

---
 .../full/java/org/fdroid/fdroid/net/LocalHTTPD.java | 13 +------------
 .../fdroid/views/swap/SwapWorkflowActivity.java     | 10 ++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
index 4ba03df04..da63dcf1f 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
@@ -69,17 +69,6 @@ public class LocalHTTPD extends NanoHTTPD {
         return newUri;
     }
 
-    private void requestSwap(String repo) {
-        Utils.debugLog(TAG, "Received request to swap with " + repo);
-        Utils.debugLog(TAG, "Showing confirm screen to check whether that is okay with the user.");
-
-        Uri repoUri = Uri.parse(repo);
-        Intent intent = new Intent(context, SwapWorkflowActivity.class);
-        intent.setData(repoUri);
-        intent.putExtra(SwapWorkflowActivity.EXTRA_CONFIRM, true);
-        intent.putExtra(SwapWorkflowActivity.EXTRA_PREVENT_FURTHER_SWAP_REQUESTS, true);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
     }
 
     @Override
@@ -111,7 +100,7 @@ public class LocalHTTPD extends NanoHTTPD {
                     return newFixedLengthResponse(Response.Status.BAD_REQUEST, MIME_PLAINTEXT,
                             "Requires 'repo' parameter to be posted.");
                 }
-                requestSwap(session.getParms().get("repo"));
+                SwapWorkflowActivity.requestSwap(context, session.getParms().get("repo"));
                 return newFixedLengthResponse(Response.Status.OK, MIME_PLAINTEXT, "Swap request received.");
         }
         return newFixedLengthResponse("");
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 71f86e287..fd8616fd3 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -123,6 +123,16 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     private LocalBroadcastManager localBroadcastManager;
     private WifiManager wifiManager;
 
+    public static void requestSwap(Context context, String repo) {
+        Uri repoUri = Uri.parse(repo);
+        Intent intent = new Intent(context, SwapWorkflowActivity.class);
+        intent.setData(repoUri);
+        intent.putExtra(EXTRA_CONFIRM, true);
+        intent.putExtra(EXTRA_PREVENT_FURTHER_SWAP_REQUESTS, true);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
     @NonNull
     private final ServiceConnection serviceConnection = new ServiceConnection() {
         @Override