aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2018-03-21 17:36:53 -0400
committerGitHub <noreply@github.com>2018-03-21 17:36:53 -0400
commitf1275cbc38f1819c852f810905c300ae8f64bba4 (patch)
tree794d0ffe19f09387d5979c710b1b4a6ffe24104d /app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
parentd36dfe98a52ced46c5106b28304ae5d245180a7f (diff)
downloadfrost-f1275cbc38f1819c852f810905c300ae8f64bba4.tar.gz
frost-f1275cbc38f1819c852f810905c300ae8f64bba4.tar.bz2
frost-f1275cbc38f1819c852f810905c300ae8f64bba4.zip
Update buildsdk (#808)
* Update changelog * Add build sdk check * Remove play store affiliate * Ignore Overdraw * Remove theme background * Add back for transparent * Fix restart button
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt14
1 files changed, 2 insertions, 12 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index 8b584112..21bc2354 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -2,9 +2,6 @@ package com.pitchedapps.frost.activities
import android.annotation.SuppressLint
import android.app.ActivityOptions
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Context
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.PointF
@@ -356,15 +353,8 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
if (resultCode and REQUEST_RESTART_APPLICATION > 0) { //completely restart application
L.d { "Restart Application Requested" }
val intent = packageManager.getLaunchIntentForPackage(packageName)
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
- val pending = PendingIntent.getActivity(this, 666, intent, PendingIntent.FLAG_CANCEL_CURRENT)
- val alarm = getSystemService(Context.ALARM_SERVICE) as AlarmManager
- if (buildIsMarshmallowAndUp)
- alarm.setExactAndAllowWhileIdle(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
- else
- alarm.setExact(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
- finish()
- System.exit(0)
+ Intent.makeRestartActivityTask(intent.component)
+ Runtime.getRuntime().exit(0)
return
}
if (resultCode and REQUEST_RESTART > 0) return restart()