From 11bfa212cc63ba1d288ee26a1a77015a14fc81c3 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Mon, 14 Mar 2016 20:54:59 +0100
Subject: [PATCH] minor tweaks
---
briar-android-tests/build.gradle | 2 +-
.../briarproject/android/SplashScreenActivity.java | 14 ++++++--------
.../src/org/briarproject/data/DataModule.java | 2 +-
.../src/org/briarproject/TestLifecycleModule.java | 3 +++
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/briar-android-tests/build.gradle b/briar-android-tests/build.gradle
index 5fb2878846..8c329bb6e3 100644
--- a/briar-android-tests/build.gradle
+++ b/briar-android-tests/build.gradle
@@ -13,7 +13,7 @@ android {
buildToolsVersion "23.0.2"
defaultConfig {
- minSdkVersion 10
+ minSdkVersion 9
targetSdkVersion 22
versionCode 1
versionName "1.0"
diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
index 17fabc68c1..45944439a0 100644
--- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java
+++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
@@ -86,14 +86,12 @@ public class SplashScreenActivity extends BaseActivity {
} else {
String hex = getEncryptedDatabaseKey();
- if (dbConfig != null) {
- if (hex != null && dbConfig.databaseExists()) {
- startActivity(new Intent(this, NavDrawerActivity.class));
- } else {
- clearSharedPrefs();
- AndroidUtils.deleteAppData(this);
- startActivity(new Intent(this, SetupActivity.class));
- }
+ if (hex != null && dbConfig.databaseExists()) {
+ startActivity(new Intent(this, NavDrawerActivity.class));
+ } else {
+ clearSharedPrefs();
+ AndroidUtils.deleteAppData(this);
+ startActivity(new Intent(this, SetupActivity.class));
}
}
}
diff --git a/briar-core/src/org/briarproject/data/DataModule.java b/briar-core/src/org/briarproject/data/DataModule.java
index 8a8286511c..b83293104f 100644
--- a/briar-core/src/org/briarproject/data/DataModule.java
+++ b/briar-core/src/org/briarproject/data/DataModule.java
@@ -28,7 +28,7 @@ public class DataModule {
}
@Provides
- MetadataEncoder provideMetaDataEncoider(BdfWriterFactory bdfWriterFactory) {
+ MetadataEncoder provideMetaDataEncoder(BdfWriterFactory bdfWriterFactory) {
return new MetadataEncoderImpl(bdfWriterFactory);
}
diff --git a/briar-tests/src/org/briarproject/TestLifecycleModule.java b/briar-tests/src/org/briarproject/TestLifecycleModule.java
index 6022af177e..fbf07ca0d4 100644
--- a/briar-tests/src/org/briarproject/TestLifecycleModule.java
+++ b/briar-tests/src/org/briarproject/TestLifecycleModule.java
@@ -9,6 +9,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.inject.Singleton;
+
import dagger.Module;
import dagger.Provides;
@@ -72,6 +74,7 @@ public class TestLifecycleModule {
@Provides
@IoExecutor
+ @Singleton
Executor provideExecutor() {
return Executors.newCachedThreadPool();
}
--
GitLab