Merge pull request #7068 from litetex/fix-restart

Fixed restarting not working properly

app/build.gradle

@@ -254,6 +254,9 @@ dependencies {
     // Crash reporting
     implementation "ch.acra:acra-core:5.7.0"
 
+    // Properly restarting
+    implementation 'com.jakewharton:process-phoenix:2.1.2'
+
     // Reactive extensions for Java VM
     implementation "io.reactivex.rxjava3:rxjava:3.0.7"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.0"

app/src/main/java/org/schabi/newpipe/App.java

@@ -11,6 +11,8 @@ import androidx.core.app.NotificationManagerCompat;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
+import com.jakewharton.processphoenix.ProcessPhoenix;
+
 import org.acra.ACRA;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
@@ -86,6 +88,12 @@ public class App extends MultiDexApplication {
 
         app = this;
 
+        if (ProcessPhoenix.isPhoenixProcess(this)) {
+            Log.i(TAG, "This is a phoenix process! "
+                    + "Aborting initialization of App[onCreate]");
+            return;
+        }
+
         // Initialize settings first because others inits can use its values
         NewPipeSettings.initSettings(this);
 

app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt

@@ -170,6 +170,10 @@ class AboutActivity : AppCompatActivity() {
                 "PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
                 "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2
             ),
+            SoftwareComponent(
+                "ProcessPhoenix", "2015", "Jake Wharton",
+                "https://github.com/JakeWharton/ProcessPhoenix", StandardLicenses.APACHE2
+            ),
             SoftwareComponent(
                 "RxAndroid", "2015", "The RxAndroid authors",
                 "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -58,6 +58,8 @@ import java.util.ArrayList;
 
 import static org.schabi.newpipe.util.external_communication.ShareUtils.installApp;
 
+import com.jakewharton.processphoenix.ProcessPhoenix;
+
 public final class NavigationHelper {
     public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
     public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
@@ -607,8 +609,7 @@ public final class NavigationHelper {
      */
     public static void restartApp(final Activity activity) {
         NewPipeDatabase.close();
-        activity.finishAffinity();
+
-        final Intent intent = new Intent(activity, MainActivity.class);
+        ProcessPhoenix.triggerRebirth(activity.getApplicationContext());
-        activity.startActivity(intent);
     }
 }