Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

modifications based on Akwizgran's comments

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-05-11 11:40:49 +02:00
parent d4232b6a01
commit c93e78f178
19 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@ package org.briarproject.android;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.handler.UiResultHandler;
@@ -35,11 +34,6 @@ public abstract class BriarActivity extends BaseActivity {
@Inject
protected BriarController briarController;
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
}
@Override
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
@@ -52,7 +46,7 @@ public abstract class BriarActivity extends BaseActivity {
@Override
public void onResume() {
super.onResume();
if (!briarController.encryptionKey() && !isFinishing()) {
if (!briarController.hasEncryptionKey() && !isFinishing()) {
Intent i = new Intent(this, PasswordActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION | FLAG_ACTIVITY_SINGLE_TOP);
startActivityForResult(i, REQUEST_PASSWORD);
@@ -93,7 +87,7 @@ public abstract class BriarActivity extends BaseActivity {
}
@Deprecated
public void runOnDbThread(final Runnable task) {
public void runOnDbThread(Runnable task) {
briarController.runOnDbThread(task);
}