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

Address review feedback for ACRA replacement

Browse Source
This commit is contained in:
Torsten Grote
2020-12-11 10:38:15 -03:00
parent f9a8fcb207
commit bed3abfd40
22 changed files with 173 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java
View File

@@ -1,85 +0,0 @@
package org.briarproject.briar.android;
import android.app.Application;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.google.GoogleEmojiProvider;
import org.briarproject.bramble.BrambleAndroidEagerSingletons;
import org.briarproject.bramble.BrambleAppComponent;
import org.briarproject.bramble.BrambleCoreEagerSingletons;
import org.briarproject.briar.BriarCoreEagerSingletons;
import java.util.Collection;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import static java.util.Collections.emptyList;
/**
* This class only exists to avoid static initialisation of ACRA
*/
public class TestBriarApplication extends Application
implements BriarApplication {
private static final Logger LOG =
Logger.getLogger(TestBriarApplication.class.getName());
private AndroidComponent applicationComponent;
private volatile SharedPreferences prefs;
@Override
public void onCreate() {
super.onCreate();
LOG.info("Created");
prefs = PreferenceManager.getDefaultSharedPreferences(this);
Localizer.initialize(prefs);
applicationComponent = DaggerAndroidComponent.builder()
.appModule(new AppModule(this))
.build();
// We need to load the eager singletons directly after making the
// dependency graphs
BrambleCoreEagerSingletons.Helper
.injectEagerSingletons(applicationComponent);
BrambleAndroidEagerSingletons.Helper
.injectEagerSingletons(applicationComponent);
BriarCoreEagerSingletons.Helper
.injectEagerSingletons(applicationComponent);
AndroidEagerSingletons.Helper
.injectEagerSingletons(applicationComponent);
EmojiManager.install(new GoogleEmojiProvider());
}
@Override
public BrambleAppComponent getBrambleAppComponent() {
return applicationComponent;
}
@Override
public Collection<LogRecord> getRecentLogRecords() {
return emptyList();
}
@Override
public AndroidComponent getApplicationComponent() {
return applicationComponent;
}
@Override
public SharedPreferences getDefaultSharedPreferences() {
return prefs;
}
@Override
public void triggerFeedback() {
}
@Override
public boolean isRunningInBackground() {
return false;
}
}

3
briar-android/src/test/java/org/briarproject/briar/android/account/SetupActivityTest.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.account;
import android.view.View;
import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.login.StrengthMeter;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -42,7 +41,7 @@ import static org.briarproject.briar.android.login.StrengthMeter.YELLOW;
import static org.hamcrest.Matchers.not;
@RunWith(AndroidJUnit4.class)
@Config(sdk = 21, application = TestBriarApplication.class)
@Config(sdk = 21)
public class SetupActivityTest {
@Rule

3
briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
View File

@@ -8,7 +8,6 @@ import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.identity.AuthorInfo;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.briar.android.threaded.ThreadItemAdapter;
import org.briarproject.briar.android.threaded.ThreadItemList;
@@ -36,7 +35,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class)
@Config(sdk = 21)
public class ForumActivityTest {
private final static MessageId[] MESSAGE_IDS = new MessageId[6];

3
briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java
View File

@@ -7,7 +7,6 @@ import com.google.android.material.textfield.TextInputLayout;
import org.briarproject.bramble.api.crypto.DecryptionResult;
import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
import org.junit.Assert;
import org.junit.Before;
@@ -36,7 +35,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class)
@Config(sdk = 21)
public class ChangePasswordActivityTest {
private ChangePasswordActivity changePasswordActivity;