1 files changed, 11 insertions, 12 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java
index 51baed8..f1e1a96 100644
--- a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.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,15 +20,9 @@
 
 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.NetworkButton;
-import fil.libre.repwifiapp.helpers.Utils;
-import android.os.Bundle;
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.View;
@@ -38,6 +32,11 @@ import android.widget.Button;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.R;
+import fil.libre.repwifiapp.helpers.Logger;
+import fil.libre.repwifiapp.network.AccessPointInfo;
+import fil.libre.repwifiapp.network.NetworkButton;
 
 public class SelectNetworkActivity extends Activity implements OnClickListener {
 
@@ -75,8 +74,8 @@ public class SelectNetworkActivity extends Activity implements OnClickListener {
             finish();
             return;
         }
-        AccessPointInfo[] nets = (AccessPointInfo[]) intent.getExtras().getSerializable(
-                        ActivityLauncher.EXTRA_APINFO_ARR);
+        AccessPointInfo[] nets = AccessPointInfo.fromParcellableArray(intent.getExtras().getParcelableArray(
+                        ActivityLauncher.EXTRA_APINFO_ARR));
         if (nets == null) {
             this.setResult(RESULT_CANCELED);
             finish();
@@ -134,7 +133,7 @@ public class SelectNetworkActivity extends Activity implements OnClickListener {
     private void showNetworksForConnection(AccessPointInfo[] info) {
 
         if (info == null) {
-            Utils.logError("Unable to retrieve network list!");
+            Logger.logError("Unable to retrieve network list!");
             writeOut(getString(R.string.msg_network_list_fail));
             return;
         }
@@ -203,7 +202,7 @@ public class SelectNetworkActivity extends Activity implements OnClickListener {
                         LayoutParams.WRAP_CONTENT);
         button.setLayoutParams(params);
         button.setBackground(getResources().getDrawable(R.drawable.repwifi_button));
-        button.setTextColor(Commons.colorThemeLight);
+        button.setTextColor(getResources().getColor(R.color.ThemeLight));
         button.setTextSize(20);
         button.setPadding(25, 10, 25, 10);
         button.setGravity(Gravity.CENTER_HORIZONTAL);