Bump version numbers for 1.2.11 release.

Add method to change contact alias to REST API

Closes #1781

See merge request briar/briar!1286

.idea/codeStyles/Project.xml

@@ -28,6 +28,20 @@
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>

bramble-android/.gitignore

@@ -3,3 +3,4 @@ gen
 build
 .settings
 src/main/res/raw/*.zip
+src/main/jniLibs

bramble-android/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 29
-	buildToolsVersion '29.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 28
-		versionCode 10210
-		versionName "1.2.10"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -53,10 +53,12 @@ dependencies {
 }
 
 def torBinariesDir = 'src/main/res/raw'
+def torLibsDir = 'src/main/jniLibs'
 
 task cleanTorBinaries {
 	doLast {
 		delete fileTree(torBinariesDir) { include '*.zip' }
+		delete fileTree(torLibsDir) { include '**/*.so' }
 	}
 }
 
@@ -67,8 +69,36 @@ task unpackTorBinaries {
 		copy {
 			from configurations.tor.collect { zipTree(it) }
 			into torBinariesDir
-			// TODO: Remove after next Tor upgrade, which won't include non-PIE binaries
-			include 'geoip.zip', '*_pie.zip'
+			include 'geoip.zip'
+		}
+		configurations.tor.each { outer ->
+			zipTree(outer).each { inner ->
+				if (inner.name.endsWith('_arm_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'armeabi-v7a/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_arm64_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'arm64-v8a/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_x86_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'x86/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_x86_64_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'x86_64/lib$1.so'
+					}
+				}
+			}
 		}
 	}
 	dependsOn cleanTorBinaries
