Remove process phoenix

pull/1004/head
Alex Baker 6 years ago
parent 346bf22fb3
commit 72d6bf1620

@ -170,7 +170,6 @@ dependencies {
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
implementation("androidx.preference:preference:1.1.1") implementation("androidx.preference:preference:1.1.1")
implementation("com.jakewharton.timber:timber:4.7.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.google.android.apps.dashclock:dashclock-api:2.0.0")
implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") { implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") {
isTransitive = false isTransitive = false

@ -547,12 +547,6 @@
license: The Apache Software License, Version 2.0 license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://github.com/JakeWharton/butterknife/ 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:+ - artifact: io.grpc:grpc-context:+
name: io.grpc:grpc-context name: io.grpc:grpc-context
copyrightHolder: The gRPC Authors copyrightHolder: The gRPC Authors

@ -1284,20 +1284,6 @@
"url": "https://github.com/JakeWharton/butterknife/", "url": "https://github.com/JakeWharton/butterknife/",
"libraryName": "ButterKnife Runtime" "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": { "artifactId": {
"name": "grpc-context", "name": "grpc-context",

@ -6,7 +6,6 @@ import android.content.Intent
import android.util.Log import android.util.Log
import androidx.core.app.JobIntentService import androidx.core.app.JobIntentService
import androidx.work.Configuration import androidx.work.Configuration
import com.jakewharton.processphoenix.ProcessPhoenix
import com.todoroo.astrid.service.Upgrader import com.todoroo.astrid.service.Upgrader
import dagger.Lazy import dagger.Lazy
import io.reactivex.Completable import io.reactivex.Completable
@ -45,9 +44,6 @@ class Tasks : InjectingApplication(), Configuration.Provider {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
if (ProcessPhoenix.isPhoenixProcess(this)) {
return
}
buildSetup.setup() buildSetup.setup()
upgrade() upgrade()
preferences.isSyncOngoing = false preferences.isSyncOngoing = false

@ -1,16 +1,12 @@
package org.tasks.injection package org.tasks.injection
import android.app.Activity import android.app.Activity
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceGroup import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceScreen 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.R
import org.tasks.dialogs.DialogBuilder import org.tasks.dialogs.DialogBuilder
import org.tasks.preferences.Device import org.tasks.preferences.Device
@ -68,9 +64,7 @@ abstract class InjectingPreferenceFragment : PreferenceFragmentCompat() {
} }
protected fun restart() { protected fun restart() {
val nextIntent = Intent(context, MainActivity::class.java) kotlin.system.exitProcess(0)
nextIntent.putExtra(MainActivity.OPEN_FILTER, null as Filter?)
ProcessPhoenix.triggerRebirth(context, nextIntent)
} }
protected fun tintColorPreference(resId: Int, tint: Int) { protected fun tintColorPreference(resId: Int, tint: Int) {

@ -8,7 +8,6 @@ import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat import androidx.preference.SwitchPreferenceCompat
import com.todoroo.astrid.dao.Database import com.todoroo.astrid.dao.Database
import com.todoroo.astrid.dao.TaskDao import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.service.TaskDeleter
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
@ -28,7 +27,6 @@ import org.tasks.scheduling.CalendarNotificationIntentService
import org.tasks.ui.Toaster import org.tasks.ui.Toaster
import java.util.concurrent.Callable import java.util.concurrent.Callable
import javax.inject.Inject import javax.inject.Inject
import kotlin.system.exitProcess
private const val REQUEST_CODE_FILES_DIR = 10000 private const val REQUEST_CODE_FILES_DIR = 10000

Loading…
Cancel
Save