Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Implemented Sign Out as a first PanicKit Response

Browse Source 
This closes #204
This commit is contained in:
Torsten Grote
2016-01-04 17:08:59 -02:00
parent aa1b9328c4
commit e603b4f60e
17 changed files with 281 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -2,11 +2,13 @@ package org.briarproject.android;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import org.briarproject.android.BriarService.BriarBinder;
import org.briarproject.android.BriarService.BriarServiceConnection;
import org.briarproject.android.panic.ExitActivity;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.lifecycle.LifecycleManager;
@@ -78,7 +80,7 @@ public class BriarActivity extends BaseActivity {
if (bound) unbindService(serviceConnection);
}
protected void signOut() {
protected void signOut(final boolean removeFromRecentApps) {
new Thread() {
@Override
public void run() {
@@ -95,15 +97,28 @@ public class BriarActivity extends BaseActivity {
LOG.warning("Interrupted while waiting for service");
Thread.currentThread().interrupt();
}
finishAndExit();
if(removeFromRecentApps){
ExitActivity.exitAndRemoveFromRecentApps(BriarActivity.this);
} else {
finishAndExit();
}
}
}.start();
}
protected void signOut() {
signOut(false);
}
private void finishAndExit() {
runOnUiThread(new Runnable() {
public void run() {
finish();
if (Build.VERSION.SDK_INT >= 21) {
finishAndRemoveTask();
} else {
finish();
}
LOG.info("Exiting");
System.exit(0);
}