@@ -102,7 +102,6 @@ public class ReceiverActivity extends InjectableActivity implements OnItemClickL
102
102
103
103
private boolean isQRCodeScanned ;
104
104
private String ip ;
105
- private String ssidScanned ;
106
105
private boolean isProtected ;
107
106
private String passwordScanned ;
108
107
@@ -122,7 +121,6 @@ protected void onCreate(Bundle savedInstanceState) {
122
121
getSupportActionBar ().setDisplayHomeAsUpEnabled (true );
123
122
124
123
isQRCodeScanned = false ;
125
- ssidScanned = null ;
126
124
isProtected = false ;
127
125
port = -1 ;
128
126
@@ -405,14 +403,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
405
403
try {
406
404
JSONObject obj = new JSONObject (result .getContents ());
407
405
ip = (String ) obj .get (IP );
408
- ssidScanned = (String ) obj .get (SSID );
406
+ wifiNetworkSSID = (String ) obj .get (SSID );
409
407
port = (Integer ) obj .get (PORT );
410
408
isProtected = (boolean ) obj .get (PROTECTED );
411
409
if (isProtected ) {
412
410
passwordScanned = (String ) obj .get (PASSWORD );
413
411
}
414
412
415
- Timber .d ("Scanned results " + ssidScanned + " " + port + " " + isProtected + " " + passwordScanned );
413
+ Timber .d ("Scanned results " + wifiNetworkSSID + " " + port + " " + isProtected + " " + passwordScanned );
416
414
isQRCodeScanned = true ;
417
415
418
416
if (wifiConnector .getAccessPointIpAddress () != null && wifiConnector .getAccessPointIpAddress ().equals (ip )) {
@@ -497,12 +495,12 @@ private void wifiListAvailable(ArrayList<WifiNetworkInfo> list) {
497
495
if (isQRCodeScanned ) {
498
496
isQRCodeScanned = false ;
499
497
for (WifiNetworkInfo info : list ) {
500
- if (info .getSsid ().equals (ssidScanned )) {
498
+ if (info .getSsid ().equals (wifiNetworkSSID )) {
501
499
if (info .getState () != NetworkInfo .DetailedState .CONNECTED ) {
502
500
Toast .makeText (this , "attempting connection" , Toast .LENGTH_SHORT ).show ();
503
- connectToNetwork (info .getSecurityType (), ssidScanned , passwordScanned );
501
+ connectToNetwork (info .getSecurityType (), wifiNetworkSSID , passwordScanned );
504
502
} else {
505
- Toast .makeText (this , "already connected to " + ssidScanned , Toast .LENGTH_SHORT ).show ();
503
+ Toast .makeText (this , "already connected to " + wifiNetworkSSID , Toast .LENGTH_SHORT ).show ();
506
504
}
507
505
return ;
508
506
}
0 commit comments