v3.0.1

s1204IT · Nov 11, 2024 · 1aa618f · 1aa618f
1 parent 6a7e98b
commit 1aa618f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         minSdk 24
         //noinspection ExpiredTargetSdkVersion,EditedTargetSdkVersion
         targetSdk 24
-        versionCode 5
-        versionName "3.0"
+        versionCode 6
+        versionName "3.0.1"
         proguardFiles += 'proguard-rules.pro'
         multiDexEnabled false
     }

diff --git a/app/src/main/java/me/s1204/benesse/dcha/e/BackNova.java b/app/src/main/java/me/s1204/benesse/dcha/e/BackNova.java
@@ -38,6 +38,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             }
         }, Context.BIND_AUTO_CREATE)) {
             makeText(this, R.string.fail_util_connect);
+            finish();
             return;
         }
 
@@ -61,6 +62,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             }
         }, Context.BIND_AUTO_CREATE)) {
             makeText(this, R.string.fail_dcha_connect);
+            finish();
             return;
         }
 
@@ -73,6 +75,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             e.printStackTrace();
             makeText(this, R.string.fail_nova);
         }
+        finish();
     }
 
 }
diff --git a/app/src/main/java/me/s1204/benesse/dcha/e/InitDcha.java b/app/src/main/java/me/s1204/benesse/dcha/e/InitDcha.java
@@ -19,7 +19,7 @@
 
 public class InitDcha extends Activity {
     protected static final String ACCESS_SYSTEM = "jp.co.benesse.dcha.permission.ACCESS_SYSTEM";
-    protected static final String DCHA_PFX = "jp.co.benesse.dcha.";
+    protected static final String DCHA_PFX = "jp.co.benesse.dcha";
     protected static final String DCHA_PKG = DCHA_PFX + ".dchaservice";
     protected static final String DCHA_SRV = DCHA_PKG + ".DchaService";
     protected static final String UTIL_PKG = DCHA_PFX + ".dchautilservice";
@@ -56,6 +56,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             }
         }, Context.BIND_AUTO_CREATE)) {
             makeText(this, R.string.fail_util_connect);
+            finish();
             return;
         }
 
@@ -79,6 +80,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             }
         }, Context.BIND_AUTO_CREATE)) {
             makeText(this, R.string.fail_dcha_connect);
+            finish();
             return;
         }
 
@@ -91,6 +93,7 @@ public void onServiceDisconnected(ComponentName componentName) {
             e.printStackTrace();
             makeText(this, R.string.fail_dcha);
         }
+        finish();
     }
 
     protected static boolean checkPermission(Context context) {

diff --git a/app/src/main/java/me/s1204/benesse/dcha/e/Reboot.java b/app/src/main/java/me/s1204/benesse/dcha/e/Reboot.java
@@ -14,7 +14,6 @@
 import static me.s1204.benesse.dcha.e.InitDcha.*;
 
 public class Reboot extends Activity {
-    IDchaService mDchaService;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -26,12 +25,12 @@ public void onCreate(Bundle savedInstanceState) {
             public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
                 mDchaService = IDchaService.Stub.asInterface(iBinder);
                 makeText(getApplicationContext(), R.string.reboot_message);
+                startActivity(new Intent(Intent.ACTION_MAIN).setClassName(getPackageName(), getPackageName() + BACK_NOVA));
                 try {
                     mDchaService.rebootPad(0, null);
                 } catch (RemoteException ignored) {
                 }
                 unbindService(this);
-                startActivity(new Intent(Intent.ACTION_MAIN).setClassName(getPackageName(), getPackageName() + BACK_NOVA));
             }
             @Override
             public void onServiceDisconnected(ComponentName componentName) {