alpha 0.0.2

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / fragments / WifiSettings.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java
index 1ce70019a32a47e44d283259d6e0685076a9cee4..615d7badad4acf4424709fbe9d7cf748436f6ba4 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/WifiSettings.java
@@ -58,9 +58,9 @@ public class WifiSettings extends CampusAppFragment {
                 new SearchIndices("WifiSettings", true) {{
                     setUpdateTime(1);
                     setTarget("#WifiSettings");
-                    setTitle("Wifi Settings");
-                    setDescription("WLAN Konfiguration für dieses Gerät");
-                    addKeyWord("wlan, secure, dhbw-secure, wifi, w-lan, wireless, internet, netzwerk");
+                    setTitle(R.string.search_wifi_title);
+                    setDescription(R.string.search_wifi_description);
+                    addKeyWord(R.string.search_wifi_keywords);
                 }},
         };
     }
@@ -88,29 +88,31 @@ public class WifiSettings extends CampusAppFragment {
                     }
                 }
 
-                SupplicantState supl_state=((SupplicantState)intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE));
-                switch(supl_state){
-                    case ASSOCIATING:
-                        settings.isAssociating = true;
-                        settings.isAssociated = false;
-                        settings.isAuthenticated = false;
-                        settings.isDisconnected = false;
-                        break;
-                    case ASSOCIATED:
-                        settings.isAssociated = true;
-                        break;
-                    case COMPLETED:
-                        settings.isAuthenticated = true;
-                        break;
-                    case DISCONNECTED:
-                        settings.isAssociated = false;
-                        settings.isAssociating = false;
-                        settings.isDisconnected = true;
-                        break;
-                    default:
-                        break;
+                if(settings != null) {
+                    SupplicantState supl_state = ((SupplicantState) intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE));
+                    switch (supl_state) {
+                        case ASSOCIATING:
+                            settings.isAssociating = true;
+                            settings.isAssociated = false;
+                            settings.isAuthenticated = false;
+                            settings.isDisconnected = false;
+                            break;
+                        case ASSOCIATED:
+                            settings.isAssociated = true;
+                            break;
+                        case COMPLETED:
+                            settings.isAuthenticated = true;
+                            break;
+                        case DISCONNECTED:
+                            settings.isAssociated = false;
+                            settings.isAssociating = false;
+                            settings.isDisconnected = true;
+                            break;
+                        default:
+                            break;
+                    }
+                    updateWifiState();
                 }
-                updateWifiState();
             }
 
             NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);