1 files changed, 26 insertions, 7 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java
index 32922c6..7578ec3 100644
--- a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.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,13 +17,11 @@
 // 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.Commons;
-import fil.libre.repwifiapp.R;
-import fil.libre.repwifiapp.helpers.AccessPointInfo;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -35,10 +33,15 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.TextView;
+import fil.libre.repwifiapp.ActivityLauncher;
+import fil.libre.repwifiapp.R;
+import fil.libre.repwifiapp.Utils;
+import fil.libre.repwifiapp.network.AccessPointInfo;
 
 public class InputPasswordActivity extends Activity implements OnCheckedChangeListener {
 
     AccessPointInfo apinfo = null;
+    String message = null;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -54,11 +57,27 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi
         TextView v = (TextView) findViewById(R.id.txt_insert_pass);
 
         // get the network to set password to:
-        this.apinfo = (AccessPointInfo) getIntent().getSerializableExtra(
+        this.apinfo = (AccessPointInfo) getIntent().getParcelableExtra(
                         ActivityLauncher.EXTRA_APINFO);
+        
+        if (getIntent().hasExtra(ActivityLauncher.EXTRA_MESSAGE)){
+            this.message = getIntent().getStringExtra(ActivityLauncher.EXTRA_MESSAGE);
+        }
+        
         v.append(" " + apinfo.getSsid());
 
     }
+    
+    @Override
+    public void onStart(){
+        super.onStart();
+        
+        if (this.message != null){
+            Utils.showMessage(message, this);
+            this.message = null;
+        }
+        
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -81,7 +100,7 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi
         String pass = txpass.getText().toString();
 
         if (pass.length() == 0) {
-            Commons.showMessage(getString(R.string.msg_password_empty), this);
+            Utils.showMessage(getString(R.string.msg_password_empty), this);
         }
 
         this.apinfo.setPassword(pass);