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

minor tweaks

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-14 20:54:59 +01:00
parent 85c66417b5
commit 11bfa212cc
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android-tests/build.gradle
View File

@@ -13,7 +13,7 @@ android {
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
defaultConfig { defaultConfig {
minSdkVersion 10 minSdkVersion 9
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"

14
briar-android/src/org/briarproject/android/SplashScreenActivity.java
View File

@@ -86,14 +86,12 @@ public class SplashScreenActivity extends BaseActivity {
} else { } else {
String hex = getEncryptedDatabaseKey(); String hex = getEncryptedDatabaseKey();
if (dbConfig != null) { if (hex != null && dbConfig.databaseExists()) {
if (hex != null && dbConfig.databaseExists()) { startActivity(new Intent(this, NavDrawerActivity.class));
startActivity(new Intent(this, NavDrawerActivity.class)); } else {
} else { clearSharedPrefs();
clearSharedPrefs(); AndroidUtils.deleteAppData(this);
AndroidUtils.deleteAppData(this); startActivity(new Intent(this, SetupActivity.class));
startActivity(new Intent(this, SetupActivity.class));
}
} }
} }
} }

2
briar-core/src/org/briarproject/data/DataModule.java
View File

@@ -28,7 +28,7 @@ public class DataModule {
} }
@Provides @Provides
MetadataEncoder provideMetaDataEncoider(BdfWriterFactory bdfWriterFactory) { MetadataEncoder provideMetaDataEncoder(BdfWriterFactory bdfWriterFactory) {
return new MetadataEncoderImpl(bdfWriterFactory); return new MetadataEncoderImpl(bdfWriterFactory);
} }

3
briar-tests/src/org/briarproject/TestLifecycleModule.java
View File

@@ -9,6 +9,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import javax.inject.Singleton;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
@@ -72,6 +74,7 @@ public class TestLifecycleModule {
@Provides @Provides
@IoExecutor @IoExecutor
@Singleton
Executor provideExecutor() { Executor provideExecutor() {
return Executors.newCachedThreadPool(); return Executors.newCachedThreadPool();
} }