小修小补

SplashCodes · Dec 30, 2017 · 6111ca2 · 6111ca2
1 parent ba61ce0
commit 6111ca2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/app/src/main/java/io/github/javiewer/activity/MainActivity.java b/app/src/main/java/io/github/javiewer/activity/MainActivity.java
@@ -213,22 +213,7 @@ private void setFragment(Fragment fragment, CharSequence title) {
             return;
         }
 
-        /*
         FragmentTransaction transaction = fragmentManager.beginTransaction();
-
-        if (old != null) {
-            transaction.hide(old);
-        }
-
-        if (!fragment.isAdded()) {
-            transaction.add(R.id.content, fragment);
-        } else {
-            transaction.show(fragment);
-        }*/
-        FragmentTransaction transaction = fragmentManager.beginTransaction();
-        /*for (Fragment f : fragmentManager.getFragments()) {
-            transaction.hide(f);
-        }*/
         if (old != null) {
             transaction.hide(old);
         }

diff --git a/app/src/main/java/io/github/javiewer/activity/StartActivity.java b/app/src/main/java/io/github/javiewer/activity/StartActivity.java
@@ -85,20 +85,36 @@ public void handleProperties(Properties properties) {
                 message += "\n\n更新日志：\n\n" + properties.getChangelog() + "\n";
             }
 
-            AlertDialog dialog = new AlertDialog.Builder(this)
+            final boolean[] update = {false};
+            final AlertDialog dialog = new AlertDialog.Builder(this)
                     .setTitle("发现更新")
                     .setMessage(message)
                     .setNegativeButton("忽略更新", null)
                     .setPositiveButton("更新", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/SplashCodes/JAViewer/releases")));
+                            update[0] = true;
                         }
                     })
                     .create();
             dialog.show();
+
+            dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface dialogInterface) {
+                    start();
+                    if (update[0]) {
+                        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/SplashCodes/JAViewer/releases")));
+                    }
+                }
+            });
+        } else {
+            start();
         }
 
+    }
+
+    public void start() {
         startActivity(new Intent(StartActivity.this, MainActivity.class));
         finish();
     }