Wifi設定画面を開いている最中に接続エラーダイアログを出そうとして落ちていた処理を修正。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
index b13c9cf..d903dba 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
@@ -180,7 +180,14 @@ public class CanonConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/fujix/wrapper/connection/FujiXConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/fujix/wrapper/connection/FujiXConnection.java
index 822a7cc..eeafdc5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/fujix/wrapper/connection/FujiXConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/fujix/wrapper/connection/FujiXConnection.java
@@ -178,7 +178,14 @@ public class FujiXConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/kodak/wrapper/connection/KodakConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/kodak/wrapper/connection/KodakConnection.java
index af6e6bf..1303b8a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/kodak/wrapper/connection/KodakConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/kodak/wrapper/connection/KodakConnection.java
@@ -202,7 +202,14 @@ public class KodakConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/connection/NikonConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/connection/NikonConnection.java
index 22b27c1..578a1fe 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/connection/NikonConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/connection/NikonConnection.java
@@ -188,7 +188,14 @@ public class NikonConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
index 803a4cb..0f4dc10 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
@@ -295,7 +295,14 @@ public class OlyCameraConnection implements ICameraConnection, OLYCameraConnecti
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenConnection.java
index 5fa373c..ac2921e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenConnection.java
@@ -213,7 +213,14 @@ public class OlympusPenConnection implements ICameraConnection
             {
                 try
                 {
-                    builder.show();
+                    try
+                    {
+                        builder.show();
+                    }
+                    catch (Exception e)
+                    {
+                        e.printStackTrace();
+                    }
                 }
                 catch (Exception e)
                 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/connection/PanasonicCameraConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/connection/PanasonicCameraConnection.java
index 6bfb560..386b183 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/connection/PanasonicCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/connection/PanasonicCameraConnection.java
@@ -224,7 +224,14 @@ public class PanasonicCameraConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
index 9cd7e46..364a9c4 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
@@ -214,7 +214,14 @@ public class RicohGr2Connection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
index 69cc892..93b1b03 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
@@ -224,7 +224,14 @@ public class SonyCameraConnection implements ICameraConnection
             @Override
             public void run()
             {
-                builder.show();
+                try
+                {
+                    builder.show();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
         });
     }