diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-06 19:29:25 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-06 19:29:25 -0700 |
| commit | 067ea15188f20fa268255153e35c2df732fdffee (patch) | |
| tree | 87a0fcd84f37ad569ec2743ffc702a69cd59e252 /app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt | |
| parent | c4e22f5512570d05178711ba90c28eb6dc288253 (diff) | |
| download | frost-067ea15188f20fa268255153e35c2df732fdffee.tar.gz frost-067ea15188f20fa268255153e35c2df732fdffee.tar.bz2 frost-067ea15188f20fa268255153e35c2df732fdffee.zip | |
Clean up injectors and events
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt index b8d76f40..59600a4d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/ContextUtils.kt @@ -5,6 +5,7 @@ import android.content.Context import android.content.Intent import android.support.v4.app.ActivityOptionsCompat import android.support.v4.content.ContextCompat +import com.pitchedapps.frost.LoginActivity import com.pitchedapps.frost.R import com.pitchedapps.frost.WebOverlayActivity import com.pitchedapps.frost.dbflow.CookieModel @@ -18,7 +19,7 @@ private const val ARG_URL = "arg_url" fun Context.launchNewTask(clazz: Class<out Activity>, cookieList: ArrayList<CookieModel> = arrayListOf(), clearStack: Boolean = true) { val intent = (Intent(this, clazz)) - if (clearStack) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) + if (clearStack && (clazz != LoginActivity::class.java)) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) intent.putParcelableArrayListExtra(EXTRA_COOKIES, cookieList) startActivity(intent) if (this is Activity) finish() |