1 files changed, 9 insertions, 10 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/InputSsidActivity.java b/app/src/fil/libre/repwifiapp/activities/InputSsidActivity.java
index 8b7c60c..8ff1100 100644
--- a/app/src/fil/libre/repwifiapp/activities/InputSsidActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/InputSsidActivity.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.
 //
@@ -17,20 +17,20 @@
 // along with RepWifiApp.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // ********************************************************************
-
 package fil.libre.repwifiapp.activities;
 
-import fil.libre.repwifiapp.ActivityLauncher;
-import fil.libre.repwifiapp.ActivityLauncher.RequestCode;
-import fil.libre.repwifiapp.Commons;
-import fil.libre.repwifiapp.R;
-import fil.libre.repwifiapp.helpers.AccessPointInfo;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
 import android.widget.EditText;
+import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.ActivityLauncher.RequestCode;
+import fil.libre.repwifiapp.Commons;
+import fil.libre.repwifiapp.R;
+import fil.libre.repwifiapp.Utils;
+import fil.libre.repwifiapp.network.AccessPointInfo;
 
 public class InputSsidActivity extends Activity {
 
@@ -66,8 +66,7 @@ public class InputSsidActivity extends Activity {
 
             if (intent.hasExtra(ActivityLauncher.EXTRA_APINFO)) {
                 Bundle xtras = intent.getExtras();
-                AccessPointInfo i = (AccessPointInfo) xtras
-                                .getSerializable(ActivityLauncher.EXTRA_APINFO);
+                AccessPointInfo i = (AccessPointInfo) xtras.getParcelable(ActivityLauncher.EXTRA_APINFO);
                 returnAccessPointInfo(i);
             }
 
@@ -85,7 +84,7 @@ public class InputSsidActivity extends Activity {
         String ssid = txssid.getText().toString();
 
         if (ssid.length() == 0) {
-            Commons.showMessage(getString(R.string.msg_network_name_empty), this);
+            Utils.showMessage(getString(R.string.msg_network_name_empty), this);
             return;
         }