优化

gedoor · Jan 23, 2020 · dc2c2d1 · dc2c2d1
1 parent ce4dc56
commit dc2c2d1
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/app/src/main/java/com/kunfei/bookshelf/view/activity/MainActivity.java b/app/src/main/java/com/kunfei/bookshelf/view/activity/MainActivity.java
@@ -666,7 +666,7 @@ public void onSuccess(ArrayList<String> strings) {
                                 if (TextUtils.isEmpty(path)) {
                                     selectRestoreFolder();
                                 } else {
-                                    Restore.INSTANCE.restore(MainActivity.this, Uri.parse(path));
+                                    restore(Uri.parse(path));
                                     recreate();
                                 }
                             } else {
@@ -685,6 +685,20 @@ public void onSuccess(ArrayList<String> strings) {
 
     }
 
+    private void restore(Uri uri) {
+        Single.create((SingleOnSubscribe<Boolean>) e -> {
+            Restore.INSTANCE.restore(this, uri);
+            e.onSuccess(true);
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new MySingleObserver<Boolean>() {
+                    @Override
+                    public void onSuccess(Boolean t) {
+                        recreate();
+                    }
+                });
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void selectRestoreFolder() {
         try {
@@ -816,8 +830,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     if (uri == null) return;
                     getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     preferences.edit().putString("backupPath", uri.toString()).apply();
-                    Restore.INSTANCE.restore(this, uri);
-                    recreate();
+                    restore(uri);
                 }
                 break;
         }