1 files changed, 27 insertions, 14 deletions

diff --git a/app/src/fil/libre/repwifiapp/ActivityLauncher.java b/app/src/fil/libre/repwifiapp/ActivityLauncher.java
index 5e9c31d..d5d2b15 100644
--- a/app/src/fil/libre/repwifiapp/ActivityLauncher.java
+++ b/app/src/fil/libre/repwifiapp/ActivityLauncher.java
@@ -1,5 +1,5 @@
 //
-// Copyright 2017 Filippo "Fil" Bergamo <fil.bergamo@riseup.net>
+// Copyright 2017, 2018 Filippo "Fil" Bergamo <fil.bergamo@riseup.net>
 // 
 // This file is part of RepWifiApp.
 //
@@ -31,9 +31,9 @@ import fil.libre.repwifiapp.activities.NetworkDetailsActivity;
 import fil.libre.repwifiapp.activities.SelectNetworkActivity;
 import fil.libre.repwifiapp.activities.ShowStatusActivity;
 import fil.libre.repwifiapp.activities.VpnSettingsActivity;
-import fil.libre.repwifiapp.helpers.AccessPointInfo;
-import fil.libre.repwifiapp.helpers.ConnectionStatus;
-import fil.libre.repwifiapp.helpers.NetworkManager;
+import fil.libre.repwifiapp.network.AccessPointInfo;
+import fil.libre.repwifiapp.network.ConnectionStatus;
+import fil.libre.repwifiapp.network.NetworkManager;
 
 public class ActivityLauncher {
 
@@ -42,9 +42,12 @@ public class ActivityLauncher {
     public static final String EXTRA_APINFO_ARR = "ExAPInfoArr";
     public static final String EXTRA_CONSTATUS = "ExConSts";
     public static final String EXTRA_BOOLEAN = "ExBool";
+    public static final String EXTRA_INTEGER = "ExInt";
     public static final String EXTRA_REQCODE = "ExReqCode";
     public static final String EXTRA_RESCAN = "ExRescan";
     public static final String EXTRA_DELETE = "ExDelete";
+    public static final String EXTRA_MESSAGE = "ExMsg";
+    public static final String EXTRA_CONNRES = "ExConnRes";
 
     public class RequestCode {
 
@@ -61,7 +64,8 @@ public class ActivityLauncher {
         public static final int CONNECT_HIDDEN = 10;
         public static final int USB_ATTACHED = 11;
         public static final int USB_DETACHED = 12;
-        public static final int VPN_PERMISSION = 13;
+        public static final int VPN_PERMISSION_CONN = 13;
+        public static final int VPN_PERMISSION_LIST = 14;
 
     }
 
@@ -82,7 +86,7 @@ public class ActivityLauncher {
     }
 
     public void launchLongTaskActivityConnect(AccessPointInfo info) {
-        
+
         Intent intent = new Intent(currentContext, LongTaskActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         intent.putExtra(ActivityLauncher.EXTRA_REQCODE, RequestCode.CONNECT);
@@ -99,11 +103,20 @@ public class ActivityLauncher {
     }
 
     public void launchPasswordActivity(AccessPointInfo info) {
+        launchPasswordActivity(info, null);
+    }
+
+    public void launchPasswordActivity(AccessPointInfo info, String message) {
 
         Intent intent = new Intent();
         // intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         intent.setClass(currentContext, InputPasswordActivity.class);
         intent.putExtra(EXTRA_APINFO, info);
+
+        if (message != null) {
+            intent.putExtra(EXTRA_MESSAGE, message);
+        }
+
         currentContext.startActivityForResult(intent, RequestCode.PASS_INPUT);
     }
 
@@ -121,11 +134,12 @@ public class ActivityLauncher {
                     boolean fromStorage) {
 
         if (fromStorage) {
-            NetworkManager manager = new NetworkManager(Commons.getNetworkStorageFile());
-            nets = manager.getKnownNetworks();
+
+            nets = NetworkManager.getKnownNetworks();
 
             if (nets == null || nets.length == 0) {
-                Toast toast = Toast.makeText(currentContext, Commons.msgNoSavedNetwork, Toast.LENGTH_LONG);
+                Toast toast = Toast.makeText(currentContext, currentContext.getResources()
+                                .getString(R.string.msg_no_saved_network), Toast.LENGTH_LONG);
                 toast.show();
                 return;
             }
@@ -153,7 +167,7 @@ public class ActivityLauncher {
         currentContext.startActivityForResult(intent, RequestCode.DETAILS_SHOW);
 
     }
-    
+
     public void launchIpSettingsActivity(AccessPointInfo info) {
 
         Intent intent = new Intent(currentContext, Ipv4SettingsActivity.class);
@@ -162,14 +176,14 @@ public class ActivityLauncher {
         currentContext.startActivity(intent);
 
     }
-    
+
     public void launchVpnSettingsActivity(AccessPointInfo info) {
-        
+
         Intent intent = new Intent(currentContext, VpnSettingsActivity.class);
         // intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         intent.putExtra(EXTRA_APINFO, info);
         currentContext.startActivity(intent);
-        
+
     }
 
     public void launchInputSsidActivity() {
@@ -180,6 +194,5 @@ public class ActivityLauncher {
         currentContext.startActivityForResult(intent, RequestCode.CONNECT_HIDDEN);
 
     }
-    
 
 }