From 85c66417b5f810af739b5f8df2badfe63e5cf858 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Sun, 13 Mar 2016 23:23:45 +0100
Subject: [PATCH] branch cleanup
---
briar-android/build.gradle | 3 --
.../android/SplashScreenActivity.java | 2 --
.../plugins/PluginsModuleExtension.java | 33 -------------------
.../messaging/PrivateMessageValidator.java | 2 +-
.../briarproject/plugins/PluginsModule.java | 10 ------
5 files changed, 1 insertion(+), 49 deletions(-)
delete mode 100644 briar-android/src/org/briarproject/plugins/PluginsModuleExtension.java
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index ac93551175..81228e9186 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -97,7 +97,4 @@ android {
lintOptions {
abortOnError false
}
-}
-dependencies {
- compile 'cglib:cglib-nodep:3.1'
}
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
index b79e605e1f..17fabc68c1 100644
--- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java
+++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
@@ -92,8 +92,6 @@ public class SplashScreenActivity extends BaseActivity {
} else {
clearSharedPrefs();
AndroidUtils.deleteAppData(this);
- FileUtils.deleteFileOrDir(
- dbConfig.getDatabaseDirectory());
startActivity(new Intent(this, SetupActivity.class));
}
}
diff --git a/briar-android/src/org/briarproject/plugins/PluginsModuleExtension.java b/briar-android/src/org/briarproject/plugins/PluginsModuleExtension.java
deleted file mode 100644
index 14a55180c8..0000000000
--- a/briar-android/src/org/briarproject/plugins/PluginsModuleExtension.java
+++ /dev/null
@@ -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;
-// }
-*/
-}
diff --git a/briar-core/src/org/briarproject/messaging/PrivateMessageValidator.java b/briar-core/src/org/briarproject/messaging/PrivateMessageValidator.java
index ad1fcb81b7..550da3f9c7 100644
--- a/briar-core/src/org/briarproject/messaging/PrivateMessageValidator.java
+++ b/briar-core/src/org/briarproject/messaging/PrivateMessageValidator.java
@@ -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_PRIVATE_MESSAGE_BODY_LENGTH;
-public class PrivateMessageValidator extends BdfMessageValidator {
+class PrivateMessageValidator extends BdfMessageValidator {
PrivateMessageValidator(ClientHelper clientHelper,
MetadataEncoder metadataEncoder, Clock clock) {
diff --git a/briar-core/src/org/briarproject/plugins/PluginsModule.java b/briar-core/src/org/briarproject/plugins/PluginsModule.java
index afdb970df2..6f3357b8b5 100644
--- a/briar-core/src/org/briarproject/plugins/PluginsModule.java
+++ b/briar-core/src/org/briarproject/plugins/PluginsModule.java
@@ -69,15 +69,5 @@ public class PluginsModule {
lifecycleManager.register(pluginManager);
return pluginManager;
}
-/*
- @Provides
- SimplexPluginConfig provideSimplexPluginConfig() {
- return null;
- }
- @Provides
- public DuplexPluginConfig provideDuplexPluginConfig() {
- return null;
- }
- */
}
--
GitLab