1 files changed, 19 insertions, 19 deletions

diff --git a/app/src/fil/libre/repwifiapp/activities/Ipv4SettingsActivity.java b/app/src/fil/libre/repwifiapp/activities/Ipv4SettingsActivity.java
index 1f15252..eba62ac 100644
--- a/app/src/fil/libre/repwifiapp/activities/Ipv4SettingsActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/Ipv4SettingsActivity.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,21 +20,22 @@
 
 package fil.libre.repwifiapp.activities;
 
-import fil.libre.repwifiapp.ActivityLauncher;
-import fil.libre.repwifiapp.Commons;
-import fil.libre.repwifiapp.R;
-import fil.libre.repwifiapp.helpers.AccessPointInfo;
-import fil.libre.repwifiapp.helpers.DhcpSettings;
-import android.nfc.FormatException;
-import android.os.Bundle;
 import android.app.Activity;
 import android.content.Intent;
+import android.nfc.FormatException;
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.R;
+import fil.libre.repwifiapp.Utils;
+import fil.libre.repwifiapp.network.AccessPointInfo;
+import fil.libre.repwifiapp.network.DhcpSettings;
+import fil.libre.repwifiapp.network.NetworkManager;
 
 public class Ipv4SettingsActivity extends Activity implements OnCheckedChangeListener {
 
@@ -65,15 +66,14 @@ public class Ipv4SettingsActivity extends Activity implements OnCheckedChangeLis
             return;
         }
 
-        this.currentNetwork = (AccessPointInfo) intent.getExtras().getSerializable(
-                        ActivityLauncher.EXTRA_APINFO);
+        this.currentNetwork = (AccessPointInfo) intent.getExtras().getParcelable(ActivityLauncher.EXTRA_APINFO);
         if (this.currentNetwork == null) {
             this.setResult(RESULT_CANCELED);
             this.finish();
             return;
         }
 
-        this.currentNetwork = Commons.storage.getSavedNetwork(currentNetwork);
+        this.currentNetwork = NetworkManager.getSavedNetwork(currentNetwork);
         
         loadNetwork();
 
@@ -88,7 +88,7 @@ public class Ipv4SettingsActivity extends Activity implements OnCheckedChangeLis
 
     private void loadNetwork() {
 
-        setTitle(this.currentNetwork.getSsid());
+        setTitle(getString(R.string.text_ipv4_settings) + " " + this.currentNetwork.getSsid());
         currentSettings = this.currentNetwork.getDhcpConfiguration();
         loadSettings();
         
@@ -147,17 +147,17 @@ public class Ipv4SettingsActivity extends Activity implements OnCheckedChangeLis
             String gw = txtGw.getText().toString();
 
             if (!DhcpSettings.isValidAddress(ip)) {
-                Commons.showMessage(getString(R.string.msg_invalid_ip),this);
+                Utils.showMessage(getString(R.string.msg_invalid_ip),this);
                 return;
             }
 
             if (!DhcpSettings.isValidMaks(mask)) {
-                Commons.showMessage(getString(R.string.msg_invalid_netmask),this);
+                Utils.showMessage(getString(R.string.msg_invalid_netmask),this);
                 return;
             }
 
             if (!DhcpSettings.isValidAddress(gw)) {
-                Commons.showMessage(getString(R.string.msg_invalid_gateway),this);
+                Utils.showMessage(getString(R.string.msg_invalid_gateway),this);
                 return;
             }
 
@@ -166,10 +166,10 @@ public class Ipv4SettingsActivity extends Activity implements OnCheckedChangeLis
         }
 
         currentNetwork.setDhcpConfiguration(currentSettings);
-        if (Commons.storage.save(currentNetwork)) {
-            Commons.showMessage(getString(R.string.msg_network_saved),this);
+        if (NetworkManager.save(currentNetwork)) {
+            Utils.showMessage(getString(R.string.msg_network_saved),this);
         } else {
-            Commons.showMessage(getString(R.string.msg_network_save_fail),this);
+            Utils.showMessage(getString(R.string.msg_network_save_fail),this);
         }
 
     }