diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 028657a59..95ce1514d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -170,7 +170,6 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") - implementation("com.jakewharton:process-phoenix:2.0.0") implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0") implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") { isTransitive = false diff --git a/app/licenses.yml b/app/licenses.yml index 5507f16ab..b93153ce1 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -547,12 +547,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://github.com/JakeWharton/butterknife/ -- artifact: com.jakewharton:process-phoenix:+ - name: Process Phoenix - copyrightHolder: Jake Wharton - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://github.com/JakeWharton/ProcessPhoenix/ - artifact: io.grpc:grpc-context:+ name: io.grpc:grpc-context copyrightHolder: The gRPC Authors diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 27dc2407e..123e7a3d5 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1284,20 +1284,6 @@ "url": "https://github.com/JakeWharton/butterknife/", "libraryName": "ButterKnife Runtime" }, - { - "artifactId": { - "name": "process-phoenix", - "group": "com.jakewharton", - "version": "+" - }, - "copyrightHolder": "Jake Wharton", - "copyrightStatement": "Copyright © Jake Wharton. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "https://github.com/JakeWharton/ProcessPhoenix/", - "libraryName": "Process Phoenix" - }, { "artifactId": { "name": "grpc-context", diff --git a/app/src/main/java/org/tasks/Tasks.kt b/app/src/main/java/org/tasks/Tasks.kt index ebf70d89a..579df22d1 100644 --- a/app/src/main/java/org/tasks/Tasks.kt +++ b/app/src/main/java/org/tasks/Tasks.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.util.Log import androidx.core.app.JobIntentService import androidx.work.Configuration -import com.jakewharton.processphoenix.ProcessPhoenix import com.todoroo.astrid.service.Upgrader import dagger.Lazy import io.reactivex.Completable @@ -45,9 +44,6 @@ class Tasks : InjectingApplication(), Configuration.Provider { override fun onCreate() { super.onCreate() - if (ProcessPhoenix.isPhoenixProcess(this)) { - return - } buildSetup.setup() upgrade() preferences.isSyncOngoing = false diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt b/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt index c8b2c0598..ceeffffb6 100644 --- a/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt +++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceFragment.kt @@ -1,16 +1,12 @@ package org.tasks.injection import android.app.Activity -import android.content.Intent import android.os.Bundle import androidx.annotation.StringRes import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceGroup import androidx.preference.PreferenceScreen -import com.jakewharton.processphoenix.ProcessPhoenix -import com.todoroo.astrid.activity.MainActivity -import com.todoroo.astrid.api.Filter import org.tasks.R import org.tasks.dialogs.DialogBuilder import org.tasks.preferences.Device @@ -68,9 +64,7 @@ abstract class InjectingPreferenceFragment : PreferenceFragmentCompat() { } protected fun restart() { - val nextIntent = Intent(context, MainActivity::class.java) - nextIntent.putExtra(MainActivity.OPEN_FILTER, null as Filter?) - ProcessPhoenix.triggerRebirth(context, nextIntent) + kotlin.system.exitProcess(0) } protected fun tintColorPreference(resId: Int, tint: Int) { diff --git a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt index 136efc24f..92c137c73 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt @@ -8,7 +8,6 @@ import androidx.preference.Preference import androidx.preference.SwitchPreferenceCompat import com.todoroo.astrid.dao.Database import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.service.TaskDeleter import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable @@ -28,7 +27,6 @@ import org.tasks.scheduling.CalendarNotificationIntentService import org.tasks.ui.Toaster import java.util.concurrent.Callable import javax.inject.Inject -import kotlin.system.exitProcess private const val REQUEST_CODE_FILES_DIR = 10000