BroadcastからのWiFi情報がnullだった場合はWiFiManagerから取得するように修正。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/core/ThetaDeviceFactory.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 
 class ThetaDeviceFactory {
 
@@ -11,7 +12,16 @@ private ThetaDeviceFactory() {
     public static ThetaDevice createDevice(final Context context, final WifiInfo wifiInfo) {
         String ssId = parseSSID(wifiInfo);
         if (ssId == null) {
-            return null;
+            WifiManager wm = (WifiManager) context.getApplicationContext()
+                    .getSystemService(Context.WIFI_SERVICE);
+            if (wm == null) {
+                return null;
+            }
+            WifiInfo info = wm.getConnectionInfo();
+            if (info == null) {
+                return null;
+            }
+            ssId = info.getSSID().replace("\"", "");
         }
         ThetaDeviceModel model = parseModel(ssId);
         switch (model) {

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/fragment/ThetaGalleryFragment.java

@@ -452,8 +452,10 @@ private void enableReconnectView() {
             if (mUpdateItem != null) {
                 mUpdateItem.setVisible(true);
             }
-            String ssId = mDevice.getName();
-            getActivity().getActionBar().setTitle(ssId);
+            if (mDevice != null) {
+                String ssId = mDevice.getName();
+                getActivity().getActionBar().setTitle(ssId);
+            }
             if ((mRecconectLayout.isEnabled()
                     && !mIsGalleryMode && mUpdateThetaList.size() == 0)) {
                 if (mDownloadTask != null) {