@@ -76,5 +106,6 @@ task unpackTorBinaries {
 
 tasks.withType(MergeResources) {
 	inputs.dir torBinariesDir
+	inputs.dir torLibsDir
 	dependsOn unpackTorBinaries
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -135,6 +135,7 @@ class AndroidBluetoothPlugin
 	@Override
 	@Nullable
 	String getBluetoothAddress() {
+		if (adapter == null) return null;
 		String address = AndroidUtils.getBluetoothAddress(app, adapter);
 		return address.isEmpty() ? null : address;
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java

@@ -16,19 +16,42 @@ import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
+import org.briarproject.bramble.util.AndroidUtils;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import javax.net.SocketFactory;
 
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Arrays.asList;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
+
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 class AndroidTorPlugin extends TorPlugin {
 
+	private static final List<String> LIBRARY_ARCHITECTURES =
+			asList("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
+
+	private static final String TOR_LIB_NAME = "libtor.so";
+	private static final String OBFS4_LIB_NAME = "libobfs4proxy.so";
+
+	private static final Logger LOG =
+			getLogger(AndroidTorPlugin.class.getName());
+
 	private final Application app;
 	private final AndroidWakeLock wakeLock;
+	private final File torLib, obfs4Lib;
 
 	AndroidTorPlugin(Executor ioExecutor,
 			Executor wakefulIoExecutor,
@@ -55,6 +78,9 @@ class AndroidTorPlugin extends TorPlugin {
 				maxIdleTime, torDirectory);
 		this.app = app;
 		wakeLock = wakeLockManager.createWakeLock("TorPlugin");
+		String nativeLibDir = app.getApplicationInfo().nativeLibraryDir;
+		torLib = new File(nativeLibDir, TOR_LIB_NAME);
+		obfs4Lib = new File(nativeLibDir, OBFS4_LIB_NAME);
 	}
 
 	@Override
@@ -85,4 +111,112 @@ class AndroidTorPlugin extends TorPlugin {
 		super.stop();
 		wakeLock.release();
 	}
+
+	@Override
+	protected File getTorExecutableFile() {
+		return torLib.exists() ? torLib : super.getTorExecutableFile();
+	}
+
+	@Override
+	protected File getObfs4ExecutableFile() {
+		return obfs4Lib.exists() ? obfs4Lib : super.getObfs4ExecutableFile();
+	}
+
+	@Override
+	protected void installTorExecutable() throws IOException {
+		File extracted = super.getTorExecutableFile();
+		if (torLib.exists()) {
+			// If an older version left behind a Tor binary, delete it
+			if (extracted.exists()) {
+				if (extracted.delete()) LOG.info("Deleted Tor binary");
+				else LOG.info("Failed to delete Tor binary");
+			}
+		} else if (SDK_INT < 29) {
+			// The binary wasn't extracted at install time. Try to extract it
+			extractLibraryFromApk(TOR_LIB_NAME, extracted);
+		} else {
+			// No point extracting the binary, we won't be allowed to execute it
+			throw new FileNotFoundException(torLib.getAbsolutePath());
+		}
+	}
+
+	@Override
+	protected void installObfs4Executable() throws IOException {
+		File extracted = super.getObfs4ExecutableFile();
+		if (obfs4Lib.exists()) {
+			// If an older version left behind an obfs4 binary, delete it
+			if (extracted.exists()) {
+				if (extracted.delete()) LOG.info("Deleted obfs4 binary");
+				else LOG.info("Failed to delete obfs4 binary");
+			}
+		} else if (SDK_INT < 29) {
+			// The binary wasn't extracted at install time. Try to extract it
+			extractLibraryFromApk(OBFS4_LIB_NAME, extracted);
+		} else {
+			// No point extracting the binary, we won't be allowed to execute it
+			throw new FileNotFoundException(obfs4Lib.getAbsolutePath());
+		}
+	}
+
+	private void extractLibraryFromApk(String libName, File dest)
+			throws IOException {
+		File sourceDir = new File(app.getApplicationInfo().sourceDir);
+		if (sourceDir.isFile()) {
+			// Look for other APK files in the same directory, if we're allowed
+			File parent = sourceDir.getParentFile();
+			if (parent != null) sourceDir = parent;
+		}
+		List<String> libPaths = getSupportedLibraryPaths(libName);
+		for (File apk : findApkFiles(sourceDir)) {
+			ZipInputStream zin = new ZipInputStream(new FileInputStream(apk));
+			for (ZipEntry e = zin.getNextEntry(); e != null;
+					e = zin.getNextEntry()) {
+				if (libPaths.contains(e.getName())) {
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Extracting " + e.getName()
+								+ " from " + apk.getAbsolutePath());
+					}
+					extract(zin, dest); // Zip input stream will be closed
+					return;
+				}
+			}
+			zin.close();
+		}
+		throw new FileNotFoundException(libName);
+	}
+
+	/**
+	 * Returns all files with the extension .apk or .APK under the given root.
+	 */
+	private List<File> findApkFiles(File root) {
+		List<File> files = new ArrayList<>();
+		findApkFiles(root, files);
+		return files;
+	}
+
+	private void findApkFiles(File f, List<File> files) {
+		if (f.isFile() && f.getName().toLowerCase().endsWith(".apk")) {
+			files.add(f);
+		} else if (f.isDirectory()) {
+			File[] children = f.listFiles();
+			if (children != null) {
+				for (File child : children) findApkFiles(child, files);
+			}
+		}
+	}
+
+	/**
+	 * Returns the paths at which libraries with the given name would be found
+	 * inside an APK file, for all architectures supported by the device, in
+	 * order of preference.
+	 */
+	private List<String> getSupportedLibraryPaths(String libName) {
+		List<String> architectures = new ArrayList<>();
+		for (String abi : AndroidUtils.getSupportedArchitectures()) {
+			if (LIBRARY_ARCHITECTURES.contains(abi)) {
+				architectures.add("lib/" + abi + "/" + libName);
+			}
+		}
+		return architectures;
+	}
 }

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -132,7 +132,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final CircumventionProvider circumventionProvider;
 	private final ResourceProvider resourceProvider;
 	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final File torDirectory, torFile, geoIpFile, obfs4File, configFile;
+	private final File torDirectory, geoIpFile, configFile;
 	private final File doneFile, cookieFile;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
@@ -181,9 +181,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
 		this.torDirectory = torDirectory;
-		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
-		obfs4File = new File(torDirectory, "obfs4proxy");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
@@ -192,6 +190,14 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				new PoliteExecutor("TorPlugin", ioExecutor, 1);
 	}
 
+	protected File getTorExecutableFile() {
+		return new File(torDirectory, "tor");
+	}
+
+	protected File getObfs4ExecutableFile() {
+		return new File(torDirectory, "obfs4proxy");
+	}
+
 	@Override
 	public TransportId getId() {
 		return TorConstants.ID;
@@ -224,6 +230,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			LOG.warning("Old auth cookie not deleted");
 		// Start a new Tor process
 		LOG.info("Starting Tor");
+		File torFile = getTorExecutableFile();
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
 		String pid = String.valueOf(getProcessId());
@@ -322,44 +329,43 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void installAssets() throws PluginException {
-		InputStream in = null;
-		OutputStream out = null;
 		try {
 			// The done file may already exist from a previous installation
 			//noinspection ResultOfMethodCallIgnored
 			doneFile.delete();
-			// Unzip the Tor binary to the filesystem
-			in = getTorInputStream();
-			out = new FileOutputStream(torFile);
-			copyAndClose(in, out);
-			// Make the Tor binary executable
-			if (!torFile.setExecutable(true, true)) throw new IOException();
-			// Unzip the GeoIP database to the filesystem
-			in = getGeoIpInputStream();
-			out = new FileOutputStream(geoIpFile);
-			copyAndClose(in, out);
-			// Unzip the Obfs4 proxy to the filesystem
-			in = getObfs4InputStream();
-			out = new FileOutputStream(obfs4File);
-			copyAndClose(in, out);
-			// Make the Obfs4 proxy executable
-			if (!obfs4File.setExecutable(true, true)) throw new IOException();
-			// Copy the config file to the filesystem
-			in = getConfigInputStream();
-			out = new FileOutputStream(configFile);
-			copyAndClose(in, out);
+			installTorExecutable();
+			installObfs4Executable();
+			extract(getGeoIpInputStream(), geoIpFile);
+			extract(getConfigInputStream(), configFile);
 			if (!doneFile.createNewFile())
 				LOG.warning("Failed to create done file");
 		} catch (IOException e) {
-			tryToClose(in, LOG, WARNING);
-			tryToClose(out, LOG, WARNING);
 			throw new PluginException(e);
 		}
 	}
 
-	private InputStream getTorInputStream() throws IOException {
+	protected void extract(InputStream in, File dest) throws IOException {
+		OutputStream out = new FileOutputStream(dest);
+		copyAndClose(in, out);
+	}
+
+	protected void installTorExecutable() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
+		File torFile = getTorExecutableFile();
+		extract(getTorInputStream(), torFile);
+		if (!torFile.setExecutable(true, true)) throw new IOException();
+	}
+
+	protected void installObfs4Executable() throws IOException {
+		if (LOG.isLoggable(INFO))
+			LOG.info("Installing obfs4proxy binary for " + architecture);
+		File obfs4File = getObfs4ExecutableFile();
+		extract(getObfs4InputStream(), obfs4File);
+		if (!obfs4File.setExecutable(true, true)) throw new IOException();
+	}
+
+	private InputStream getTorInputStream() throws IOException {
 		InputStream in = resourceProvider
 				.getResourceInputStream("tor_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
@@ -376,8 +382,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private InputStream getObfs4InputStream() throws IOException {
-		if (LOG.isLoggable(INFO))
-			LOG.info("Installing obfs4proxy binary for " + architecture);
 		InputStream in = resourceProvider
 				.getResourceInputStream("obfs4proxy_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
@@ -569,6 +573,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (enable) {
 			Collection<String> conf = new ArrayList<>();
 			conf.add("UseBridges 1");
+			File obfs4File = getObfs4ExecutableFile();
 			if (needsMeek) {
 				conf.add("ClientTransportPlugin meek_lite exec " +
 						obfs4File.getAbsolutePath());

briar-android/build.gradle

@@ -16,14 +16,14 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdkVersion 29
-	buildToolsVersion '29.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 28
-		versionCode 10210
-		versionName "1.2.10"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""

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

@@ -24,6 +24,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginTop="4dp"
 		android:textColor="?android:attr/textColorSecondary"
+		android:textIsSelectable="true"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/include_in_report"

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

@@ -27,6 +27,7 @@
   <string name="enter_password">‮كلمة السّر</string>
   <string name="try_again">كلمة السرّ خاطئة, الرجاء المحاولة مجدّدا</string>
   <string name="dialog_title_cannot_check_password">لا يمكن التحقق من كلمة السر</string>
+  <string name="dialog_message_cannot_check_password">Briar لم يتمكن من التحقق من كلمة المرور. الرجاء إعادة تشغيل جهازك من أجل جل المشكلة</string>
   <string name="sign_in_button">تسجيل الدخول</string>
   <string name="forgotten_password">نسيتُ كلمة السر</string>
   <string name="dialog_title_lost_password">فقدت كلمة السر</string>
@@ -64,12 +65,36 @@
   <string name="lock_button">قفل التطبيق</string>
   <string name="settings_button">الإعدادات</string>
   <string name="sign_out_button">تسجيل الخروج</string>
+  <string name="transports_onboarding_text">إلمس هنا من أجل التحكم بطريقةالربط مع جهات الاتصال.</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>
+  <string name="tor_plugin_status_inactive">Briar لم يتمكن من  الاتصال بالانترنت </string>
+  <string name="tor_plugin_status_disabled">إعدادات Briar لاتسمح بالاتصال بالانترنت</string>
+  <string name="tor_plugin_status_disabled_mobile_data">إعدادات Briar لاتسمح بالاتصال عن طريق بيانات الهاتف</string>
+  <string name="tor_plugin_status_disabled_battery">إعدادات Briar لاتسمح بالاتصال بالانترنت عند استخدام بطارية الهاتف</string>
+  <string name="tor_plugin_status_disabled_country_blocked">لايمكن استخدام Briar في هذا البلد</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">واي-فاي</string>
+  <string name="transport_lan_long">نفس شبكة الWi-Fi </string>
+  <string name="lan_device_status_on">جهازك متصل بشبكة الWi-Fi</string>
+  <string name="lan_device_status_off">جهازك ليس متصل بشبكة الWi-Fi</string>
+  <string name="lan_plugin_status_enabling">جاري ايصال Briar بشبكة الWi-Fi</string>
+  <string name="lan_plugin_status_active"> Briar متصل بشبكة الWi-Fi</string>
+  <string name="lan_plugin_status_inactive">لم يتمكن Briar من الاتصال بشبكة ال Wi-Fi</string>
+  <string name="lan_plugin_status_disabled">إعدادات Briar لاتسمح بالاتصال بشبكة ال Wi-Fi</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">بلوتوث</string>
+  <string name="bt_device_status_on"> البلوتوث مفعّل  </string>
+  <string name="bt_device_status_off">البلوتوث مفعّل</string>
+  <string name="bt_plugin_status_enabling">جاري اتصال Briar بالبلوتوث</string>
+  <string name="bt_plugin_status_active">Briar متصل بالبلوتوث</string>
+  <string name="bt_plugin_status_inactive">لم يتمكن Briar من الاتصال بالانترنت</string>
+  <string name="bt_plugin_status_disabled">إعدادات Briar لاتسمح بالاتصال بالبلوتوث</string>
   <!--Notifications-->
   <string name="reminder_notification_title">تم تسجيل الخروج من Briar (براير)</string>
   <string name="reminder_notification_text">الرجاء اللمس لإعادة الدخول</string>
@@ -459,6 +484,8 @@
   <string name="tor_enable_summary">كل جهات الاتصال تمر عبر شبكة تور من أجل الخصوصية</string>
   <string name="tor_network_setting">وسيلة الاتصال لشبكة تور</string>
   <string name="tor_network_setting_automatic">تلقائيًا حسب الموقع</string>
+  <string name="tor_network_setting_without_bridges">استخدام شبكة تور من دون جسور</string>
+  <string name="tor_network_setting_with_bridges">استخدام شبكة تور مع جسور</string>
   <string name="tor_network_setting_never">لا يمكن الاتصال بالإنترنت</string>
   <!--How and when Briar will connect to Tor: E.g. "Don't connect to the Internet (in China)" or "Use Tor network with bridges (in Belarus)"-->
   <string name="tor_network_setting_summary">تلقائيا: %1$s (في %2$s)</string>
@@ -574,6 +601,7 @@
   <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-fr/strings.xml

@@ -31,7 +31,7 @@
   <string name="sign_in_button">Connexion</string>
   <string name="forgotten_password">J’ai oublié mon mot de passe</string>
   <string name="dialog_title_lost_password">Mot de passe oublié</string>
-  <string name="dialog_message_lost_password">Votre compte Briar est enregistré chiffré sur votre appareil, pas dans le nuage, et nous ne pouvons donc pas réinitialiser votre mot de passe. Souhaitez-vous supprimer votre compte et recommencer ?\n\nAttention : vos identités, contacts et messages seront perdus irrémédiablement.</string>
+  <string name="dialog_message_lost_password">Votre compte Briar est enregistré chiffré sur votre appareil, pas dans le nuage, et nous ne pouvons donc pas réinitialiser votre mot de passe. Voulez-vous supprimer votre compte et recommencer ?\n\nAttention : vos identités, contacts et messages seront perdus irrémédiablement.</string>
   <string name="startup_failed_notification_title">Impossible de démarrer Briar</string>
   <string name="startup_failed_notification_text">Toucher pour plus d’informations.</string>
   <string name="startup_failed_activity_title">Échec de démarrage de Briar</string>
@@ -143,7 +143,7 @@
   <string name="no_contacts_action">Touchez l’icône + pour ajouter un contact</string>
   <string name="date_no_private_messages">Aucun message.</string>
   <string name="no_private_messages">Aucun message à afficher</string>
-  <string name="message_hint">Rédiger le message</string>
+  <string name="message_hint">Rédigez un message</string>
   <string name="image_caption_hint">Ajouter une légende (facultatif)</string>
   <string name="image_attach">Joindre une image</string>
   <string name="image_attach_error">Impossible de joindre une ou des images</string>
@@ -154,7 +154,7 @@
   <string name="set_alias_button">Modifier</string>
   <string name="delete_all_messages">Supprimer tous les messages</string>
   <string name="dialog_title_delete_all_messages">Confirmer la suppression des messages</string>
-  <string name="dialog_message_delete_all_messages">Souhaitez-vous vraiment supprimer tous les messages ?</string>
+  <string name="dialog_message_delete_all_messages">Voulez-vous vraiment supprimer tous les messages ?</string>
   <string name="dialog_title_not_all_messages_deleted">Impossible de supprimer tous les messages</string>
   <string name="dialog_message_not_deleted_ongoing_both">Les messages relatifs aux invitations et présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
   <string name="dialog_message_not_deleted_ongoing_introductions">Les messages relatifs aux présentations en cours ne peuvent pas être supprimés jusqu’à leur conclusion.</string>
@@ -165,13 +165,13 @@
   <string name="dialog_message_not_deleted_not_all_selected_invitations">Pour supprimer une invitation, vous devez sélectionner la demande et la réponse.</string>
   <string name="delete_contact">Supprimer le contact</string>
   <string name="dialog_title_delete_contact">Confirmer la suppression du contact</string>
-  <string name="dialog_message_delete_contact">Souhaitez-vous vraiment supprimer ce contact et tous les messages associés ?</string>
+  <string name="dialog_message_delete_contact">Voulez-vous vraiment supprimer ce contact et tous les messages associés ?</string>
   <string name="contact_deleted_toast">Le contact a été supprimé</string>
   <!--This is shown in the action bar when opening an image in fullscreen that the user sent-->
   <string name="you">Vous</string>
   <string name="save_image">Enregistrer l’image</string>
   <string name="dialog_title_save_image">Enregistrer l’image ?</string>
-  <string name="dialog_message_save_image">L’enregistrement de cette image permettra aux autres applis d’y accéder.\n\n Souhaitez-vous vraiment l’enregistrer ?</string>
+  <string name="dialog_message_save_image">L’enregistrement de cette image permettra aux autres applis d’y accéder.\n\n Voulez-vous vraiment l’enregistrer ?</string>
   <string name="save_image_success">L’image a été enregistrée</string>
   <string name="save_image_error">Impossible d’enregistrer l’image</string>
   <string name="dialog_title_no_image_support">Les images ne sont pas disponibles</string>
@@ -198,9 +198,9 @@
   <string name="connection_error_explanation">Veuillez vérifier que vous êtes connecté au même réseau Wi-Fi.</string>
   <string name="connection_error_feedback">Si le problème persiste, veuillez nous <a href="feedback">envoyer une rétroaction</a> pour nous aider à améliorer l\'appli.</string>
   <!--Adding Contacts Remotely-->
-  <string name="add_contact_remotely_title_case">Ajouter un contact à distance</string>
+  <string name="add_contact_remotely_title_case">Ajouter un contact éloigné</string>
   <string name="add_contact_nearby_title">Ajouter un contact à proximité</string>
-  <string name="add_contact_remotely_title">Ajouter un contact à distance</string>
+  <string name="add_contact_remotely_title">Ajouter un contact éloigné</string>
   <string name="contact_link_intro">Saisissez ici le lien de votre contact</string>
   <string name="contact_link_hint">Lien de votre contact</string>
   <string name="paste_button">Coller</string>
@@ -266,7 +266,7 @@
   <string name="introduction_sent">Votre présentation a été envoyée.</string>
   <string name="introduction_error">Une erreur est survenue lors de la présentation.</string>
   <string name="introduction_request_sent">Vous avez demandé de présenter %1$s à %2$s.</string>
-  <string name="introduction_request_received">%1$s a demandé de vous présenter à %2$s. Souhaitez-vous ajouter %2$s à votre liste de contacts ?</string>
+  <string name="introduction_request_received">%1$s a demandé de vous présenter à %2$s. Voulez-vous ajouter %2$s à votre liste de contacts ?</string>
   <string name="introduction_request_exists_received">%1$s a demandé de vous présenter à %2$s, mais %2$s est déjà dans votre liste de contacts. Puisque %1$s pourrait ne pas le savoir, vous pouvez tout de même répondre :</string>
   <string name="introduction_request_answered_received">%1$s a demandé de vous présenter à %2$s.</string>
   <string name="introduction_response_accepted_sent">Vous avez accepté d’être présenté à %1$s.</string>
@@ -299,10 +299,10 @@
   <string name="groups_member_joined">%s s’est joint au groupe</string>
   <string name="groups_leave">Quitter le groupe</string>
   <string name="groups_leave_dialog_title">Confirmer la sortie du groupe</string>
-  <string name="groups_leave_dialog_message">Souhaitez-vous vraiment quitter ce groupe ?</string>
+  <string name="groups_leave_dialog_message">Voulez-vous vraiment quitter ce groupe ?</string>
   <string name="groups_dissolve">Dissoudre le groupe</string>
   <string name="groups_dissolve_dialog_title">Confirmer la dissolution du groupe</string>
-  <string name="groups_dissolve_dialog_message">Souhaitez-vous vraiment dissoudre ce groupe ?\n\nLes autres participants ne pourront pas poursuivre leur conversation et ne recevront peut-être pas les derniers messages.</string>
+  <string name="groups_dissolve_dialog_message">Voulez-vous vraiment dissoudre ce groupe ?\n\nLes autres participants ne pourront pas poursuivre leur conversation et ne recevront peut-être pas les derniers messages.</string>
   <string name="groups_dissolve_button">Dissoudre</string>
   <string name="groups_dissolved_dialog_title">Le groupe a été dissous</string>
   <string name="groups_dissolved_dialog_message">Le créateur de ce groupe l’a dissous.\n\nVous ne pouvez plus écrire de messages au groupe et ne recevrez peut-être pas tous ceux qui y ont été publiés.</string>
@@ -346,7 +346,7 @@
   <string name="btn_reply">Répondre</string>
   <string name="forum_leave">Quitter le forum</string>
   <string name="dialog_title_leave_forum">Confirmer la sortie du forum</string>
-  <string name="dialog_message_leave_forum">Souhaitez-vous vraiment quitter ce forum ?\n\nLes contacts avec qui vous l’avez partagé pourraient ne plus en recevoir les mises à jour.</string>
+  <string name="dialog_message_leave_forum">Voulez-vous vraiment quitter ce forum ?\n\nLes contacts avec qui vous l’avez partagé pourraient ne plus en recevoir les mises à jour.</string>
   <string name="dialog_button_leave">Quitter</string>
   <string name="forum_left_toast">À quitté le forum</string>
   <!--Forum Sharing-->
@@ -390,7 +390,7 @@
   <string name="blogs_feed_empty_state">Aucun billet à afficher</string>
   <string name="blogs_feed_empty_state_action">Les billets de vos contacts et les blogues auxquels vous vous abonnez apparaîtront ici.\n\nTouchez l’icône de crayon pour rédiger un billet</string>
   <string name="blogs_remove_blog">Supprimer le blogue</string>
-  <string name="blogs_remove_blog_dialog_message">Souhaitez-vous vraiment supprimer ce blogue ?\nLes billets seront supprimés de votre appareil mais pas des appareils d’autrui.\n\nLes contacts avec qui vous avez partagé ce blogue pourraient ne plus en recevoir les mises à jour.</string>
+  <string name="blogs_remove_blog_dialog_message">Voulez-vous vraiment supprimer ce blogue ?\nLes billets seront supprimés de votre appareil mais pas des appareils d’autrui.\n\nLes contacts avec qui vous avez partagé ce blogue pourraient ne plus en recevoir les mises à jour.</string>
   <string name="blogs_remove_blog_ok">Supprimer</string>
   <string name="blogs_blog_removed">Le blogue a été supprimé</string>
   <string name="blogs_reblog_comment_hint">Ajouter un commentaire (facultatif)</string>
@@ -420,7 +420,7 @@
   <string name="blogs_rss_feeds_manage_author">Auteur :</string>
   <string name="blogs_rss_feeds_manage_updated">Dernière mise à jour :</string>
   <string name="blogs_rss_remove_feed">Supprimer le fil</string>
-  <string name="blogs_rss_remove_feed_dialog_message">Souhaitez-vous vraiment supprimer ce fil ?\nLes billets seront supprimés de votre appareil mais pas des appareils d’autrui.\n\nLes contacts avec qui vous avez partagé ce fil pourraient ne plus en recevoir les mises à jour.</string>
+  <string name="blogs_rss_remove_feed_dialog_message">Voulez-vous vraiment supprimer ce fil ?\nLes billets seront supprimés de votre appareil mais pas des appareils d’autrui.\n\nLes contacts avec qui vous avez partagé ce fil pourraient ne plus en recevoir les mises à jour.</string>
   <string name="blogs_rss_remove_feed_ok">Supprimer</string>
   <string name="blogs_rss_feeds_manage_delete_error">Impossible de supprimer le fil !</string>
   <string name="blogs_rss_feeds_manage_empty_state">Aucun fil RSS à afficher\n\nTouchez l’icône + pour importer un fil</string>
@@ -484,7 +484,7 @@
   <string name="panic_app_setting_summary">Aucune appli n’a été définie</string>
   <string name="panic_app_setting_none">Aucune</string>
   <string name="dialog_title_connect_panic_app">Confirmer l’application d’urgence</string>
-  <string name="dialog_message_connect_panic_app">Souhaitez-vous vraiment autoriser %1$s à déclencher les actions destructrices du bouton d’urgence ?</string>
+  <string name="dialog_message_connect_panic_app">Voulez-vous vraiment autoriser %1$s à déclencher les actions destructrices du bouton d’urgence ?</string>
   <string name="panic_setting_destructive_action">Actions destructrices</string>
   <string name="panic_setting_signout_title">Déconnexion</string>
   <string name="panic_setting_signout_summary">Se déconnecter de Briar si l’on appuie sur un bouton d’urgence</string>

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

@@ -61,12 +61,36 @@
   <string name="lock_button">Bloquear App</string>
   <string name="settings_button">Axustes</string>
   <string name="sign_out_button">Finalizar sesión</string>
+  <string name="transports_onboarding_text">Toca aquí para controlar o xeito en que Briar conecta cos teus contactos.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">Internet</string>
+  <string name="tor_device_status_online_wifi">O teu móbil ten acceso a internet por Wi-Fi</string>
+  <string name="tor_device_status_online_mobile">O teu móbil ten acceso a internet por datos móbiles</string>
+  <string name="tor_device_status_offline">O teu móbil non ten acceso a internet</string>
+  <string name="tor_plugin_status_enabling">Briar estase conectando a internet</string>
+  <string name="tor_plugin_status_active">Briar está conectada a internet</string>
+  <string name="tor_plugin_status_inactive">Briar non pode conectarse a internet</string>
+  <string name="tor_plugin_status_disabled">Briar está configurada para non usar internet</string>
+  <string name="tor_plugin_status_disabled_mobile_data">Briar está configurada para non usar datos móbilies</string>
+  <string name="tor_plugin_status_disabled_battery">Briar está configurada para non usar internet se está usando batería</string>
+  <string name="tor_plugin_status_disabled_country_blocked">Briar está configurada para non usar internet neste país</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wi-Fi</string>
+  <string name="transport_lan_long">Mesma rede Wi-Fi</string>
+  <string name="lan_device_status_on">O móbil está conectado á Wi-Fi</string>
+  <string name="lan_device_status_off">O móbil non está conectado á Wi-Fi</string>
+  <string name="lan_plugin_status_enabling">Briar está conectando á rede Wi-Fi</string>
+  <string name="lan_plugin_status_active">Briar está conectada á rede Wi-Fi</string>
+  <string name="lan_plugin_status_inactive">Briar non pode conectar coa rede Wi-Fi</string>
+  <string name="lan_plugin_status_disabled">Briar está configurada para non usar a rede Wi-Fi</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
+  <string name="bt_device_status_on">O móbil ten o Bluetooth activado</string>
+  <string name="bt_device_status_off">O móbil ten o Bluetooth desactivado</string>
+  <string name="bt_plugin_status_enabling">Briar está conectando por Bluetooth</string>
+  <string name="bt_plugin_status_active">Briar está conectada ó Bluetooth</string>
+  <string name="bt_plugin_status_inactive">Briar non pode conectar por Bluetooth</string>
+  <string name="bt_plugin_status_disabled">Briar está configurada para non usar Bluetooth</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Desconectou de Briar</string>
   <string name="reminder_notification_text">Toque para voltar a conectar</string>
@@ -536,6 +560,7 @@
   <string name="lock_is_locked">Briar está bloqueada</string>
   <string name="lock_tap_to_unlock">Toque para desbloquear</string>
   <!--Connections Screen-->
+  <string name="transports_help_text">Briar pode conectar cos teus contactos a través de Internet, Wi-Fi ou Bluetooth.\n\nTodas as conexións a internet pasan a través da rede Tor para máis privacidade.\n\nSe un contacto é accesible de múltiples xeitos, Briar usaráos en paralelo.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Alice</string>

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

@@ -61,12 +61,36 @@
   <string name="lock_button">App zárolása</string>
   <string name="settings_button">Beállítások</string>
   <string name="sign_out_button">Kijelentkezés</string>
+  <string name="transports_onboarding_text">Érintse meg itt, hogy beállíthassa, hogyan csatlakozzon a Tor kapcsolataihoz.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">Internet</string>
+  <string name="tor_device_status_online_wifi">A telefonja Internet hozzáféréssel rendelkezik Wi-Fi-n keresztül</string>
+  <string name="tor_device_status_online_mobile">A telefonja Internet hozzáféréssel rendelkezik mobil hálózaton keresztül</string>
+  <string name="tor_device_status_offline">A telefonja nem rendelkezik Internet hozzáféréssel</string>
+  <string name="tor_plugin_status_enabling">A Briar csatlakozik az Internethez</string>
+  <string name="tor_plugin_status_active">A Briar csatlakoztatva az Internethez</string>
+  <string name="tor_plugin_status_inactive">A Briar nem tud csatlakozni az Internethez</string>
+  <string name="tor_plugin_status_disabled">A Briar Internet nélküli használatra van beállítva</string>
+  <string name="tor_plugin_status_disabled_mobile_data">A Briar mobil hálózat nélküli használatra van beállítva</string>
+  <string name="tor_plugin_status_disabled_battery">A Briar úgy van beállítva, hogy ne használjon Internetet, ha akkumulátorról megy a telefon</string>
+  <string name="tor_plugin_status_disabled_country_blocked">A Briar úgy van beállítva, hogy ne használjon Internetet ebben az országban</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wi-Fi</string>
+  <string name="transport_lan_long">Azonos Wi-Fi hálózat</string>
+  <string name="lan_device_status_on">A telefonja Wi-Fi-hez csatlakoztatott.</string>
+  <string name="lan_device_status_off">A telefonja Wi-Fi-hez nem csatlakoztatott.</string>
+  <string name="lan_plugin_status_enabling">A Briar csatlakozik a Wi-Fi hálózathoz</string>
+  <string name="lan_plugin_status_active">A Briar csatlakoztatva a Wi-Fi hálózathoz</string>
+  <string name="lan_plugin_status_inactive">A Briar nem tud csatlakozni a Wi-Fi hálózathoz</string>
+  <string name="lan_plugin_status_disabled">A Briar Wi-Fi nélküli használatra van beállítva</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
+  <string name="bt_device_status_on">A telefonja Bluetooth-ja bekapcsolva</string>
+  <string name="bt_device_status_off">A telefonja Bluetooth-ja kikapcsolva</string>
+  <string name="bt_plugin_status_enabling">A Briar csatlakozik a Bluetooth-hoz</string>
+  <string name="bt_plugin_status_active">A Briar csatlakoztatva a Bluetooth-hoz</string>
+  <string name="bt_plugin_status_inactive">A Briar nem tud csatlakozni a Bluetooth-hoz</string>
+  <string name="bt_plugin_status_disabled">A Briar Bluetooth nélküli használatra van beállítva</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Kilépve a Briar-ból</string>
   <string name="reminder_notification_text">Érintse meg az újra belépéshez.</string>
@@ -421,10 +445,19 @@ Kapcsolatai, akivel megosztotta ezt a blogot, lehet nem kapnak többé frissít
   <string name="pref_theme_system">Rendszer alapértelmezett</string>
   <!--Settings Connections-->
   <string name="network_settings_title">Kapcsolatok</string>
+  <string name="bluetooth_setting">Csatlakozás a kapcsolatokhoz Bluetooth-on</string>
+  <string name="wifi_setting">Csatlakozás az egy Wi-Fi hálózaton lévő kapcsolatokhoz</string>
+  <string name="tor_enable_title">Csatlakozás a kapcsolatokhoz Interneten</string>
+  <string name="tor_enable_summary">Minden kapcsolat átmegy a Tor hálózaton az adatvédelem érdekében</string>
+  <string name="tor_network_setting">Kapcsolódási mód a Tor hálózathoz</string>
   <string name="tor_network_setting_automatic">Automatikusan hely alapján</string>
+  <string name="tor_network_setting_without_bridges">Tor hálózat használata hidak nélkül</string>
+  <string name="tor_network_setting_with_bridges">Tor hálózat használata hidakkal</string>
+  <string name="tor_network_setting_never">Ne csatlakozzon az internethez</string>
   <!--How and when Briar will connect to Tor: E.g. "Don't connect to the Internet (in China)" or "Use Tor network with bridges (in Belarus)"-->
   <string name="tor_network_setting_summary">Automatikus: %1$s ( %2$s)</string>
   <string name="tor_mobile_data_title">Mobil adat használata</string>
+  <string name="tor_only_when_charging_title">Csatlakozás az internethez csak töltés alatt</string>
   <string name="tor_only_when_charging_summary">Letiltja az internet kapcsolatot, amikor elemről fut az eszköz</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Biztonság</string>
@@ -536,6 +569,7 @@ Vigyázat: Ez végleg törli az identitásait, kapcsolatait és üzeneteit</stri
   <string name="lock_is_locked">A Briar zárolt</string>
   <string name="lock_tap_to_unlock">Érintse meg a zárolás feloldásához</string>
   <!--Connections Screen-->
+  <string name="transports_help_text">A Briar Interneten, Wi-Fi-n vagy Bluetooth-on keresztül csatlakozhat kapcsolataihoz.\n\nAz összes internetkapcsolat a Tor hálózaton megy keresztül megy az adatvédelem érdekében.\n\nHa egy kapcsolatot több módszerrel is el lehet érni, Briar párhuzamosan használja azokat.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Alice</string>

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

@@ -456,9 +456,9 @@
   <string name="pref_lock_title">Forritslæsing</string>
   <string name="pref_lock_summary">Notaðu skjálæsingu tækisins til að vernda Briar á meðan þú ert skráð/ur inn</string>
   <string name="pref_lock_disabled_summary">Til að nota þetta þarftu að setja upp skjálæsingu fyrir tækið þitt</string>
-  <string name="pref_lock_timeout_title">Tímamörk forritslæsingar við aðgerðaleysi</string>
+  <string name="pref_lock_timeout_title">Tímamörk læsingar forrits við aðgerðaleysi</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
-  <string name="pref_lock_timeout_summary">Þehar ekki er verið að nota Briar, læsa því sjálfvirkt eftir %s</string>
+  <string name="pref_lock_timeout_summary">Þegar ekki er verið að nota Briar, læsa því sjálfvirkt eftir %s</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
   <string name="pref_lock_timeout_1">1 mínúta</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->

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

@@ -61,12 +61,36 @@
   <string name="lock_button">Lås appen</string>
   <string name="settings_button">Inställningar</string>
   <string name="sign_out_button">Logga ut</string>
+  <string name="transports_onboarding_text">Klicka här för att styra hur Briar ansluter till dina kontakter.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">Internet</string>
+  <string name="tor_device_status_online_wifi">Din telefon har internetåtkomst via Wi-Fi</string>
+  <string name="tor_device_status_online_mobile">Din telefon har internetåtkomst via mobildata</string>
+  <string name="tor_device_status_offline">Din telefon har inte internetåtkomst</string>
+  <string name="tor_plugin_status_enabling">Briar ansluter till internet</string>
+  <string name="tor_plugin_status_active">Briar är anslutet till internet</string>
+  <string name="tor_plugin_status_inactive">Briar kan inte ansluta till internet</string>
+  <string name="tor_plugin_status_disabled">Briar är inte konfigurerat för att använda internet</string>
+  <string name="tor_plugin_status_disabled_mobile_data">Briar är konfigurerat så att de inte använder mobildata</string>
+  <string name="tor_plugin_status_disabled_battery">Briar är konfigurerat att inte använda internet vid batterianvändning</string>
+  <string name="tor_plugin_status_disabled_country_blocked">Briar är konfigurerat att inte använda internet i detta landet</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wi-Fi</string>
+  <string name="transport_lan_long">Samma Wi-Fi-nätverk</string>
+  <string name="lan_device_status_on">Din telefon är ansluten till Wi-Fi</string>
+  <string name="lan_device_status_off">Din telefon är inte ansluten till Wi-Fi</string>
+  <string name="lan_plugin_status_enabling">Briar ansluter till Wi-Fi-nätverket</string>
+  <string name="lan_plugin_status_active">Briar är anslutet till Wi-Fi nätverket</string>
+  <string name="lan_plugin_status_inactive">Briar kan inte ansluta till Wi-Fi-nätverket</string>
+  <string name="lan_plugin_status_disabled">Briar är konfigurerat för att inte använda Wi-Fi-nätverket</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
+  <string name="bt_device_status_on">Din telefons Bluetooth är aktiverad</string>
+  <string name="bt_device_status_off">Din telefons Bluetooth är inaktiverad</string>
+  <string name="bt_plugin_status_enabling">Briar ansluter till Bluetooth</string>
+  <string name="bt_plugin_status_active">Briar är ansluten till Bluetooth</string>
+  <string name="bt_plugin_status_inactive">Briar kan inte ansluta till Bluetooth</string>
+  <string name="bt_plugin_status_disabled">Briar är konfigurerat för att inte använda Bluetooth</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Utloggad från Briar</string>
   <string name="reminder_notification_text">Tryck för att logga in igen.</string>
@@ -412,10 +436,20 @@
   <string name="pref_theme_auto">Automatisk (dagtid)</string>
   <string name="pref_theme_system">Systemets förval</string>
   <!--Settings Connections-->
+  <string name="network_settings_title">Anslutningar</string>
+  <string name="bluetooth_setting">Anslut till kontakter via Bluetooth</string>
+  <string name="wifi_setting">Anslut till kontakter på samma Wi-Fi-nätverk</string>
+  <string name="tor_enable_title">Anslut till kontakter via internet</string>
+  <string name="tor_enable_summary">Alla anslutningar gå via Tor-nätverket av integritetsskäl</string>
+  <string name="tor_network_setting">Anslutningsmetod för Tor-nätverket</string>
   <string name="tor_network_setting_automatic">Automatisk, baserad på position</string>
+  <string name="tor_network_setting_without_bridges">Använd Tor-nätverket utan bryggor</string>
+  <string name="tor_network_setting_with_bridges">Anvädn Tor-nätverket med bryggor</string>
+  <string name="tor_network_setting_never">Anslut inte till internet</string>
   <!--How and when Briar will connect to Tor: E.g. "Don't connect to the Internet (in China)" or "Use Tor network with bridges (in Belarus)"-->
   <string name="tor_network_setting_summary">Automatisk: %1$s (i %2$s)</string>
   <string name="tor_mobile_data_title">Använd mobildata</string>
+  <string name="tor_only_when_charging_title">Anslut till internet endast vid laddning</string>
   <string name="tor_only_when_charging_summary">Avaktiverar anslutning över Internet när enheten går på batteri</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Säkerhet</string>
@@ -526,6 +560,7 @@
   <string name="lock_is_locked">Briar är låst</string>
   <string name="lock_tap_to_unlock">Tryck för att låsa upp</string>
   <!--Connections Screen-->
+  <string name="transports_help_text">Briar kan ansluta till dina kontakter via internet, Wi-Fi eller Bluetooth.\n\nAlla internetanslutningar går via Tor-nätverket av integritetsskäl.\n\nOm en kontakt kan nås via flera metoder kommer Briar att använda dem parallellt.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Alice</string>

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

@@ -61,12 +61,36 @@
   <string name="lock_button">Uygulamayı Kilitle</string>
   <string name="settings_button">Ayarlar</string>
   <string name="sign_out_button">Oturumu Kapat</string>
+  <string name="transports_onboarding_text">Briar\'ın kişilerinizle nasıl bağlanacağını kontrol etmek için buraya tıklayın</string>
   <!--Transports: Tor-->
   <string name="transport_tor">İnternet</string>
+  <string name="tor_device_status_online_wifi">Telefonunuzun Wi-Fi aracılığıyla İnternet erişimi var</string>
+  <string name="tor_device_status_online_mobile">Telefonunuzun mobil veri aracılığıyla İnternet erişimi var</string>
+  <string name="tor_device_status_offline">Telefonunuzun İnternet erişimi yok</string>
+  <string name="tor_plugin_status_enabling">Briar İnternet\'e bağlanıyor</string>
+  <string name="tor_plugin_status_active">Briar İnternet\'e bağlandı</string>
+  <string name="tor_plugin_status_inactive">Briar İnternet\'e bağlanamıyor</string>
+  <string name="tor_plugin_status_disabled">Briar İnternet kullanmamak üzere yapılandırılmış</string>
+  <string name="tor_plugin_status_disabled_mobile_data">Briar mobil veri kullanmamak üzere yapılandırılmış</string>
+  <string name="tor_plugin_status_disabled_battery">Briar pille çalışırken İnternet kullanmamak üzere yapılandırılmış</string>
+  <string name="tor_plugin_status_disabled_country_blocked">Briar bu ülkede İnternet kullanmamak üzere yapılandırılmış</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wi-Fi</string>
+  <string name="transport_lan_long">Aynı Wi-Fi Ağı</string>
+  <string name="lan_device_status_on">Telefonunuz Wi-Fi\'ye bağlı</string>
+  <string name="lan_device_status_off">Telefonunuz Wi-Fi\'ye bağlı değil</string>
+  <string name="lan_plugin_status_enabling">Briar Wi-Fi ağına bağlanıyor</string>
+  <string name="lan_plugin_status_active">Briar Wi-Fi ağına bağlandı</string>
+  <string name="lan_plugin_status_inactive">Briar Wi-Fi ağına bağlanamıyor</string>
+  <string name="lan_plugin_status_disabled">Briar Wi-Fi ağını kullanmamak üzere yapılandırılmış</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
+  <string name="bt_device_status_on">Telefonunuzun Bluetooth\'u açık</string>
+  <string name="bt_device_status_off">Telefonunuzun Bluetooth\'u kapalı</string>
+  <string name="bt_plugin_status_enabling">Briar Bluetooth\'a bağlanıyor</string>
+  <string name="bt_plugin_status_active">Briar Bluetooth\'a bağlandı</string>
+  <string name="bt_plugin_status_inactive">Briar Bluetooth\'a bağlanamıyor</string>
+  <string name="bt_plugin_status_disabled">Briar Bluetooth kullanmamak üzere yapılandırılmış</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Briar oturumu kapatıldı</string>
   <string name="reminder_notification_text">Tekrar oturum açmak için dokunun</string>
@@ -536,6 +560,7 @@
   <string name="lock_is_locked">Briar kilitli</string>
   <string name="lock_tap_to_unlock">Kilidi açmak için dokunun</string>
   <!--Connections Screen-->
+  <string name="transports_help_text">Briar kişilerinizle İnternet, Wi-Fi veya Bluetooth ile bağlanabilir.\n\nBütün İnternet bağlantıları gizliliğiniz için Tor Ağı üzerinden yapılıyor.\n\nEğer bir kişiniz birçok yöntemle erişilebiliyorsa, Briar bu yöntemleri paralel olarak kullanır.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Alice</string>

briar-headless/README.md

@@ -69,7 +69,8 @@ Returns a JSON array of contacts:
     "handshakePublicKey": "XnYRd7a7E4CTqgAvh4hCxh/YZ0EPscxknB9ZcEOpSzY=",
     "verified": true,
     "lastChatActivity": 1557838312175,
-    "connected": false
+    "connected": false,
+    "unreadCount": 7
 }
 ```
 
@@ -182,6 +183,18 @@ Note that it's also possible to add contacts nearby via Bluetooth/Wifi or
 introductions. In these cases contacts omit the `pendingContact` state and
 directly become `contact`s.
 
+### Changing alias of a contact
+
+`PUT /v1/contacts/{contactId}/alias`
+
+The alias should be posted as a JSON object:
+
+```json
+{
+    "alias": "A nickname for the new contact"
+}
+```
+
 ### Removing a contact
 
 `DELETE /v1/contacts/{contactId}`
@@ -233,6 +246,25 @@ The text of the message should be posted as JSON:
 }
 ```
 
+### Marking private messages as read
+
+`POST /v1/messages/{contactId}/read`
+
+The `messageId` of the message to be marked as read
+needs to be provided in the request body as follows:
+
+```json
+{
+    "messageId": "+AIMMgOCPFF8HDEhiEHYjbfKrg7v0G94inKxjvjYzA8="
+}
+```
+
+### Deleting all private messages
+
+`DELETE /v1/messages/{contactId}/all`
+
+It returns with a status code `200`, if removal was successful.
+
 ### Listing blog posts
 
 `GET /v1/blogs/posts`
@@ -409,3 +441,39 @@ When the last connection is lost (the contact goes offline), it sends a `Contact
     "type": "event"
 }
 ```
+
+### A message was sent
+
+When Briar sent a message to a contact, it sends a `MessagesSentEvent`. This is indicated in Briar
+by showing one tick next to the message.
+
+```json
+{
+    "data": {
+        "contactId": 1,
+        "messageIds": [
+            "+AIMMgOCPFF8HDEhiEHYjbfKrg7v0G94inKxjvjYzA8="
+        ]
+    },
+    "name": "MessagesSentEvent",
+    "type": "event"
+}
+```
+
+### A message was acknowledged
+
+When a contact acknowledges that they received a message, Briar sends a `MessagesAckedEvent`.
+This is indicated in Briar by showing two ticks next to the message.
+
+```json
+{
+    "data": {
+        "contactId": 1,
+        "messageIds": [
+            "+AIMMgOCPFF8HDEhiEHYjbfKrg7v0G94inKxjvjYzA8="
+        ]
+    },
+    "name": "MessagesAckedEvent",
+    "type": "event"
+}
+```

briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt

@@ -81,11 +81,20 @@ constructor(
                     path("/:contactId") {
                         delete { ctx -> contactController.delete(ctx) }
                     }
+                    path("/:contactId/alias") {
+                        put { ctx -> contactController.setContactAlias(ctx) }
+                    }
                 }
                 path("/messages/:contactId") {
                     get { ctx -> messagingController.list(ctx) }
                     post { ctx -> messagingController.write(ctx) }
                 }
+                path("/messages/:contactId/read") {
+                    post { ctx -> messagingController.markMessageRead(ctx) }
+                }
+                path("/messages/:contactId/all") {
+                    delete { ctx -> messagingController.deleteAllMessages(ctx) }
+                }
                 path("/forums") {
                     get { ctx -> forumController.list(ctx) }
                     post { ctx -> forumController.create(ctx) }

briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactController.kt

@@ -9,6 +9,7 @@ interface ContactController {
     fun addPendingContact(ctx: Context): Context
     fun listPendingContacts(ctx: Context): Context
     fun removePendingContact(ctx: Context): Context
+    fun setContactAlias(ctx: Context): Context
     fun delete(ctx: Context): Context
 
 }

briar-headless/src/main/java/org/briarproject/briar/headless/contact/ContactControllerImpl.kt

@@ -77,7 +77,8 @@ constructor(
         val contacts = contactManager.contacts.map { contact ->
             val latestMsgTime = conversationManager.getGroupCount(contact.id).latestMsgTime
             val connected = connectionRegistry.isConnected(contact.id)
-            contact.output(latestMsgTime, connected)
+            val unreadCount = conversationManager.getGroupCount(contact.id).unreadCount
+            contact.output(latestMsgTime, connected, unreadCount)
         }
         return ctx.json(contacts)
     }
@@ -91,9 +92,7 @@ constructor(
         val link = ctx.getFromJson(objectMapper, "link")
         val alias = ctx.getFromJson(objectMapper, "alias")
         if (!LINK_REGEX.matcher(link).find()) throw BadRequestResponse("Invalid Link")
-        val aliasUtf8 = toUtf8(alias)
-        if (aliasUtf8.isEmpty() || aliasUtf8.size > MAX_AUTHOR_NAME_LENGTH)
-            throw BadRequestResponse("Invalid Alias")
+        checkAliasLength(alias)
         val pendingContact = contactManager.addPendingContact(link, alias)
         return ctx.json(pendingContact.output())
     }
@@ -124,6 +123,18 @@ constructor(
         return ctx
     }
 
+    override fun setContactAlias(ctx: Context): Context {
+        val contactId = ctx.getContactIdFromPathParam()
+        val alias = ctx.getFromJson(objectMapper, "alias")
+        checkAliasLength(alias)
+        try {
+            contactManager.setContactAlias(contactId, alias)
+        } catch (e: NoSuchContactException) {
+            throw NotFoundResponse()
+        }
+        return ctx
+    }
+
     override fun delete(ctx: Context): Context {
         val contactId = ctx.getContactIdFromPathParam()
         try {
@@ -134,4 +145,10 @@ constructor(
         return ctx
     }
 
+    private fun checkAliasLength(alias: String) {
+        val aliasUtf8 = toUtf8(alias)
+        if (aliasUtf8.isEmpty() || aliasUtf8.size > MAX_AUTHOR_NAME_LENGTH)
+            throw BadRequestResponse("Invalid Alias")
+    }
+
 }

briar-headless/src/main/java/org/briarproject/briar/headless/contact/OutputContact.kt

@@ -7,12 +7,13 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent
 import org.briarproject.bramble.identity.output
 import org.briarproject.briar.headless.json.JsonDict
 
-internal fun Contact.output(latestMsgTime: Long, connected: Boolean) = JsonDict(
+internal fun Contact.output(latestMsgTime: Long, connected: Boolean, unreadCount: Int) = JsonDict(
     "contactId" to id.int,
     "author" to author.output(),
     "verified" to isVerified,
     "lastChatActivity" to latestMsgTime,
-    "connected" to connected
+    "connected" to connected,
+    "unreadCount" to unreadCount
 ).apply {
     alias?.let { put("alias", it) }
     handshakePublicKey?.let { put("handshakePublicKey", it.encoded) }

briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingController.kt

@@ -8,4 +8,8 @@ interface MessagingController {
 
     fun write(ctx: Context): Context
 
+    fun markMessageRead(ctx: Context): Context
+
+    fun deleteAllMessages(ctx: Context): Context
+
 }

briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt

@@ -11,6 +11,9 @@ import org.briarproject.bramble.api.db.DatabaseExecutor
 import org.briarproject.bramble.api.db.NoSuchContactException
 import org.briarproject.bramble.api.event.Event
 import org.briarproject.bramble.api.event.EventListener
+import org.briarproject.bramble.api.sync.event.MessagesAckedEvent
+import org.briarproject.bramble.api.sync.event.MessagesSentEvent
+import org.briarproject.bramble.api.sync.MessageId
 import org.briarproject.bramble.api.system.Clock
 import org.briarproject.bramble.util.StringUtils.utf8IsTooLong
 import org.briarproject.briar.api.blog.BlogInvitationRequest
@@ -33,12 +36,16 @@ import org.briarproject.briar.headless.event.output
 import org.briarproject.briar.headless.getContactIdFromPathParam
 import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
+import org.spongycastle.util.encoders.Base64
+import org.spongycastle.util.encoders.DecoderException
 import java.util.concurrent.Executor
 import javax.annotation.concurrent.Immutable
 import javax.inject.Inject
 import javax.inject.Singleton
 
 internal const val EVENT_CONVERSATION_MESSAGE = "ConversationMessageReceivedEvent"
+internal const val EVENT_MESSAGES_ACKED = "MessagesAckedEvent"
+internal const val EVENT_MESSAGES_SENT = "MessagesSentEvent"
 
 @Immutable
 @Singleton
@@ -79,6 +86,36 @@ constructor(
         return ctx.json(m.output(contact.id, text))
     }
 
+    override fun markMessageRead(ctx: Context): Context {
+        val contact = getContact(ctx)
+        val groupId = messagingManager.getContactGroup(contact).id
+
+        val messageIdString = ctx.getFromJson(objectMapper, "messageId")
+        val messageId = deserializeMessageId(messageIdString)
+        messagingManager.setReadFlag(groupId, messageId, true)
+        return ctx.json(messageIdString)
+    }
+
+    private fun deserializeMessageId(idString: String): MessageId {
+        val idBytes = try {
+            Base64.decode(idString)
+        } catch (e: DecoderException) {
+            throw NotFoundResponse()
+        }
+        if (idBytes.size != MessageId.LENGTH) throw NotFoundResponse()
+        return MessageId(idBytes)
+    }
+
+    override fun deleteAllMessages(ctx: Context): Context {
+        val contactId = ctx.getContactIdFromPathParam()
+        try {
+            val result = conversationManager.deleteAllMessages(contactId)
+            return ctx.json(result.output())
+        } catch (e: NoSuchContactException) {
+            throw NotFoundResponse()
+        }
+    }
+
     override fun eventOccurred(e: Event) {
         when (e) {
             is ConversationMessageReceivedEvent<*> -> {
@@ -90,6 +127,12 @@ constructor(
                     webSocketController.sendEvent(EVENT_CONVERSATION_MESSAGE, e.output())
                 }
             }
+            is MessagesSentEvent -> {
+                webSocketController.sendEvent(EVENT_MESSAGES_SENT, e.output())
+            }
+            is MessagesAckedEvent -> {
+                webSocketController.sendEvent(EVENT_MESSAGES_ACKED, e.output())
+            }
         }
     }
 

briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputConversationMessage.kt

@@ -1,7 +1,11 @@
 package org.briarproject.briar.headless.messaging
 
 import org.briarproject.bramble.api.contact.ContactId
+import org.briarproject.bramble.api.sync.MessageId
+import org.briarproject.bramble.api.sync.event.MessagesAckedEvent
+import org.briarproject.bramble.api.sync.event.MessagesSentEvent
 import org.briarproject.briar.api.conversation.ConversationMessageHeader
+import org.briarproject.briar.api.conversation.DeletionResult
 import org.briarproject.briar.api.messaging.PrivateMessage
 import org.briarproject.briar.api.messaging.PrivateMessageHeader
 import org.briarproject.briar.headless.json.JsonDict
@@ -43,3 +47,24 @@ internal fun PrivateMessage.output(contactId: ContactId, text: String) = JsonDic
     "groupId" to message.groupId.bytes,
     "text" to text
 )
+
+internal fun DeletionResult.output() = JsonDict(
+    "allDeleted" to allDeleted(),
+    "hasIntroductionSessionInProgress" to hasIntroductionSessionInProgress(),
+    "hasInvitationSessionInProgress" to hasInvitationSessionInProgress(),
+    "hasNotAllIntroductionSelected" to hasNotAllIntroductionSelected(),
+    "hasNotAllInvitationSelected" to hasNotAllInvitationSelected(),
+    "hasNotFullyDownloaded" to hasNotFullyDownloaded()
+)
+
+internal fun MessagesAckedEvent.output() = JsonDict(
+    "contactId" to contactId.int,
+    "messageIds" to messageIds.toJson()
+)
+
+internal fun MessagesSentEvent.output() = JsonDict(
+    "contactId" to contactId.int,
+    "messageIds" to messageIds.toJson()
+)
+
+internal fun Collection<MessageId>.toJson() = map { it.bytes }

briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt

@@ -46,6 +46,7 @@ abstract class ControllerTest {
     protected val message: Message = getMessage(group.id)
     protected val text: String = getRandomString(5)
     protected val timestamp = 42L
+    protected val unreadCount = 42
 
     protected fun assertJsonEquals(json: String, obj: Any) {
         assertEquals(json, outputCtx.json(obj).resultString(), STRICT)

briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt

@@ -6,6 +6,7 @@ import io.javalin.plugin.json.JavalinJson.toJson
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
+import io.mockk.mockkStatic
 import io.mockk.runs
 import org.briarproject.bramble.api.Pair
 import org.briarproject.bramble.api.contact.Contact
@@ -27,6 +28,7 @@ import org.briarproject.bramble.test.TestUtils.getPendingContact
 import org.briarproject.bramble.test.TestUtils.getRandomBytes
 import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.headless.ControllerTest
+import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertThrows
@@ -58,7 +60,8 @@ internal class ContactControllerTest : ControllerTest() {
         every { contactManager.contacts } returns listOf(contact)
         every { conversationManager.getGroupCount(contact.id).latestMsgTime } returns timestamp
         every { connectionRegistry.isConnected(contact.id) } returns connected
-        every { ctx.json(listOf(contact.output(timestamp, connected))) } returns ctx
+        every { conversationManager.getGroupCount(contact.id).unreadCount } returns unreadCount
+        every { ctx.json(listOf(contact.output(timestamp, connected, unreadCount))) } returns ctx
         controller.list(ctx)
     }
 
@@ -193,6 +196,66 @@ internal class ContactControllerTest : ControllerTest() {
         }
     }
 
+    @Test
+    fun testSetContactAlias() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "1"
+        every { ctx.getFromJson(objectMapper, "alias") } returns "foo"
+        every { contactManager.setContactAlias(ContactId(1), "foo") } just Runs
+        controller.setContactAlias(ctx)
+    }
+
+    @Test
+    fun testSetContactAliasInvalidId() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "foo"
+        every { ctx.getFromJson(objectMapper, "alias") } returns "bar"
+        assertThrows(NotFoundResponse::class.java) {
+            controller.setContactAlias(ctx)
+        }
+    }
+
+    @Test
+    fun testSetContactAliasNonexistentId() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "1"
+        every { ctx.getFromJson(objectMapper, "alias") } returns "foo"
+        every { contactManager.setContactAlias(ContactId(1), "foo") } throws NotFoundResponse()
+        assertThrows(NotFoundResponse::class.java) {
+            controller.setContactAlias(ctx)
+        }
+    }
+
+    @Test
+    fun testSetContactAliasInvalid() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "1"
+        every { ctx.getFromJson(objectMapper, "alias") } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
+        assertThrows(BadRequestResponse::class.java) {
+            controller.setContactAlias(ctx)
+        }
+    }
+
+    @Test
+    fun testSetContactAliasEmpty() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "1"
+        every { ctx.getFromJson(objectMapper, "alias") } returns ""
+        assertThrows(BadRequestResponse::class.java) {
+            controller.setContactAlias(ctx)
+        }
+    }
+
+    @Test
+    fun testSetContactAliasMissing() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        every { ctx.pathParam("contactId") } returns "1"
+        every { ctx.body() } returns ""
+        assertThrows(BadRequestResponse::class.java) {
+            controller.setContactAlias(ctx)
+        }
+    }
+
     @Test
     fun testDelete() {
         every { ctx.pathParam("contactId") } returns "1"
@@ -313,10 +376,11 @@ internal class ContactControllerTest : ControllerTest() {
                 "handshakePublicKey": ${toJson(contact.handshakePublicKey!!.encoded)},
                 "verified": ${contact.isVerified},
                 "lastChatActivity": $timestamp,
-                "connected": $connected
+                "connected": $connected,
+                "unreadCount": $unreadCount
             }
         """
-        assertJsonEquals(json, contact.output(timestamp, connected))
+        assertJsonEquals(json, contact.output(timestamp, connected, unreadCount))
     }
 
     @Test

briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt

@@ -10,11 +10,14 @@ import org.briarproject.bramble.api.db.NoSuchContactException
 import org.briarproject.bramble.api.identity.AuthorInfo
 import org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED
 import org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED
+import org.briarproject.bramble.api.sync.MessageId
+import org.briarproject.bramble.api.sync.event.MessagesAckedEvent
+import org.briarproject.bramble.api.sync.event.MessagesSentEvent
 import org.briarproject.bramble.test.ImmediateExecutor
 import org.briarproject.bramble.test.TestUtils.getRandomId
 import org.briarproject.bramble.util.StringUtils.getRandomString
 import org.briarproject.briar.api.client.SessionId
-import org.briarproject.briar.api.conversation.ConversationManager
+import org.briarproject.briar.api.conversation.DeletionResult
 import org.briarproject.briar.api.introduction.IntroductionRequest
 import org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH
 import org.briarproject.briar.api.messaging.MessagingManager
@@ -24,10 +27,13 @@ import org.briarproject.briar.api.messaging.PrivateMessageHeader
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent
 import org.briarproject.briar.headless.ControllerTest
 import org.briarproject.briar.headless.event.output
+import org.briarproject.briar.headless.getFromJson
 import org.briarproject.briar.headless.json.JsonDict
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
+import org.spongycastle.util.encoders.Base64
+import kotlin.random.Random
 
 internal class MessagingControllerImplTest : ControllerTest() {
 
@@ -100,6 +106,40 @@ internal class MessagingControllerImplTest : ControllerTest() {
         testInvalidContactId { controller.list(ctx) }
     }
 
+    @Test
+    fun testMessagesAckedEvent() {
+        val messageId1 = MessageId(getRandomId())
+        val messageId2 = MessageId(getRandomId())
+        val messageIds = listOf(messageId1, messageId2)
+        val event = MessagesAckedEvent(contact.id, messageIds)
+
+        every {
+            webSocketController.sendEvent(
+                EVENT_MESSAGES_ACKED,
+                event.output()
+            )
+        } just runs
+
+        controller.eventOccurred(event)
+    }
+
+    @Test
+    fun testMessagesSentEvent() {
+        val messageId1 = MessageId(getRandomId())
+        val messageId2 = MessageId(getRandomId())
+        val messageIds = listOf(messageId1, messageId2)
+        val event = MessagesSentEvent(contact.id, messageIds)
+
+        every {
+            webSocketController.sendEvent(
+                EVENT_MESSAGES_SENT,
+                event.output()
+            )
+        } just runs
+
+        controller.eventOccurred(event)
+    }
+
     @Test
     fun listNonexistentContactId() {
         testNonexistentContactId { controller.list(ctx) }
@@ -162,6 +202,32 @@ internal class MessagingControllerImplTest : ControllerTest() {
         assertThrows(BadRequestResponse::class.java) { controller.write(ctx) }
     }
 
+    @Test
+    fun markMessageRead() {
+        mockkStatic("org.briarproject.briar.headless.RouterKt")
+        mockkStatic("org.spongycastle.util.encoders.Base64")
+        expectGetContact()
+
+        val messageIdString = message.id.bytes.toString()
+        every { messagingManager.getContactGroup(contact).id } returns group.id
+        every { ctx.getFromJson(objectMapper, "messageId") } returns messageIdString
+        every { Base64.decode(messageIdString) } returns message.id.bytes
+        every { messagingManager.setReadFlag(group.id, message.id, true) } just Runs
+        every { ctx.json(messageIdString) } returns ctx
+
+        controller.markMessageRead(ctx)
+    }
+
+    @Test
+    fun markMessageReadInvalidContactId() {
+        testInvalidContactId { controller.markMessageRead(ctx) }
+    }
+
+    @Test
+    fun markMessageReadNonexistentId() {
+        testNonexistentContactId { controller.markMessageRead(ctx) }
+    }
+
     @Test
     fun privateMessageEvent() {
         val event = PrivateMessageReceivedEvent(header, contact.id)
@@ -177,6 +243,43 @@ internal class MessagingControllerImplTest : ControllerTest() {
         controller.eventOccurred(event)
     }
 
+    @Test
+    fun testOutputMessagesAckedEvent() {
+        val messageId1 = MessageId(getRandomId())
+        val messageId2 = MessageId(getRandomId())
+        val messageIds = listOf(messageId1, messageId2)
+        val event = MessagesAckedEvent(contact.id, messageIds)
+        val json = """
+            {
+                "contactId": ${contact.id.int},
+                "messageIds": [
+                    ${toJson(messageId1.bytes)},
+                    ${toJson(messageId2.bytes)}
+                ]
+            }
+        """
+        assertJsonEquals(json, event.output())
+    }
+
+    @Test
+    fun testOutputMessagesSentEvent() {
+        val messageId1 = MessageId(getRandomId())
+        val messageId2 = MessageId(getRandomId())
+        val messageIds = listOf(messageId1, messageId2)
+        val event = MessagesSentEvent(contact.id, messageIds)
+
+        val json = """
+            {
+                "contactId": ${contact.id.int},
+                "messageIds": [
+                    ${toJson(messageId1.bytes)},
+                    ${toJson(messageId2.bytes)}
+                ]
+            }
+        """
+        assertJsonEquals(json, event.output())
+    }
+
     @Test
     fun testOutputPrivateMessageHeader() {
         val json = """
@@ -242,6 +345,53 @@ internal class MessagingControllerImplTest : ControllerTest() {
         assertJsonEquals(json, request.output(contact.id))
     }
 
+    @Test
+    fun testDeleteAllMessages() {
+        val result = DeletionResult()
+        every { ctx.pathParam("contactId") } returns "1"
+        every { conversationManager.deleteAllMessages(ContactId(1)) } returns result
+        every { ctx.json(result.output()) } returns ctx
+        controller.deleteAllMessages(ctx)
+    }
+
+    @Test
+    fun testDeleteAllMessagesInvalidContactId() {
+        every { ctx.pathParam("contactId") } returns "foo"
+        assertThrows(NotFoundResponse::class.java) {
+            controller.deleteAllMessages(ctx)
+        }
+    }
+
+    @Test
+    fun testDeleteAllMessagesNonexistentContactId() {
+        every { ctx.pathParam("contactId") } returns "1"
+        every { conversationManager.deleteAllMessages(ContactId(1)) } throws NoSuchContactException()
+        assertThrows(NotFoundResponse::class.java) {
+            controller.deleteAllMessages(ctx)
+        }
+    }
+
+    @Test
+    fun testOutputDeletionResult() {
+        val result = DeletionResult()
+        if (Random.nextBoolean()) result.addInvitationNotAllSelected()
+        if (Random.nextBoolean()) result.addInvitationSessionInProgress()
+        if (Random.nextBoolean()) result.addIntroductionNotAllSelected()
+        if (Random.nextBoolean()) result.addIntroductionSessionInProgress()
+        if (Random.nextBoolean()) result.addNotFullyDownloaded()
+        val json = """
+            {
+                "allDeleted": ${result.allDeleted()},
+                "hasIntroductionSessionInProgress": ${result.hasIntroductionSessionInProgress()},
+                "hasInvitationSessionInProgress": ${result.hasInvitationSessionInProgress()},
+                "hasNotAllIntroductionSelected": ${result.hasNotAllIntroductionSelected()},
+                "hasNotAllInvitationSelected": ${result.hasNotAllInvitationSelected()},
+                "hasNotFullyDownloaded": ${result.hasNotFullyDownloaded()}
+            }
+        """
+        assertJsonEquals(json, result.output())
+    }
+
     private fun expectGetContact() {
         every { ctx.pathParam("contactId") } returns contact.id.int.toString()
         every { contactManager.getContact(contact.id) } returns contact

build.gradle

@@ -33,3 +33,12 @@ buildscript {
 		classpath files('libs/gradle-witness.jar')
 	}
 }
+
+project.ext {
+	buildToolsVersion = '30.0.2'
+	compileSdkVersion = 30
+	minSdkVersion = 16
+	targetSdkVersion = 29
+	versionCode = 10211
+	versionName = '1.2.11'
+}