1 files changed, 109 insertions, 111 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
index 6d7ed56..325d546 100644
--- a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
+++ b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java
@@ -21,12 +21,9 @@
 package fil.libre.repwifiapp.activities;
 
 import java.util.Date;
-
-
-import fil.libre.repwifiapp.Commons;
+import fil.libre.repwifiapp.ActivityLauncher;
 import fil.libre.repwifiapp.R;
 import fil.libre.repwifiapp.helpers.AccessPointInfo;
-
 import android.os.Bundle;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -42,111 +39,112 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public class NetworkDetailsActivity extends Activity implements OnCheckedChangeListener {
 
-	private AccessPointInfo currentNetwor;
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_network_details);
-		
-		CheckBox c = (CheckBox)findViewById(R.id.chk_show_pass_details);
-		c.setOnCheckedChangeListener(this);
-		
-		Intent intent = getIntent();
-		if (! intent.hasExtra(Commons.EXTRA_APINFO)){
-			this.setResult(RESULT_CANCELED);
-			this.finish();
-			return;
-		}
-		
-		this.currentNetwor = (AccessPointInfo)intent.getExtras().getSerializable(Commons.EXTRA_APINFO);
-		if (this.currentNetwor == null){
-			this.setResult(RESULT_CANCELED);
-			this.finish();
-			return;
-		}
-		
-		loadNetwork(false);
-		
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		//getMenuInflater().inflate(R.menu.activity_manage_networks, menu);
-		return true;
-	}
-	
-	private void loadNetwork(boolean showPassword){
-		
-		setTitle(this.currentNetwor.getSSID());
-		
-		TextView v = (TextView)findViewById(R.id.txt_net_details);
-		v.setText("SSID: " + this.currentNetwor.getSSID());
-		v.append("\nBSSID: " + this.currentNetwor.getBSSID());
-		
-		long lastused = this.currentNetwor.getLastTimeUsed();
-		
-		if (lastused > 0){
-			Date ts = new Date(lastused);
-			String formstring = "dd-MMM-yyyy kk:mm:ss";
-			v.append("\nLast Used: " + DateFormat.format(formstring, ts));
-		}
-		
-		if (showPassword){
-			v.append("\n\nPassword:\n" + this.currentNetwor.getPassword());
-		}
-		else{
-			v.append("\n\n\n");
-		}
-		
-	}
-	
-	public void btnDeleteClick(View v){
-		
-		String msg = getResources().getString(R.string.msg_confirm_delete_network);
-		String yes = getResources().getString(R.string.yes);
-		String no = getResources().getString(R.string.no);
-		
-		AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);                      
-	    dlgAlert.setMessage(msg); 
-	    dlgAlert.setPositiveButton(yes,new DialogInterface.OnClickListener() {
-	        @Override
-			public void onClick(DialogInterface dialog, int whichButton) {
-	             returnResult(true);
-	        }
-	   });
-	    dlgAlert.setNegativeButton(no,new DialogInterface.OnClickListener() {
-	        @Override
-			public void onClick(DialogInterface dialog, int whichButton) {
-	        	 return;
-	        }
-	   });
-	    
-	    dlgAlert.setCancelable(true);
-	    dlgAlert.create().show();
-		
-	}
-
-	@Override
-	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-		
-		if (buttonView == findViewById(R.id.chk_show_pass_details)){
-			loadNetwork(isChecked);			
-		}
-		
-	}
-	
-	private void returnResult(boolean delete){
-		
-		Intent i = new Intent();
-		i.putExtra(Commons.EXTRA_DELETE, delete);
-		i.putExtra(Commons.EXTRA_APINFO, this.currentNetwor);
-		this.setResult(RESULT_OK,i);
-		finish();
-		
-	}
-
-	
-	
+    private AccessPointInfo currentNetwork;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_network_details);
+
+        CheckBox c = (CheckBox) findViewById(R.id.chk_show_pass_details);
+        c.setOnCheckedChangeListener(this);
+
+        Intent intent = getIntent();
+        if (!intent.hasExtra(ActivityLauncher.EXTRA_APINFO)) {
+            this.setResult(RESULT_CANCELED);
+            this.finish();
+            return;
+        }
+
+        this.currentNetwork = (AccessPointInfo) intent.getExtras().getSerializable(
+                        ActivityLauncher.EXTRA_APINFO);
+        if (this.currentNetwork == null) {
+            this.setResult(RESULT_CANCELED);
+            this.finish();
+            return;
+        }
+
+        loadNetwork(false);
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        // getMenuInflater().inflate(R.menu.activity_manage_networks, menu);
+        return true;
+    }
+
+    private void loadNetwork(boolean showPassword) {
+
+        setTitle(this.currentNetwork.getSsid());
+
+        TextView v = (TextView) findViewById(R.id.txt_net_details);
+        v.setText("SSID: " + this.currentNetwork.getSsid());
+        v.append("\nBSSID: " + this.currentNetwork.getBssid());
+
+        long lastused = this.currentNetwork.getLastTimeUsed();
+
+        if (lastused > 0) {
+            Date ts = new Date(lastused);
+            String formstring = "dd-MMM-yyyy kk:mm:ss";
+            v.append("\nLast Used: " + DateFormat.format(formstring, ts));
+        }
+
+        if (showPassword) {
+            v.append("\n\nPassword:\n" + this.currentNetwork.getPassword());
+        } else {
+            v.append("\n\n\n");
+        }
+
+    }
+
+    public void btnDeleteClick(View v) {
+
+        String msg = getResources().getString(R.string.msg_confirm_delete_network);
+        String yes = getResources().getString(R.string.yes);
+        String no = getResources().getString(R.string.no);
+
+        AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this,
+                        R.style.Theme_RepWifiDialogTheme);
+        dlgAlert.setMessage(msg);
+        dlgAlert.setPositiveButton(yes, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int whichButton) {
+                returnResult(true);
+            }
+        });
+        dlgAlert.setNegativeButton(no, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int whichButton) {
+                return;
+            }
+        });
+
+        dlgAlert.setCancelable(true);
+        dlgAlert.create().show();
+
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+        if (buttonView == findViewById(R.id.chk_show_pass_details)) {
+            loadNetwork(isChecked);
+        }
+
+    }
+
+    private void returnResult(boolean delete) {
+
+        Intent i = new Intent();
+        i.putExtra(ActivityLauncher.EXTRA_DELETE, delete);
+        i.putExtra(ActivityLauncher.EXTRA_APINFO, this.currentNetwork);
+        this.setResult(RESULT_OK, i);
+        finish();
+
+    }
+
 }