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

branch cleanup

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-13 23:23:45 +01:00
parent 686729b045
commit 85c66417b5
5 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/build.gradle
View File

@@ -97,7 +97,4 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
}
dependencies {
compile 'cglib:cglib-nodep:3.1'
} }

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

@@ -92,8 +92,6 @@ public class SplashScreenActivity extends BaseActivity {
} else { } else {
clearSharedPrefs(); clearSharedPrefs();
AndroidUtils.deleteAppData(this); AndroidUtils.deleteAppData(this);
FileUtils.deleteFileOrDir(
dbConfig.getDatabaseDirectory());
startActivity(new Intent(this, SetupActivity.class)); startActivity(new Intent(this, SetupActivity.class));
} }
} }

33
briar-android/src/org/briarproject/plugins/PluginsModuleExtension.java
View File

@@ -1,33 +0,0 @@
package org.briarproject.plugins;
public class PluginsModuleExtension extends PluginsModule {
// @Inject @Named("AndroidDuplexPluginConfig")
// DuplexPluginConfig duplexPluginConfig;
public PluginsModuleExtension() {
}
// @Override
// SimplexPluginConfig provideSimplexPluginConfig() {
// return new SimplexPluginConfig() {
// public Collection<SimplexPluginFactory> getFactories() {
// return Collections.emptyList();
// }
// };
// }
/*
@Override
public DuplexPluginConfig provideDuplexPluginConfig(
@IoExecutor Executor ioExecutor, AndroidExecutor androidExecutor,
SecureRandom random, BackoffFactory backoffFactory,
LocationUtils locationUtils, EventBus eventBus) {
// return duplexPluginConfig;
// @Inject @Named("AndroidDuplexPluginConfig")
// DuplexPluginConfig andoridDuplexPlugin;
// return andoridDuplexPlugin;
// }
*/
}

2
briar-core/src/org/briarproject/messaging/PrivateMessageValidator.java
View File

@@ -14,7 +14,7 @@ import org.briarproject.clients.BdfMessageValidator;
import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH; import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH; import static org.briarproject.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH;
public class PrivateMessageValidator extends BdfMessageValidator { class PrivateMessageValidator extends BdfMessageValidator {
PrivateMessageValidator(ClientHelper clientHelper, PrivateMessageValidator(ClientHelper clientHelper,
MetadataEncoder metadataEncoder, Clock clock) { MetadataEncoder metadataEncoder, Clock clock) {

10
briar-core/src/org/briarproject/plugins/PluginsModule.java
View File

@@ -69,15 +69,5 @@ public class PluginsModule {
lifecycleManager.register(pluginManager); lifecycleManager.register(pluginManager);
return pluginManager; return pluginManager;
} }
/*
@Provides
SimplexPluginConfig provideSimplexPluginConfig() {
return null;
}
@Provides
public DuplexPluginConfig provideDuplexPluginConfig() {
return null;
}
*/
} }