1 files changed, 17 insertions, 16 deletions

diff --git a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
index f2a8944..7b12efc 100644
--- a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.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.
 //
@@ -20,23 +20,23 @@
 
 package fil.libre.repwifiapp.activities;
 
-import java.util.Date;
-import fil.libre.repwifiapp.ActivityLauncher;
-import fil.libre.repwifiapp.Commons;
-import fil.libre.repwifiapp.R;
-import fil.libre.repwifiapp.helpers.AccessPointInfo;
-import android.os.Bundle;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.format.DateFormat;
 import android.view.Menu;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.TextView;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.TextView;
+import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.R;
+import fil.libre.repwifiapp.network.AccessPointInfo;
+import fil.libre.repwifiapp.network.NetworkManager;
+import java.util.Date;
 
 public class NetworkDetailsActivity extends Activity implements OnCheckedChangeListener {
 
@@ -57,7 +57,7 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL
             return;
         }
 
-        this.currentNetwork = (AccessPointInfo) intent.getExtras().getSerializable(
+        this.currentNetwork = (AccessPointInfo) intent.getExtras().getParcelable(
                         ActivityLauncher.EXTRA_APINFO);
         if (this.currentNetwork == null) {
             this.setResult(RESULT_CANCELED);
@@ -72,9 +72,9 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL
     @Override
     protected void onStart() {
         super.onStart();
-        currentNetwork = Commons.storage.getSavedNetwork(currentNetwork);
+        currentNetwork = NetworkManager.getSavedNetwork(currentNetwork);
     };
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -100,21 +100,22 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL
         }
 
         if (showPassword) {
-            v.append("\n\n" + getString(R.string.text_password) + ":\n" + this.currentNetwork.getPassword());
+            v.append("\n\n" + getString(R.string.text_password) + ":\n"
+                            + this.currentNetwork.getPassword());
         } else {
             v.append("\n\n\n");
         }
 
     }
 
-    public void btnIpSettingsClick(View v){
+    public void btnIpSettingsClick(View v) {
         new ActivityLauncher(this).launchIpSettingsActivity(currentNetwork);
     }
-    
-    public void btnVpnSettingsClick(View v){
+
+    public void btnVpnSettingsClick(View v) {
         new ActivityLauncher(this).launchVpnSettingsActivity(currentNetwork);
     }
-    
+
     public void btnDeleteClick(View v) {
 
         String msg = getResources().getString(R.string.msg_confirm_delete_network);