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

Delete all app data when deleting account. #263

Browse Source
This commit is contained in:
akwizgran
2016-03-03 16:23:10 +00:00
parent 08099714ba
commit 30c3a33a0a
7 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/org/briarproject/android/PasswordActivity.java
View File

@@ -21,7 +21,6 @@ import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.util.FileUtils;
import org.briarproject.util.StringUtils;
import java.util.concurrent.Executor;
@@ -53,7 +52,7 @@ public class PasswordActivity extends BaseActivity {
String hex = getEncryptedDatabaseKey();
if (hex == null || !databaseConfig.databaseExists()) {
clearSharedPrefsAndDeleteDatabase();
clearSharedPrefsAndDeleteEverything();
return;
}
encrypted = StringUtils.fromHexString(hex);
@@ -96,9 +95,9 @@ public class PasswordActivity extends BaseActivity {
startActivity(intent);
}
private void clearSharedPrefsAndDeleteDatabase() {
private void clearSharedPrefsAndDeleteEverything() {
clearSharedPrefs();
FileUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
AndroidUtils.deleteAppData(this);
setResult(RESULT_CANCELED);
startActivity(new Intent(this, SetupActivity.class));
finish();
@@ -118,7 +117,7 @@ public class PasswordActivity extends BaseActivity {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
clearSharedPrefsAndDeleteDatabase();
clearSharedPrefsAndDeleteEverything();
}
});
AlertDialog dialog = builder.create();