Bump version numbers for 1.2.16 release.

Don't add new thread items when the existing ones haven't loaded

Closes #1947

See merge request briar/briar!1375

.idea/dictionaries/briar.xml

@@ -0,0 +1,14 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="briar">
+    <words>
+      <w>briar</w>
+      <w>briarproject</w>
+      <w>emoji</w>
+      <w>encrypter</w>
+      <w>identicon</w>
+      <w>introducee</w>
+      <w>introducer</w>
+      <w>onboarding</w>
+    </words>
+  </dictionary>
+</component>

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10214
+		versionCode 10216
-		versionName "1.2.14"
+		versionName "1.2.16"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,8 +38,8 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.12@zip'
+	tor 'org.briarproject:tor-android:0.3.5.13@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java

@@ -31,6 +31,7 @@ public class AndroidUtils {
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 
 	private static final String STORED_REPORTS = "dev-reports";
+	private static final String STORED_LOGCAT = "dev-logcat";
 
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
@@ -107,6 +108,10 @@ public class AndroidUtils {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
 
+	public static File getLogcatFile(Context ctx) {
+		return new File(ctx.getFilesDir(), STORED_LOGCAT);
+	}
+
 	/**
 	 * Returns an array of supported content types for image attachments.
 	 * GIFs can't be compressed on API < 24 so they're not supported.

bramble-android/witness.gradle

@@ -75,8 +75,8 @@ dependencyVerification {
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a',
+        'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82',
-        'org.briarproject:tor-android:0.3.5.12:tor-android-0.3.5.12.zip:db71fb3290acff79d572af0752570eaf6aad7c4d88c9b9aa0b4d5afe2b9ead9c',
+        'org.briarproject:tor-android:0.3.5.13:tor-android-0.3.5.13.zip:e0978db136731dae07774b722970cdae1e462fb5adc82845dd80a7e2d87f356c',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java

@@ -19,4 +19,10 @@ public interface StreamDecrypterFactory {
 	 */
 	StreamDecrypter createContactExchangeStreamDecrypter(InputStream in,
 			SecretKey headerKey);
+
+	/**
+	 * Creates a {@link StreamDecrypter} for decrypting a log stream.
+	 */
+	StreamDecrypter createLogStreamDecrypter(InputStream in,
+			SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java

@@ -17,6 +17,12 @@ public interface StreamEncrypterFactory {
 	 * Creates a {@link StreamEncrypter} for encrypting a contact exchange
 	 * stream.
 	 */
-	StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
+	StreamEncrypter createContactExchangeStreamEncrypter(OutputStream out,
+			SecretKey headerKey);
+
+	/**
+	 * Creates a {@link StreamEncrypter} for encrypting a log stream.
+	 */
+	StreamEncrypter createLogStreamEncrypter(OutputStream out,
 			SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java

@@ -13,4 +13,6 @@ public interface DevConfig {
 	String getDevOnionAddress();
 
 	File getReportDir();
+
+	File getLogcatFile();
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java

@@ -16,8 +16,13 @@ public interface StreamReaderFactory {
 
 	/**
 	 * Creates an {@link InputStream InputStream} for reading from a contact
-	 * exchangestream.
+	 * exchange stream.
 	 */
 	InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey);
+
+	/**
+	 * Creates an {@link InputStream} for reading from a log stream.
+	 */
+	InputStream createLogStreamReader(InputStream in, SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java

@@ -7,17 +7,19 @@ import java.io.OutputStream;
 
 @NotNullByDefault
 public interface StreamWriterFactory {
-
 	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to a
+	 * Creates a {@link StreamWriter} for writing to a transport stream.
-	 * transport stream
 	 */
 	StreamWriter createStreamWriter(OutputStream out, StreamContext ctx);
 
 	/**
-	 * Creates an {@link OutputStream OutputStream} for writing to a contact
+	 * Creates a {@link StreamWriter} for writing to a contact exchange stream.
-	 * exchange stream.
 	 */
 	StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey);
+
+	/**
+	 * Creates a {@link StreamWriter} for writing to a log stream.
+	 */
+	StreamWriter createLogStreamWriter(OutputStream out, SecretKey headerKey);
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/ScryptKdf.java

@@ -9,14 +9,16 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
+import static java.lang.Math.min;
 import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
 
 class ScryptKdf implements PasswordBasedKdf {
 
 	private static final Logger LOG =
-			Logger.getLogger(ScryptKdf.class.getName());
+			getLogger(ScryptKdf.class.getName());
 
 	private static final int MIN_COST = 256; // Min parameter N
 	private static final int MAX_COST = 1024 * 1024; // Max parameter N
@@ -33,10 +35,20 @@ class ScryptKdf implements PasswordBasedKdf {
 
 	@Override
 	public int chooseCostParameter() {
+		// Scrypt uses at least 128 * N * r bytes of memory. Don't use more
+		// than half of the JVM's max heap size or we may run out of memory.
+		// https://blog.filippo.io/the-scrypt-parameters/
+		long maxMemory = Runtime.getRuntime().maxMemory();
+		long maxCost = min(MAX_COST, maxMemory / BLOCK_SIZE / 256);
+		if (LOG.isLoggable(INFO) && maxCost < MAX_COST) {
+			LOG.info("Max cost capped at " + maxCost
+					+ " due to max heap size " + maxMemory);
+		}
 		// Increase the cost from min to max while measuring performance
 		int cost = MIN_COST;
-		while (cost * 2 <= MAX_COST && measureDuration(cost) * 2 <= TARGET_MS)
+		while (cost * 2 <= maxCost && measureDuration(cost) * 2 <= TARGET_MS) {
 			cost *= 2;
+		}
 		if (LOG.isLoggable(INFO))
 			LOG.info("KDF cost parameter " + cost);
 		return cost;

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java

@@ -36,4 +36,10 @@ class StreamDecrypterFactoryImpl implements StreamDecrypterFactory {
 			SecretKey headerKey) {
 		return new StreamDecrypterImpl(in, cipherProvider.get(), 0, headerKey);
 	}
+
+	@Override
+	public StreamDecrypter createLogStreamDecrypter(InputStream in,
+			SecretKey headerKey) {
+		return createContactExchangeStreamDecrypter(in, headerKey);
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java

@@ -51,7 +51,7 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 	}
 
 	@Override
-	public StreamEncrypter createContactExchangeStreamDecrypter(
+	public StreamEncrypter createContactExchangeStreamEncrypter(
 			OutputStream out, SecretKey headerKey) {
 		AuthenticatedCipher cipher = cipherProvider.get();
 		byte[] streamHeaderNonce = new byte[STREAM_HEADER_NONCE_LENGTH];
@@ -60,4 +60,10 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 		return new StreamEncrypterImpl(out, cipher, 0, null, streamHeaderNonce,
 				headerKey, frameKey);
 	}
+
+	@Override
+	public StreamEncrypter createLogStreamEncrypter(OutputStream out,
+			SecretKey headerKey) {
+		return createContactExchangeStreamEncrypter(out, headerKey);
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java

@@ -24,15 +24,21 @@ class StreamReaderFactoryImpl implements StreamReaderFactory {
 
 	@Override
 	public InputStream createStreamReader(InputStream in, StreamContext ctx) {
-		return new StreamReaderImpl(
+		return new StreamReaderImpl(streamDecrypterFactory
-				streamDecrypterFactory.createStreamDecrypter(in, ctx));
+				.createStreamDecrypter(in, ctx));
 	}
 
 	@Override
 	public InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey) {
-		return new StreamReaderImpl(
+		return new StreamReaderImpl(streamDecrypterFactory
-				streamDecrypterFactory.createContactExchangeStreamDecrypter(in,
+				.createContactExchangeStreamDecrypter(in, headerKey));
-						headerKey));
+	}
+
+	@Override
+	public InputStream createLogStreamReader(InputStream in,
+			SecretKey headerKey) {
+		return new StreamReaderImpl(streamDecrypterFactory
+				.createLogStreamDecrypter(in, headerKey));
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java

@@ -26,15 +26,21 @@ class StreamWriterFactoryImpl implements StreamWriterFactory {
 	@Override
 	public StreamWriter createStreamWriter(OutputStream out,
 			StreamContext ctx) {
-		return new StreamWriterImpl(
+		return new StreamWriterImpl(streamEncrypterFactory
-				streamEncrypterFactory.createStreamEncrypter(out, ctx));
+				.createStreamEncrypter(out, ctx));
 	}
 
 	@Override
 	public StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey) {
-		return new StreamWriterImpl(
+		return new StreamWriterImpl(streamEncrypterFactory
-				streamEncrypterFactory.createContactExchangeStreamDecrypter(out,
+				.createContactExchangeStreamEncrypter(out, headerKey));
-						headerKey));
+	}
+
+	@Override
+	public StreamWriter createLogStreamWriter(OutputStream out,
+			SecretKey headerKey) {
+		return new StreamWriterImpl(streamEncrypterFactory
+				.createLogStreamEncrypter(out, headerKey));
 	}
 }

bramble-java/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: '*.jar')
 	implementation 'net.java.dev.jna:jna:4.5.2'
 	implementation 'net.java.dev.jna:jna-platform:4.5.2'
-	tor 'org.briarproject:tor:0.3.5.12@zip'
+	tor 'org.briarproject:tor:0.3.5.13@zip'
-	tor 'org.briarproject:obfs4proxy:0.0.7@zip'
+	tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-java/witness.gradle

@@ -23,8 +23,8 @@ dependencyVerification {
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
         'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-        'org.briarproject:obfs4proxy:0.0.7:obfs4proxy-0.0.7.zip:5b2f693262ce43a7e130f7cc7d5d1617925330640a2eb6d71085e95df8ee0642',
+        'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766',
-        'org.briarproject:tor:0.3.5.12:tor-0.3.5.12.zip:2f542c4befd216f2226bf7c76e3b8b2d99af6f146a8cb28bf727f42014587006',
+        'org.briarproject:tor:0.3.5.13:tor-0.3.5.13.zip:1c5f0b821ee2aadb0ea04aa96caab3ca0a08370cce8de81c2dfe04d172f8a2a0',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',

briar-android/build.gradle

@@ -22,8 +22,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10214
+		versionCode 10216
-		versionName "1.2.14"
+		versionName "1.2.16"
 		applicationId "org.briarproject.briar.android"
 
 		vectorDrawables.useSupportLibrary = true
@@ -136,6 +136,7 @@ dependencies {
 	testImplementation "org.jmock:jmock:$jmockVersion"
 	testImplementation "org.jmock:jmock-junit4:$jmockVersion"
 	testImplementation "org.jmock:jmock-legacy:$jmockVersion"
+	testAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 
 	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -34,6 +34,7 @@ import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
+import org.briarproject.briar.android.logging.CachingLogHandler;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.view.EmojiTextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -179,6 +180,10 @@ public interface AndroidComponent
 
 	AndroidWakeLockManager wakeLockManager();
 
+	CachingLogHandler logHandler();
+
+	Thread.UncaughtExceptionHandler exceptionHandler();
+
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -33,12 +33,13 @@ import org.briarproject.briar.android.account.SetupModule;
 import org.briarproject.briar.android.contact.ContactListModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
+import org.briarproject.briar.android.logging.LoggingModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
 import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
-import org.briarproject.briar.android.settings.SettingsModule;
 import org.briarproject.briar.android.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
+import org.briarproject.briar.android.settings.SettingsModule;
 import org.briarproject.briar.android.sharing.SharingModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
@@ -74,6 +75,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		SetupModule.class,
 		DozeHelperModule.class,
 		ContactExchangeModule.class,
+		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
 		ViewModelModule.class,
@@ -192,6 +194,11 @@ public class AppModule {
 			public File getReportDir() {
 				return AndroidUtils.getReportDir(app.getApplicationContext());
 			}
+
+			@Override
+			public File getLogcatFile() {
+				return AndroidUtils.getLogcatFile(app.getApplicationContext());
+			}
 		};
 		return devConfig;
 	}

briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java

@@ -6,9 +6,6 @@ import android.content.SharedPreferences;
 import org.briarproject.bramble.BrambleApplication;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 
-import java.util.Collection;
-import java.util.logging.LogRecord;
-
 /**
  * This exists so that the Application object will not necessarily be cast
  * directly to the Briar application object.
@@ -17,8 +14,6 @@ public interface BriarApplication extends BrambleApplication {
 
 	Class<? extends Activity> ENTRY_ACTIVITY = NavDrawerActivity.class;
 
-	Collection<LogRecord> getRecentLogRecords();
-
 	AndroidComponent getApplicationComponent();
 
 	SharedPreferences getDefaultSharedPreferences();

briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java

@@ -20,12 +20,10 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logging.CachingLogHandler;
-import org.briarproject.briar.android.reporting.BriarExceptionHandler;
 import org.briarproject.briar.android.util.UiUtils;
 
-import java.util.Collection;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.logging.Handler;
-import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import androidx.annotation.NonNull;
@@ -42,22 +40,18 @@ public class BriarApplicationImpl extends Application
 	private static final Logger LOG =
 			getLogger(BriarApplicationImpl.class.getName());
 
-	private final CachingLogHandler logHandler = new CachingLogHandler();
-	private final BriarExceptionHandler exceptionHandler =
-			new BriarExceptionHandler(this);
-
 	private AndroidComponent applicationComponent;
 	private volatile SharedPreferences prefs;
 
 	@Override
 	protected void attachBaseContext(Context base) {
-		Thread.setDefaultUncaughtExceptionHandler(exceptionHandler);
 		if (prefs == null)
 			prefs = PreferenceManager.getDefaultSharedPreferences(base);
 		// Loading the language needs to be done here.
 		Localizer.initialize(prefs);
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
+		Localizer.getInstance().setLocale(this);
 		setTheme(base, prefs);
 	}
 
@@ -67,6 +61,11 @@ public class BriarApplicationImpl extends Application
 
 		if (IS_DEBUG_BUILD) enableStrictMode();
 
+		applicationComponent = createApplicationComponent();
+		UncaughtExceptionHandler exceptionHandler =
+				applicationComponent.exceptionHandler();
+		Thread.setDefaultUncaughtExceptionHandler(exceptionHandler);
+
 		Logger rootLogger = getLogger("");
 		Handler[] handlers = rootLogger.getHandlers();
 		// Disable the Android logger for release builds
@@ -78,12 +77,12 @@ public class BriarApplicationImpl extends Application
 			// Restore the default handlers after the level raising handler
 			for (Handler handler : handlers) rootLogger.addHandler(handler);
 		}
+		CachingLogHandler logHandler = applicationComponent.logHandler();
 		rootLogger.addHandler(logHandler);
 		rootLogger.setLevel(IS_DEBUG_BUILD ? FINE : INFO);
 
 		LOG.info("Created");
 
-		applicationComponent = createApplicationComponent();
 		EmojiManager.install(new GoogleEmojiProvider());
 	}
 
@@ -136,11 +135,6 @@ public class BriarApplicationImpl extends Application
 		return applicationComponent;
 	}
 
-	@Override
-	public Collection<LogRecord> getRecentLogRecords() {
-		return logHandler.getRecentLogRecords();
-	}
-
 	@Override
 	public AndroidComponent getApplicationComponent() {
 		return applicationComponent;

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -37,7 +37,7 @@ import javax.inject.Inject;
 import androidx.core.app.NotificationCompat;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.ACTION_SHUTDOWN;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
@@ -56,6 +56,7 @@ import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
+import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_OLD_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.LockManager.ACTION_LOCK;
 
@@ -120,11 +121,17 @@ public class BriarService extends Service {
 			if (SDK_INT >= 26) {
 				NotificationManager nm = (NotificationManager)
 						requireNonNull(getSystemService(NOTIFICATION_SERVICE));
+				// Delete the old notification channel, which had
+				// IMPORTANCE_NONE and showed a badge
+				nm.deleteNotificationChannel(ONGOING_CHANNEL_OLD_ID);
+				// Use IMPORTANCE_LOW so the system doesn't show its own
+				// notification on API 26-27
 				NotificationChannel ongoingChannel = new NotificationChannel(
 						ONGOING_CHANNEL_ID,
 						getString(R.string.ongoing_notification_title),
-						IMPORTANCE_NONE);
+						IMPORTANCE_LOW);
 				ongoingChannel.setLockscreenVisibility(VISIBILITY_SECRET);
+				ongoingChannel.setShowBadge(false);
 				nm.createNotificationChannel(ongoingChannel);
 				NotificationChannel failureChannel = new NotificationChannel(
 						FAILURE_CHANNEL_ID,
@@ -170,6 +177,7 @@ public class BriarService extends Service {
 	@Override
 	protected void attachBaseContext(Context base) {
 		super.attachBaseContext(Localizer.getInstance().setLocale(base));
+		Localizer.getInstance().setLocale(this);
 	}
 
 	private void showStartupFailureNotification(StartResult result) {

briar-android/src/main/java/org/briarproject/briar/android/Localizer.java

@@ -68,7 +68,21 @@ public class Localizer {
 			return new Locale(tag);
 	}
 
-	// Returns the localized version of context
+	/*
+	 * Apply localization to the specified context.
+	 *
+	 * It updates the configuration of the context's resources object but can
+	 * also return a new context derived from the context parameter. Hence
+	 * make sure to work with the return value of this method instead of
+	 * the context you passed as a parameter.
+	 *
+	 * This method also has side-effects as it calls Locale#setDefault().
+	 *
+	 * When using this in attachBaseContext() of Application, Service or
+	 * Activity subclasses, it is important to not only apply this method to the
+	 * base Context parameter received in that method, but also apply it on the
+	 * class itself which also extends Context.
+	 */
 	public Context setLocale(Context context) {
 		Resources res = context.getResources();
 		Configuration conf = res.getConfiguration();
@@ -82,7 +96,7 @@ public class Localizer {
 		Locale.setDefault(locale);
 		if (SDK_INT >= 17) {
 			conf.setLocale(locale);
-			context.createConfigurationContext(conf);
+			context = context.createConfigurationContext(conf);
 		} else
 			conf.locale = locale;
 		//noinspection deprecation

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -109,6 +109,7 @@ public abstract class BaseActivity extends AppCompatActivity
 	protected void attachBaseContext(Context base) {
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
+		Localizer.getInstance().setLocale(this);
 	}
 
 	public ActivityComponent getActivityComponent() {

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java

@@ -124,7 +124,7 @@ public class AddContactViewModel extends DbViewModel {
 		return addContactResult;
 	}
 
-	public void updatePendingContact(String name, PendingContact p) {
+	void updatePendingContact(String name, PendingContact p) {
 		runOnDbThread(() -> {
 			try {
 				contactManager.removePendingContact(p.getId());

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java

@@ -29,11 +29,11 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
@@ -48,6 +48,7 @@ import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
 public class NicknameFragment extends BaseFragment {
 
 	private static final String TAG = NicknameFragment.class.getName();
+	private static final String SAVED_LINK = "savedLink";
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -67,6 +68,20 @@ public class NicknameFragment extends BaseFragment {
 	@Override
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(AddContactViewModel.class);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if (savedInstanceState != null) {
+			// When the activity (and the ViewModel) get destroyed,
+			// the link will not be available anymore and needs to be restored.
+			// TODO migrate to SavedStateViewModelFactory (once we can use it)
+			String savedLink = savedInstanceState.getString(SAVED_LINK);
+			if (savedLink != null) viewModel.setRemoteHandshakeLink(savedLink);
+		}
 	}
 
 	@Nullable
@@ -74,14 +89,9 @@ public class NicknameFragment extends BaseFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		if (getActivity() == null || getContext() == null) return null;
-
 		View v = inflater.inflate(R.layout.fragment_nickname,
 				container, false);
 
-		viewModel = ViewModelProviders.of(getActivity(), viewModelFactory)
-				.get(AddContactViewModel.class);
-
 		contactNameLayout = v.findViewById(R.id.contactNameLayout);
 		contactNameInput = v.findViewById(R.id.contactNameInput);
 
@@ -93,6 +103,12 @@ public class NicknameFragment extends BaseFragment {
 		return v;
 	}
 
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putString(SAVED_LINK, viewModel.getRemoteHandshakeLink());
+	}
+
 	@Nullable
 	private String getNicknameOrNull() {
 		Editable text = contactNameInput.getText();

briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.logging.Formatter;
@@ -17,6 +18,16 @@ import static java.util.Locale.US;
 @NotNullByDefault
 public class BriefLogFormatter extends Formatter {
 
+	public static String formatLog(Formatter formatter,
+			Collection<LogRecord> logRecords) {
+		StringBuilder sb = new StringBuilder();
+		for (LogRecord record : logRecords) {
+			String formatted = formatter.format(record);
+			sb.append(formatted).append('\n');
+		}
+		return sb.toString();
+	}
+
 	private final Object lock = new Object();
 	private final DateFormat dateFormat; // Locking: lock
 	private final Date date; // Locking: lock

briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java

@@ -21,6 +21,10 @@ public class CachingLogHandler extends Handler {
 	// Locking: lock
 	private final Queue<LogRecord> recent = new LinkedList<>();
 
+	// package-private constructor
+	CachingLogHandler() {
+	}
+
 	@Override
 	public void publish(LogRecord record) {
 		synchronized (lock) {

briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java

@@ -0,0 +1,16 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.util.AndroidUtils;
+
+import androidx.annotation.Nullable;
+
+@NotNullByDefault
+public interface LogDecrypter {
+	/**
+	 * Returns decrypted log records from {@link AndroidUtils#getLogcatFile}
+	 * or null if there was an error reading the logs.
+	 */
+	@Nullable
+	String decryptLogs(@Nullable byte[] logKey);
+}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java

@@ -0,0 +1,61 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.reporting.DevConfig;
+import org.briarproject.bramble.api.transport.StreamReaderFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Scanner;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import androidx.annotation.Nullable;
+
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@NotNullByDefault
+class LogDecrypterImpl implements LogDecrypter {
+
+	private static final Logger LOG =
+			getLogger(LogDecrypterImpl.class.getName());
+
+	private final DevConfig devConfig;
+	private final StreamReaderFactory streamReaderFactory;
+
+	@Inject
+	LogDecrypterImpl(DevConfig devConfig,
+			StreamReaderFactory streamReaderFactory) {
+		this.devConfig = devConfig;
+		this.streamReaderFactory = streamReaderFactory;
+	}
+
+	@Nullable
+	@Override
+	public String decryptLogs(@Nullable byte[] logKey) {
+		if (logKey == null) return null;
+		SecretKey key = new SecretKey(logKey);
+		File logFile = devConfig.getLogcatFile();
+		try (InputStream in = new FileInputStream(logFile)) {
+			InputStream reader =
+					streamReaderFactory.createLogStreamReader(in, key);
+			Scanner s = new Scanner(reader);
+			StringBuilder sb = new StringBuilder();
+			while (s.hasNextLine()) sb.append(s.nextLine()).append("\n");
+			s.close();
+			return sb.toString();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+			return null;
+		} finally {
+			//noinspection ResultOfMethodCallIgnored
+			logFile.delete();
+		}
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java

@@ -0,0 +1,16 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.util.AndroidUtils;
+
+import androidx.annotation.Nullable;
+
+@NotNullByDefault
+public interface LogEncrypter {
+	/**
+	 * Writes encrypted log records to {@link AndroidUtils#getLogcatFile}
+	 * and returns the encryption key if everything went fine.
+	 */
+	@Nullable
+	byte[] encryptLogs();
+}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java

@@ -0,0 +1,77 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.api.crypto.CryptoComponent;
+import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.reporting.DevConfig;
+import org.briarproject.bramble.api.transport.StreamWriter;
+import org.briarproject.bramble.api.transport.StreamWriterFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import androidx.annotation.Nullable;
+
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@NotNullByDefault
+class LogEncrypterImpl implements LogEncrypter {
+
+	private static final Logger LOG =
+			getLogger(LogEncrypterImpl.class.getName());
+
+	private final DevConfig devConfig;
+	private final CachingLogHandler logHandler;
+	private final CryptoComponent crypto;
+	private final StreamWriterFactory streamWriterFactory;
+
+	@Inject
+	LogEncrypterImpl(DevConfig devConfig,
+			CachingLogHandler logHandler,
+			CryptoComponent crypto,
+			StreamWriterFactory streamWriterFactory) {
+		this.devConfig = devConfig;
+		this.logHandler = logHandler;
+		this.crypto = crypto;
+		this.streamWriterFactory = streamWriterFactory;
+	}
+
+	@Nullable
+	@Override
+	public byte[] encryptLogs() {
+		SecretKey logKey = crypto.generateSecretKey();
+		File logFile = devConfig.getLogcatFile();
+		try (OutputStream out = new FileOutputStream(logFile)) {
+			StreamWriter streamWriter =
+					streamWriterFactory.createLogStreamWriter(out, logKey);
+			Writer writer =
+					new OutputStreamWriter(streamWriter.getOutputStream());
+			writeLogString(writer);
+			writer.close();
+			return logKey.getBytes();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+			return null;
+		}
+	}
+
+	private void writeLogString(Writer writer) throws IOException {
+		Formatter formatter = new BriefLogFormatter();
+		for (LogRecord record : logHandler.getRecentLogRecords()) {
+			String formatted = formatter.format(record);
+			writer.append(formatted).append('\n');
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/logging/LoggingModule.java

@@ -0,0 +1,29 @@
+package org.briarproject.briar.android.logging;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class LoggingModule {
+
+	@Provides
+	@Singleton
+	CachingLogHandler provideCachingLogHandler() {
+		return new CachingLogHandler();
+	}
+
+	@Provides
+	@Singleton
+	LogEncrypter provideLogEncrypter(LogEncrypterImpl logEncrypter) {
+		return logEncrypter;
+	}
+
+	@Provides
+	@Singleton
+	LogDecrypter provideLogDecrypter(LogDecrypterImpl logDecrypter) {
+		return logDecrypter;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -68,6 +68,7 @@ import static android.view.View.VISIBLE;
 import static androidx.core.view.GravityCompat.START;
 import static androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED;
 import static androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE;
+import static androidx.lifecycle.Lifecycle.State.STARTED;
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
@@ -297,6 +298,12 @@ public class NavDrawerActivity extends BriarActivity implements
 				finish();
 			} else if (fm.getBackStackEntryCount() == 0
 					&& fm.findFragmentByTag(ContactListFragment.TAG) == null) {
+				// don't start fragments in the wrong part of lifecycle (#1904)
+				if (!getLifecycle().getCurrentState().isAtLeast(STARTED)) {
+					LOG.warning("Tried to start contacts fragment in state " +
+							getLifecycle().getCurrentState().name());
+					return;
+				}
 				/*
 				 * This makes sure that the first fragment (ContactListFragment) the
 				 * user sees is the same as the last fragment the user sees before

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java

@@ -79,9 +79,10 @@ public class GroupActivity extends
 
 		// start with group disabled and enable when not dissolved
 		setGroupEnabled(false);
-		viewModel.isDissolved().observeEvent(this, dissolved -> {
+		viewModel.isDissolved().observe(this, dissolved -> {
 			setGroupEnabled(!dissolved);
-			if (dissolved) onGroupDissolved();
+			// only show dialog when no prior state
+			if (dissolved && state == null) onGroupDissolved();
 		});
 	}
 
@@ -153,7 +154,7 @@ public class GroupActivity extends
 
 	@Override
 	public void onReplyClick(GroupMessageItem item) {
-		Boolean isDissolved = viewModel.isDissolved().getLastValue();
+		Boolean isDissolved = viewModel.isDissolved().getValue();
 		if (isDissolved != null && !isDissolved) super.onReplyClick(item);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java

@@ -22,8 +22,6 @@ import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.android.sharing.SharingController;
 import org.briarproject.briar.android.threaded.ThreadListViewModel;
-import org.briarproject.briar.android.viewmodel.LiveEvent;
-import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.client.MessageTracker;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
@@ -71,8 +69,8 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 	private final MutableLiveData<PrivateGroup> privateGroup =
 			new MutableLiveData<>();
 	private final MutableLiveData<Boolean> isCreator = new MutableLiveData<>();
-	private final MutableLiveEvent<Boolean> isDissolved =
+	private final MutableLiveData<Boolean> isDissolved =
-			new MutableLiveEvent<>();
+			new MutableLiveData<>();
 
 	@Inject
 	GroupViewModel(Application application,
@@ -129,7 +127,7 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 		} else if (e instanceof GroupDissolvedEvent) {
 			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
 			if (g.getGroupId().equals(groupId)) {
-				isDissolved.setEvent(true);
+				isDissolved.setValue(true);
 			}
 		} else {
 			super.eventOccurred(e);
@@ -164,7 +162,7 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 		loadList(txn -> {
 			// check first if group is dissolved
 			isDissolved
-					.postEvent(privateGroupManager.isDissolved(txn, groupId));
+					.postValue(privateGroupManager.isDissolved(txn, groupId));
 			// now continue to load the items
 			long start = now();
 			List<GroupMessageHeader> headers =
@@ -282,7 +280,7 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 		return isCreator;
 	}
 
-	LiveEvent<Boolean> isDissolved() {
+	LiveData<Boolean> isDissolved() {
 		return isDissolved;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarExceptionHandler.java

@@ -1,29 +1,40 @@
 package org.briarproject.briar.android.reporting;
 
-import android.content.Context;
+import android.app.Application;
 import android.os.Process;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.android.logging.LogEncrypter;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 
+import javax.inject.Inject;
+
 import static org.briarproject.briar.android.util.UiUtils.startDevReportActivity;
 
 @NotNullByDefault
-public class BriarExceptionHandler implements UncaughtExceptionHandler {
+class BriarExceptionHandler implements UncaughtExceptionHandler {
 
-	private final Context ctx;
+	private final Application app;
+	private final LogEncrypter logEncrypter;
 	private final long appStartTime;
 
-	public BriarExceptionHandler(Context ctx) {
+	@Inject
-		this.ctx = ctx;
+	BriarExceptionHandler(Application app, LogEncrypter logEncrypter) {
-		this.appStartTime = System.currentTimeMillis();
+		this.app = app;
+		this.logEncrypter = logEncrypter;
+		appStartTime = System.currentTimeMillis();
 	}
 
 	@Override
 	public void uncaughtException(Thread t, Throwable e) {
+		// encrypt logs to disk before handing over to new process
+		// the intent has limited space, so we can't reliably store them there.
+		byte[] logKey = logEncrypter.encryptLogs();
+
 		// activity runs in its own process, so we can kill the old one
-		startDevReportActivity(ctx, CrashReportActivity.class, e, appStartTime);
+		startDevReportActivity(app.getApplicationContext(),
+				CrashReportActivity.class, e, appStartTime, logKey);
 		Process.killProcess(Process.myPid());
 		System.exit(10);
 	}

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportCollector.java

@@ -25,8 +25,6 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.BriarApplication;
-import org.briarproject.briar.android.logging.BriefLogFormatter;
 import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo;
 import org.briarproject.briar.android.reporting.ReportData.ReportItem;
 import org.briarproject.briar.android.reporting.ReportData.SingleReportInfo;
@@ -41,8 +39,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -74,8 +70,8 @@ class BriarReportCollector {
 		this.ctx = ctx;
 	}
 
-	public ReportData collectReportData(@Nullable Throwable t,
+	ReportData collectReportData(@Nullable Throwable t, long appStartTime,
-			long appStartTime) {
+			String logs) {
 		ReportData reportData = new ReportData()
 				.add(getBasicInfo(t))
 				.add(getDeviceInfo());
@@ -86,7 +82,7 @@ class BriarReportCollector {
 				.add(getStorage())
 				.add(getConnectivity())
 				.add(getBuildConfig())
-				.add(getLogcat())
+				.add(getLogcat(logs))
 				.add(getDeviceFeatures());
 	}
 
@@ -313,15 +309,8 @@ class BriarReportCollector {
 				buildConfig);
 	}
 
-	private ReportItem getLogcat() {
+	private ReportItem getLogcat(String logs) {
-		BriarApplication app = (BriarApplication) ctx.getApplicationContext();
+		return new ReportItem("Logcat", R.string.dev_report_logcat, logs);
-		StringBuilder sb = new StringBuilder();
-		Formatter formatter = new BriefLogFormatter();
-		for (LogRecord record : app.getRecentLogRecords()) {
-			sb.append(formatter.format(record)).append('\n');
-		}
-		return new ReportItem("Logcat", R.string.dev_report_logcat,
-				sb.toString());
 	}
 
 	private ReportItem getDeviceFeatures() {

briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashReportActivity.java

@@ -35,6 +35,7 @@ public class CrashReportActivity extends BaseActivity
 
 	public static final String EXTRA_THROWABLE = "throwable";
 	public static final String EXTRA_APP_START_TIME = "appStartTime";
+	public static final String EXTRA_APP_LOGCAT = "logcat";
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -56,7 +57,8 @@ public class CrashReportActivity extends BaseActivity
 		Intent intent = getIntent();
 		Throwable t = (Throwable) intent.getSerializableExtra(EXTRA_THROWABLE);
 		long appStartTime = intent.getLongExtra(EXTRA_APP_START_TIME, -1);
-		viewModel.init(t, appStartTime);
+		byte[] logKey = intent.getByteArrayExtra(EXTRA_APP_LOGCAT);
+		viewModel.init(t, appStartTime, logKey);
 		viewModel.getShowReport().observeEvent(this, show -> {
 			if (show) displayFragment(true);
 		});

briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportModule.java

@@ -15,4 +15,8 @@ public abstract class DevReportModule {
 	@ViewModelKey(ReportViewModel.class)
 	abstract ViewModel bindReportViewModel(ReportViewModel reportViewModel);
 
+	@Binds
+	abstract Thread.UncaughtExceptionHandler bindUncaughtExceptionHandler(
+			BriarExceptionHandler handler);
+
 }

briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java

@@ -11,6 +11,9 @@ import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.logging.BriefLogFormatter;
+import org.briarproject.briar.android.logging.CachingLogHandler;
+import org.briarproject.briar.android.logging.LogDecrypter;
 import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
@@ -19,6 +22,7 @@ import org.json.JSONException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.UUID;
+import java.util.logging.Formatter;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -36,13 +40,16 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.briar.android.logging.BriefLogFormatter.formatLog;
 
 @NotNullByDefault
-public class ReportViewModel extends AndroidViewModel {
+class ReportViewModel extends AndroidViewModel {
 
 	private static final Logger LOG =
 			getLogger(ReportViewModel.class.getName());
 
+	private final CachingLogHandler logHandler;
+	private final LogDecrypter logDecrypter;
 	private final BriarReportCollector collector;
 	private final DevReporter reporter;
 	private final PluginManager pluginManager;
@@ -58,18 +65,39 @@ public class ReportViewModel extends AndroidViewModel {
 	private boolean isFeedback;
 
 	@Inject
-	public ReportViewModel(@NonNull Application application,
+	ReportViewModel(@NonNull Application application,
-			DevReporter reporter, PluginManager pluginManager) {
+			CachingLogHandler logHandler,
+			LogDecrypter logDecrypter,
+			DevReporter reporter,
+			PluginManager pluginManager) {
 		super(application);
-		this.collector = new BriarReportCollector(application);
+		collector = new BriarReportCollector(application);
+		this.logHandler = logHandler;
+		this.logDecrypter = logDecrypter;
 		this.reporter = reporter;
 		this.pluginManager = pluginManager;
 	}
 
-	void init(@Nullable Throwable t, long appStartTime) {
+	void init(@Nullable Throwable t, long appStartTime,
+			@Nullable byte[] logKey) {
 		isFeedback = t == null;
 		if (reportData.getValue() == null) new SingleShotAndroidExecutor(() -> {
-			ReportData data = collector.collectReportData(t, appStartTime);
+			String decryptedLogs;
+			if (isFeedback) {
+				Formatter formatter = new BriefLogFormatter();
+				decryptedLogs =
+						formatLog(formatter, logHandler.getRecentLogRecords());
+			} else {
+				decryptedLogs = logDecrypter.decryptLogs(logKey);
+				if (decryptedLogs == null) {
+					// error decrypting logs, get logs from this process
+					Formatter formatter = new BriefLogFormatter();
+					decryptedLogs = formatLog(formatter,
+							logHandler.getRecentLogRecords());
+				}
+			}
+			ReportData data =
+					collector.collectReportData(t, appStartTime, decryptedLogs);
 			reportData.postValue(data);
 		}).start();
 	}
@@ -110,8 +138,8 @@ public class ReportViewModel extends AndroidViewModel {
 	}
 
 	/**
-	 * The content of the report
+	 * The content of the report that will be loaded after
-	 * that will be loaded after {@link #init(Throwable, long)} was called.
+	 * {@link #init(Throwable, long, byte[])} was called.
 	 */
 	LiveData<ReportData> getReportData() {
 		return reportData;

briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.splash;
 
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -7,6 +8,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.Localizer;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -27,6 +29,13 @@ public class ExpiredActivity extends AppCompatActivity
 		findViewById(R.id.download_briar_button).setOnClickListener(this);
 	}
 
+	@Override
+	protected void attachBaseContext(Context base) {
+		super.attachBaseContext(
+				Localizer.getInstance().setLocale(base));
+		Localizer.getInstance().setLocale(this);
+	}
+
 	@Override
 	public void onClick(View v) {
 		Uri uri = Uri.parse("https://briarproject.org/download.html");

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java

@@ -197,6 +197,10 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	 */
 	@UiThread
 	protected void addItem(I item, boolean scrollToItem) {
+		// If items haven't loaded, we need to wait until they have.
+		// Since this was a R/W DB transaction, the load will pick up this item.
+		if (items.getValue() == null) return;
+
 		messageTree.add(item);
 		if (scrollToItem) this.scrollToItem.set(item.getId());
 		items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));

briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

@@ -97,6 +97,7 @@ import static java.util.concurrent.TimeUnit.DAYS;
 import static org.briarproject.bramble.util.AndroidUtils.getSupportedImageContentTypes;
 import static org.briarproject.briar.BuildConfig.APPLICATION_ID;
 import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE;
+import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_APP_LOGCAT;
 import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_APP_START_TIME;
 import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_THROWABLE;
 
@@ -357,16 +358,17 @@ public class UiUtils {
 	}
 
 	public static void triggerFeedback(Context ctx) {
-		startDevReportActivity(ctx, FeedbackActivity.class, null, null);
+		startDevReportActivity(ctx, FeedbackActivity.class, null, null, null);
 	}
 
 	public static void startDevReportActivity(Context ctx,
 			Class<? extends FragmentActivity> activity, @Nullable Throwable t,
-			@Nullable Long appStartTime) {
+			@Nullable Long appStartTime, @Nullable byte[] logKey) {
 		final Intent dialogIntent = new Intent(ctx, activity);
 		dialogIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
 		dialogIntent.putExtra(EXTRA_THROWABLE, t);
 		dialogIntent.putExtra(EXTRA_APP_START_TIME, appStartTime);
+		dialogIntent.putExtra(EXTRA_APP_LOGCAT, logKey);
 		ctx.startActivity(dialogIntent);
 	}
 

briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java

@@ -39,7 +39,8 @@ public interface AndroidNotificationManager {
 	String BLOG_CHANNEL_ID = "blogs";
 	// Channels are sorted by channel ID in the Settings app, so use IDs
 	// that will sort below the main channels such as contacts
-	String ONGOING_CHANNEL_ID = "zForegroundService";
+	String ONGOING_CHANNEL_OLD_ID = "zForegroundService";
+	String ONGOING_CHANNEL_ID = "zForegroundService2";
 	String FAILURE_CHANNEL_ID = "zStartupFailure";
 	String REMINDER_CHANNEL_ID = "zSignInReminder";
 

briar-android/src/main/res/layout/fragment_link_exchange.xml

@@ -112,7 +112,6 @@
 			android:textColor="@color/briar_primary"
 			android:textIsSelectable="true"
 			android:textSize="18sp"
-			android:typeface="monospace"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"

briar-android/src/main/res/layout/fragment_nickname.xml

@@ -139,10 +139,10 @@
 		<Space
 			android:id="@+id/space"
 			android:layout_width="0dp"
-			android:layout_height="0dp"
+			android:layout_height="wrap_content"
+			app:layout_constrainedHeight="true"
 			app:layout_constraintBottom_toTopOf="@+id/addButton"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHeight_default="wrap"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
 

briar-android/src/main/res/values-fa/strings.xml

@@ -67,8 +67,11 @@
   <string name="lock_button">قفل کردن برنامه</string>
   <string name="settings_button">تنظیمات</string>
   <string name="sign_out_button">خروج</string>
+  <string name="transports_onboarding_text">برای کنترل چگونگی اتصال Briar (برایر) به مخاطبین خود، اینجا را لمس کنید.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">اینترنت</string>
+  <string name="tor_device_status_online_wifi">تلفن شما از طریق Wi-Fi به اینترنت دسترسی دارد.</string>
+  <string name="tor_device_status_online_mobile">تلفن شما از طریق دیتا سیمکارت به اینترنت دسترسی دارد.</string>
   <string name="tor_device_status_offline">تلفن شما دارای دسترسی اینترنتی نیست</string>
   <string name="tor_plugin_status_enabling">Briar در حال اتصال به اینترنت می باشد</string>
   <string name="tor_plugin_status_active">Briar به اینترنت متصل شد</string>
@@ -462,6 +465,10 @@
 برای وارد کردن خوراک روی آیکون + ضربه بزنید</string>
   <string name="blogs_rss_feeds_manage_error">مشکلی با بارگذاری فیدهای شما وجود داشت. لطفا بعدا امتحان کنید.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">برای تغییر تصویر نمایه خود اینجا را لمس کنید.</string>
+  <string name="dialog_confirm_profile_picture_title">تغییر تصویر نمایه</string>
+  <string name="dialog_confirm_profile_picture_remark">تنها مخاطبین شما می‌توانند تصویر نمایه شما را مشاهده کنند.</string>
+  <string name="change_profile_picture_failed_message">تاسفیم اما هنگام بروزرسانی تصویر نمایه شما مشکلی رخ داد.</string>
   <!--Settings Display-->
   <string name="pref_language_title">زبان و منطقه</string>
   <string name="pref_language_changed">این تنظیمات زمانی که Briar (برایر) را ری استارت کنید تاثیر خود را می گذارند. لطفا خارج شوید و Briar (برایر) را دوباره راه اندازی کنید.</string>
@@ -571,17 +578,20 @@
   <string name="include_debug_report_feedback">قرار دادن داده های ناشناس درباره این دستگاه</string>
   <string name="dev_report_basic_info">اطلاعات پایه</string>
   <string name="dev_report_device_info">اطلاعات دستگاه</string>
+  <string name="dev_report_stacktrace">Stacktrace</string>
   <string name="dev_report_time_info">اطلاعات زمانی</string>
   <string name="dev_report_memory">حافظه</string>
   <string name="dev_report_storage">حافظه</string>
   <string name="dev_report_connectivity">اتصال</string>
   <string name="dev_report_build_config">پیکربندی ساخت</string>
+  <string name="dev_report_logcat">لاگ برنامه</string>
   <string name="dev_report_device_features">ویژگی‌های دستگاه</string>
   <string name="send_report">ارسال گزارش</string>
   <string name="close">بستن</string>
   <string name="dev_report_sending">در حال فرستادن نظر...</string>
   <string name="dev_report_sent">بازخورد ارسال شد</string>
   <string name="dev_report_saved">گزارش ذخیره شد. دفعه بعدی که وارد Briar (برایر) شدید فرستاده خواهد شد.</string>
+  <string name="dev_report_error">خطا در ارسال گزارش</string>
   <!--Sign Out-->
   <string name="progress_title_logout">خروج از Briar (برایر)...</string>
   <!--Screen Filters & Tapjacking-->
@@ -591,7 +601,9 @@
 این برنامه ها ممکن است روی Briar (برایر) قرار گرفته باشند:
 
 %1$s</string>
+  <string name="screen_filter_body_api_30">برنامه دیگری بر روی برنامه Briar (برایر) قرار دارد. برای محافظت از امنیت شما، Briar (برایر) هنگامی که برنامه دیگری روی آن باز است، به لمس پاسخ نخواهد داد. \n\nبرای یافتن برنامه مذکور، برنامه‌های زیر را بررسی کنید.</string>
   <string name="screen_filter_allow">به این برنامه ها اجازه بده تا روی Briar (برایر) قرار بگیرند</string>
+  <string name="screen_filter_review_apps">بررسی برنامه‌ها</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">دسترسی به دوربین</string>
   <string name="permission_camera_request_body">برای اسکن کردن کد کیوآر دسترسی به دوربین لازم است.</string>
@@ -608,6 +620,7 @@ Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن
   <string name="permission_camera_denied_body">شما دسترسی به دوربین را رد کرده اید، اما افزودن مخاطب نیاز به دوربین دارد.
 
 لطفا اجازه دسترسی را بدهید.</string>
+  <string name="permission_location_denied_body">شما دسترسی به موقعیت خود را نداده‌اید اما Briar (برایر) برای یافتن دستگاه‌های بلوتوث نیاز به این دسترسی دارد.\n\nلطفا این دسترسی را فراهم کنید.</string>
   <string name="qr_code">کد کیوآر</string>
   <string name="show_qr_code_fullscreen">نمایش کد کیوآر به صورت فول اسکرین</string>
   <!--App Locking-->
@@ -618,6 +631,7 @@ Briar (برایر) موقعیت شما را ذخیره نمی‌کند و آن
   <string name="lock_is_locked">Briar (برایر) قفل می باشد</string>
   <string name="lock_tap_to_unlock">برای آنلاک کردن کلیک کنید</string>
   <!--Connections Screen-->
+  <string name="transports_help_text">Briar (برایر) می‌تواند از طریق اینترنت، Wi-Fi و یا بلوتوث به مخاطبین شما متصل گردد.\n\nارتباط با اینترنت از طریق شبکه‌ی تور صورت می‌پذیرد.\n\nاگر دسترسی به مخاطب شما از روش‌های مختلفی ممکن باشد، Briar (برایر) به صورت موازی از آن‌ها استفاده خواهد کرد.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">آلیس</string>

briar-android/src/main/res/values-gl/strings.xml

@@ -425,6 +425,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Sen fontes RSS que mostrar\n\nToque na icona + para importar unha fonte</string>
   <string name="blogs_rss_feeds_manage_error">Aconteceu un problema ao cargar as súas fontes. Por favor, inténteo máis tarde.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Toca para cambiar a túa imaxe de perfil</string>
+  <string name="dialog_confirm_profile_picture_title">Mudar imaxe de perfil</string>
+  <string name="dialog_confirm_profile_picture_remark">Só os teus contactos poden ver a túa imaxe de perfil</string>
+  <string name="change_profile_picture_failed_message">Lamentámolo, pero algo fallou cando intentamos actualizar a túa imaxe de pefil</string>
   <!--Settings Display-->
   <string name="pref_language_title">Idioma  &amp; rexión</string>
   <string name="pref_language_changed">Este axuste terá efecto cando reinicie Briar. Por favor desconecte e volte a iniciar Briar.</string>

briar-android/src/main/res/values-he/strings.xml

@@ -449,6 +449,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">אין הזנות RSS להראות\n\nהקש על הצלמית + כדי לייבא הזנה</string>
   <string name="blogs_rss_feeds_manage_error">הייתה בעיה בטעינת ההזנות שלך. אנא נסה שוב מאוחר יותר.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">הקש כדי לשנות את תמונת הפרופיל שלך</string>
+  <string name="dialog_confirm_profile_picture_title">שנה תמונת פרופיל</string>
+  <string name="dialog_confirm_profile_picture_remark">רק אנשי הקשר שלך יכולים לראות את תמונת הפרופיל שלך</string>
+  <string name="change_profile_picture_failed_message">אנו מצטערים משהו השתבש בעת עדכון תמונת הפרופיל שלך</string>
   <!--Settings Display-->
   <string name="pref_language_title">שפה ואזור</string>
   <string name="pref_language_changed">הגדרה זו תיכנס לתוקף כשתפעיל מחדש את Briar. אנא התנתק והפעל מחדש את Briar.</string>
@@ -558,6 +562,7 @@
   <string name="include_debug_report_feedback">כלול נתונים אלמוניים לגבי מכשיר זה</string>
   <string name="dev_report_basic_info">מידע בסיסי</string>
   <string name="dev_report_device_info">מידע מכשיר</string>
+  <string name="dev_report_stacktrace">מחסנית עקיבה (Stacktrace)</string>
   <string name="dev_report_time_info">מידע זמן</string>
   <string name="dev_report_memory">זיכרון</string>
   <string name="dev_report_storage">אחסון</string>

briar-android/src/main/res/values-is/strings.xml

@@ -425,6 +425,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Engin RSS-streymi til að birta\n\nÝttu á + táknið til að flytja inn streymi</string>
   <string name="blogs_rss_feeds_manage_error">Vandamál hefur komið upp með að hlaða inn streymunum þínum. Reyndu aftur síðar.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Ýttu til að skipta um auðkennismyndina þína</string>
+  <string name="dialog_confirm_profile_picture_title">Skipta um auðkennismynd</string>
+  <string name="dialog_confirm_profile_picture_remark">Einungis tengiliðirnir þínir geta séð auðkennismyndina þína</string>
+  <string name="change_profile_picture_failed_message">Því miður, eitthvað fór úrskeiðis við að uppfæra auðkennismyndina þína.</string>
   <!--Settings Display-->
   <string name="pref_language_title">Tungumál og landsvæði</string>
   <string name="pref_language_changed">Þessi stilling tekur gildi í næst þegar þú skráir þig inn í Briar. Skráðu þig út og endurræstu Briar.</string>

briar-android/src/main/res/values-it/strings.xml

@@ -425,6 +425,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Nessun feed RSS da mostrare\n\nClicca l\'icona + per importare un feed</string>
   <string name="blogs_rss_feeds_manage_error">C\'è stato un problema nel caricare i tuoi feeds. Per favore riprova fra poco.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Tocca per cambiare l\'immagine del profilo</string>
+  <string name="dialog_confirm_profile_picture_title">Cambia immagine profilo</string>
+  <string name="dialog_confirm_profile_picture_remark">Solo i tuoi contatti possono vedere l\'immagine del profilo</string>
+  <string name="change_profile_picture_failed_message">Spiacenti, qualcosa è andato storto aggiornando la tua foto del profilo.</string>
   <!--Settings Display-->
   <string name="pref_language_title">Lingua &amp; regione</string>
   <string name="pref_language_changed">Questa impostazione avrà effetto quando riavvierai Briar. Per favore, esci e riavvia Briar.</string>

briar-android/src/main/res/values-nl/strings.xml

@@ -425,6 +425,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Geen RSS-feeds om te tonen\n\nTik op het +-icoon om een feed te importeren</string>
   <string name="blogs_rss_feeds_manage_error">Er was een probleem met het laden van je feeds. Probeer het alsjeblieft later nog een keer.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Tik om je profielfoto te wijzigen</string>
+  <string name="dialog_confirm_profile_picture_title">Wijzig profielfoto</string>
+  <string name="dialog_confirm_profile_picture_remark">Alleen je contacten kunnen je profielfoto zien</string>
+  <string name="change_profile_picture_failed_message">Excuses, maar er is iets misgegaan met het updaten van je profielfoto</string>
   <!--Settings Display-->
   <string name="pref_language_title">Taal &amp; regio</string>
   <string name="pref_language_changed">Deze instelling zal werken wanneer u Briar opnieuw opstart. Gelieve uit te loggen en Briar opnieuw te starten.</string>
@@ -564,7 +568,7 @@
   <string name="permission_camera_location_title">Camera en locatie</string>
   <string name="permission_camera_location_request_body">Om de QR-code in te scannen heeft Briar toegang nodig tot de camera.\n\nOm bluetoothapparaten te ontdekken heeft Briar toestemming nodig tot je locatie.\n\nBriar slaat je locatie niet op en deelt het met niemand.</string>
   <string name="permission_camera_denied_body">Je hebt toegang tot de camera niet vrijgegeven, terwijl het toevoegen van contacten de camera nodig heeft.\n\nOverweeg alsjeblieft toegang vrij te geven.</string>
-  <string name="permission_location_denied_body">Je hebt geen toegang tot je locatie gegeven, maar Briar heeft deze rechten nodig om apparaten via bleutooth te vinden.\n\nOverweeg a.u.b. deze rechten te geven.</string>
+  <string name="permission_location_denied_body">Je hebt geen toegang tot je locatie gegeven, maar Briar heeft deze rechten nodig om apparaten via bluetooth te vinden.\n\nOverweeg a.u.b. deze rechten te geven.</string>
   <string name="qr_code">QR-code</string>
   <string name="show_qr_code_fullscreen">Toon QR-code op volledig scherm</string>
   <!--App Locking-->

briar-android/src/main/res/values-ro/strings.xml

@@ -435,6 +435,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Nici un flux RSS de arătat\n\nAtingeți iconița + pentru a adăuga un flux</string>
   <string name="blogs_rss_feeds_manage_error">A apărut o eroare la încărcarea fluxurilor dumneavoastră. Vă rugăm să încercați din nou mai târziu.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Atingeți pentru a vă schimba poza de profil</string>
+  <string name="dialog_confirm_profile_picture_title">Schimbare poză de profil</string>
+  <string name="dialog_confirm_profile_picture_remark">Doar contactele vor vedea poza de contact</string>
+  <string name="change_profile_picture_failed_message">Ne pare rău, dar ceva nu a funcționat cum trebuie la actualizarea pozei de profil</string>
   <!--Settings Display-->
   <string name="pref_language_title">Limbă &amp; Regiune</string>
   <string name="pref_language_changed">Această setare va avea efect după repornirea Briar. Vă rugăm să ieșiți din Briar și să reporniți aplicația.</string>

briar-android/src/main/res/values-ru/strings.xml

@@ -447,6 +447,10 @@
   <string name="blogs_rss_feeds_manage_empty_state">Нет RSS-лент для отображения\n\nКоснитесь значка + для импорта ленты</string>
   <string name="blogs_rss_feeds_manage_error">Ошибка при загрузке вашей ленты. Повторите попытку позже.</string>
   <!--Settings Profile Picture-->
+  <string name="change_profile_picture">Нажмите, чтобы изменить изображение вашего профиля </string>
+  <string name="dialog_confirm_profile_picture_title">Изменить изображение профиля</string>
+  <string name="dialog_confirm_profile_picture_remark">Только ваши контакты могут видеть изображение вашего профиля</string>
+  <string name="change_profile_picture_failed_message">Нам очень жаль, но что-то пошло не так во время обновления изображения вашего профиля.</string>
   <!--Settings Display-->
   <string name="pref_language_title">Язык и регион</string>
   <string name="pref_language_changed">Этот параметр вступит в силу после перезапуска Briar. Пожалуйста, выйдите и перезапустите Briar.</string>

briar-android/src/test/java/org/briarproject/briar/android/logging/LogEncryptionDecryptionTest.java

@@ -0,0 +1,66 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.test.BrambleMockTestCase;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
+import static org.briarproject.briar.android.logging.BriefLogFormatter.formatLog;
+import static org.junit.Assert.assertEquals;
+
+public class LogEncryptionDecryptionTest extends BrambleMockTestCase {
+
+	@ClassRule
+	public static TemporaryFolder folder = new TemporaryFolder();
+
+	private final SecureRandom random;
+	private final CachingLogHandler cachingLogHandler;
+	private final LogEncrypter logEncrypter;
+	private final LogDecrypter logDecrypter;
+	private final BriefLogFormatter logFormatter = new BriefLogFormatter();
+
+	public LogEncryptionDecryptionTest() throws IOException {
+		LoggingComponent loggingComponent = DaggerLoggingComponent.builder()
+				.loggingTestModule(new LoggingTestModule(folder.newFile()))
+				.build();
+		random = loggingComponent.random();
+		logEncrypter = loggingComponent.logEncrypter();
+		logDecrypter = loggingComponent.logDecrypter();
+		cachingLogHandler = loggingComponent.cachingLogHandler();
+	}
+
+	@Test
+	public void testEncryptedMatchesDecrypted() {
+		ArrayList<LogRecord> logRecords =
+				new ArrayList<>(random.nextInt(99) + 1);
+		for (int i = 0; i < logRecords.size(); i++) {
+			LogRecord logRecord = getRandomLogRecord();
+			cachingLogHandler.publish(logRecord);
+			logRecords.add(logRecord);
+		}
+		byte[] logKey = logEncrypter.encryptLogs();
+		assertEquals(formatLog(logFormatter, logRecords),
+				logDecrypter.decryptLogs(logKey));
+	}
+
+	private LogRecord getRandomLogRecord() {
+		Level[] levels = {SEVERE, WARNING, INFO, FINE};
+		Level level = levels[random.nextInt(levels.length)];
+		LogRecord logRecord =
+				new LogRecord(level, getRandomString(random.nextInt(128) + 1));
+		logRecord.setLoggerName(getRandomString(random.nextInt(23) + 1));
+		return logRecord;
+	}
+
+}

briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingComponent.java

@@ -0,0 +1,29 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.BrambleCoreModule;
+import org.briarproject.bramble.test.TestSecureRandomModule;
+
+import java.security.SecureRandom;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {
+		BrambleCoreModule.class,
+		TestSecureRandomModule.class,
+		LoggingModule.class,
+		LoggingTestModule.class,
+})
+public interface LoggingComponent {
+
+	SecureRandom random();
+
+	CachingLogHandler cachingLogHandler();
+
+	LogEncrypter logEncrypter();
+
+	LogDecrypter logDecrypter();
+
+}

briar-android/src/test/java/org/briarproject/briar/android/logging/LoggingTestModule.java

@@ -0,0 +1,52 @@
+package org.briarproject.briar.android.logging;
+
+import org.briarproject.bramble.api.crypto.PublicKey;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.reporting.DevConfig;
+
+import java.io.File;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+class LoggingTestModule {
+
+	private final File logFile;
+
+	LoggingTestModule(File logFile) {
+		this.logFile = logFile;
+	}
+
+	@Provides
+	@Singleton
+	DevConfig provideDevConfig() {
+		@NotNullByDefault
+		DevConfig devConfig = new DevConfig() {
+			@Override
+			public PublicKey getDevPublicKey() {
+				throw new UnsupportedOperationException();
+
+			}
+
+			@Override
+			public String getDevOnionAddress() {
+				throw new UnsupportedOperationException();
+			}
+
+			@Override
+			public File getReportDir() {
+				throw new UnsupportedOperationException();
+			}
+
+			@Override
+			public File getLogcatFile() {
+				return logFile;
+			}
+		};
+		return devConfig;
+	}
+
+}

briar-api/witness.gradle

@@ -1,8 +1,10 @@
 dependencyVerification {
     verify = [
+        'junit:junit:4.13.1:junit-4.13.1.jar:c30719db974d6452793fe191b3638a5777005485bae145924044530ffa5f6122',
         'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
         'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
         'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
+        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
         'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
     ]
 }