Refactor backup / restore logic to implement multi-threading

[android-x86/packages-apps-Taskbar.git] / app / src / main / java / com / farmerbb / taskbar / activity / ImportSettingsActivity.java

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
index d6af50b..493d213 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
@@ -15,40 +15,30 @@
 
 package com.farmerbb.taskbar.activity;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.farmerbb.taskbar.BuildConfig;
-import com.farmerbb.taskbar.MainActivity;
-import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.util.U;
 
-public class ImportSettingsActivity extends Activity {
+public class ImportSettingsActivity extends AbstractProgressActivity {
 
     boolean broadcastSent = false;
 
     private BroadcastReceiver settingsReceivedReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            Intent restartIntent = new Intent(ImportSettingsActivity.this, MainActivity.class);
-            restartIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(restartIntent);
-            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-
-            System.exit(0);
+            U.restartApp(ImportSettingsActivity.this, true);
         }
     };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.import_settings);
-        setFinishOnTouchOutside(false);
 
         LocalBroadcastManager.getInstance(this).registerReceiver(settingsReceivedReceiver, new IntentFilter("com.farmerbb.taskbar.IMPORT_FINISHED"));
 
@@ -67,8 +57,4 @@ public class ImportSettingsActivity extends Activity {
 
         LocalBroadcastManager.getInstance(this).unregisterReceiver(settingsReceivedReceiver);
     }
-
-    // Disable back button
-    @Override
-    public void onBackPressed() {}
 }