Don't allow multiple messages to be queued in memory for validation at startup.

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 28
-		versionCode 10210
+		versionCode 10209
-		versionName "1.2.10"
+		versionName "1.2.9"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java

@@ -35,6 +35,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
@@ -124,8 +125,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 				Group g = db.getGroup(txn, m.getGroupId());
 				return new Pair<>(m, g);
 			});
-			validateMessageAsync(mg.getFirst(), mg.getSecond());
+			validateMessageAsync(mg.getFirst(), mg.getSecond(), unvalidated);
-			validateNextMessageAsync(unvalidated);
 		} catch (NoSuchMessageException e) {
 			LOG.info("Message removed before validation");
 			validateNextMessageAsync(unvalidated);
@@ -213,12 +213,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void validateMessageAsync(Message m, Group g) {
+	private void validateMessageAsync(Message m, Group g,
-		validationExecutor.execute(() -> validateMessage(m, g));
+			@Nullable Queue<MessageId> unvalidated) {
+		validationExecutor.execute(() -> validateMessage(m, g, unvalidated));
 	}
 
 	@ValidationExecutor
-	private void validateMessage(Message m, Group g) {
+	private void validateMessage(Message m, Group g,
+			@Nullable Queue<MessageId> unvalidated) {
 		ClientMajorVersion cv =
 				new ClientMajorVersion(g.getClientId(), g.getMajorVersion());
 		MessageValidator v = validators.get(cv);
@@ -234,6 +236,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 				Queue<MessageId> invalidate = new LinkedList<>();
 				invalidate.add(m.getId());
 				invalidateNextMessageAsync(invalidate);
+			} finally {
+				if (unvalidated != null) validateNextMessageAsync(unvalidated);
 			}
 		}
 	}
@@ -440,7 +444,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		try {
 			Group g = db.transactionWithResult(true, txn ->
 					db.getGroup(txn, m.getGroupId()));
-			validateMessageAsync(m, g);
+			validateMessageAsync(m, g, null);
 		} catch (NoSuchGroupException e) {
 			LOG.info("Group removed before validation");
 		} catch (DbException e) {

briar-android/build.gradle

@@ -22,8 +22,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 28
-		versionCode 10210
+		versionCode 10209
-		versionName "1.2.10"
+		versionName "1.2.9"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""

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

@@ -211,7 +211,7 @@
   <string name="add_contact_choose_nickname">Wähle einen Spitznamen</string>
   <string name="add_contact_choose_a_nickname">Gib einen Spitznamen ein</string>
   <string name="nickname_intro">Gib deinem Kontakt einen Spitznamen. Nur du kannst ihn sehen.</string>
-  <string name="your_link">Gib diesen Link dem Kontakt, den du hinzufügen möchtest</string>
+  <string name="your_link">Gebe diesen Link dem Kontakt, den du hinzufügen möchtest:</string>
   <string name="link_clip_label">Briar Link</string>
   <string name="link_copied_toast">Link kopiert</string>
   <string name="adding_contact_error">Es gab einen Fehler beim Hinzufügen des Kontaktes.</string>

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

@@ -157,12 +157,12 @@
   <string name="dialog_message_delete_all_messages">¿Estás seguro de que deseas eliminar todos los mensajes?</string>
   <string name="dialog_title_not_all_messages_deleted">No se pudieron eliminar todos los mensajes.</string>
   <string name="dialog_message_not_deleted_ongoing_both">Los mensajes relacionados con presentaciones o invitaciones en curso no se pueden eliminar hasta que finalicen.</string>
-  <string name="dialog_message_not_deleted_ongoing_introductions">Los mensajes relacionados con presentaciones no se pueden eliminar hasta que finalicen.</string>
+  <string name="dialog_message_not_deleted_ongoing_introductions">Los mensajes relacionados con presentaciones o invitaciones en curso no se pueden eliminar hasta que finalicen.</string>
   <string name="dialog_message_not_deleted_ongoing_invitations">Los mensajes relacionados a invitaciones en curso no pueden ser borrados hasta su conclusión.</string>
   <string name="dialog_message_not_deleted_partly_downloaded">Los mensajes parcialmente descargados no se pueden eliminar hasta que haya finalizado la descarga.</string>
   <string name="dialog_message_not_deleted_not_all_selected_both">Para borrar una invitación o presentación, debes seleccionar la petición y la respuesta.</string>
-  <string name="dialog_message_not_deleted_not_all_selected_introductions">Para eliminar una introducción, debes seleccionar la solicitud y la respuesta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_introductions">Para eliminar una introducción, debe seleccionar la solicitud y la respuesta.</string>
-  <string name="dialog_message_not_deleted_not_all_selected_invitations">Para eliminar una invitación, debes seleccionar la solicitud y la respuesta.</string>
+  <string name="dialog_message_not_deleted_not_all_selected_invitations">Para eliminar una invitación, debe seleccionar la solicitud y la respuesta.</string>
   <string name="delete_contact">Eliminar contacto</string>
   <string name="dialog_title_delete_contact">Confirmar eliminación de contacto</string>
   <string name="dialog_message_delete_contact">¿Seguro que quieres eliminar este contacto y todos los mensajes intercambiados entre vosotros?</string>

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

@@ -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>

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

@@ -79,18 +79,8 @@
   <string name="transport_lan_long">Sama þráðlausa Wi-Fi netkerfið</string>
   <string name="lan_device_status_on">Síminn þinn er tengdur við Wi-Fi</string>
   <string name="lan_device_status_off">Síminn þinn er ekki tengdur við Wi-Fi</string>
-  <string name="lan_plugin_status_enabling">Briar er að tengjast við Wi-Fi-netið</string>
-  <string name="lan_plugin_status_active">Briar er tengt við við Wi-Fi-netið</string>
-  <string name="lan_plugin_status_inactive">Briar getur ekki tengst við Wi-Fi-netið</string>
-  <string name="lan_plugin_status_disabled">Briar er sett upp til að nota ekki Wi-Fi-netið</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
-  <string name="bt_device_status_on">Kveikt er á Bluetooth-kerfi símans</string>
-  <string name="bt_device_status_off">Slökkt er á Bluetooth-kerfi símans</string>
-  <string name="bt_plugin_status_enabling">Briar er að tengjast við Bluetooth</string>
-  <string name="bt_plugin_status_active">Briar er tengt við Bluetooth</string>
-  <string name="bt_plugin_status_inactive">Briar getur ekki tengst við Bluetooth</string>
-  <string name="bt_plugin_status_disabled">Briar er sett upp til að nota ekki Bluetooth</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Skráð út úr Briar</string>
   <string name="reminder_notification_text">Ýttu til að skrá þig aftur inn.</string>
@@ -436,20 +426,10 @@
   <string name="pref_theme_auto">Sjálfvirkt (eftir tíma dags)</string>
   <string name="pref_theme_system">Sjálfgefið í kerfinu</string>
   <!--Settings Connections-->
-  <string name="network_settings_title">Tengingar</string>
-  <string name="bluetooth_setting">Tengjast tengiliðum í gegnum Bluetooth</string>
-  <string name="wifi_setting">Tengjast tengiliðum á sama þráðlausa Wi-Fi neti</string>
-  <string name="tor_enable_title">Tengjast tengiliðum í gegnum internetið</string>
-  <string name="tor_enable_summary">Allar tengingar fara í gegnum Tor-netið til að vernda persónuupplýsingar</string>
-  <string name="tor_network_setting">Aðferðir til tengingar við Tor-netið</string>
   <string name="tor_network_setting_automatic">Sjálfvirkt byggt á staðsetningu</string>
-  <string name="tor_network_setting_without_bridges">Nota Tor-netkerfið án brúa</string>
-  <string name="tor_network_setting_with_bridges">Nota Tor-netkerfið með brúm</string>
-  <string name="tor_network_setting_never">Ekki tengjast við internetið</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">Sjálfvirkt: %1$s (eftir %2$s)</string>
   <string name="tor_mobile_data_title">Nota farsímagagnasamband</string>
-  <string name="tor_only_when_charging_title">Tengjast í gegnum internetið aðeins þegar verið er í hleðslu</string>
   <string name="tor_only_when_charging_summary">Gerir internettengingu óvirka þegar tækið keyrir á rafhlöðu</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Öryggi</string>
@@ -560,7 +540,6 @@
   <string name="lock_is_locked">Briar er læst</string>
   <string name="lock_tap_to_unlock">Ýttu til að aflæsa</string>
   <!--Connections Screen-->
-  <string name="transports_help_text">Briar getur tengst við tengiliðina þína í gegnum internet, Wi-Fi eða Bluetooth.\n\nAllar internettengingar fara í gegnum Tor-netkerfið til að gæta gagnaleyndar.\n\nEf hægt er að nálgast tengilið með mörgum leiðum, notar Briar þær samhliða.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Lísa</string>

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

@@ -61,36 +61,12 @@
   <string name="lock_button">App vergrendelen</string>
   <string name="settings_button">Instellingen</string>
   <string name="sign_out_button">Log uit</string>
-  <string name="transports_onboarding_text">Tik hier om in te stellen hoe Briar een verbinding met je contacten opzet.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">Internet</string>
-  <string name="tor_device_status_online_wifi">Je apparaat heeft internettoegang via wifi</string>
-  <string name="tor_device_status_online_mobile">Je apparaat heeft internettoegang via mobiele dataverbinding</string>
-  <string name="tor_device_status_offline">Je apparaat heeft geen internettoegang</string>
-  <string name="tor_plugin_status_enabling">Briar is aan het verbinden met internet</string>
-  <string name="tor_plugin_status_active">Briar is verbonden met het internet</string>
-  <string name="tor_plugin_status_inactive">Briar kan geen verbinding maken met het internet</string>
-  <string name="tor_plugin_status_disabled">Briar is geconfigureerd om internet niet te gebruiken</string>
-  <string name="tor_plugin_status_disabled_mobile_data">Briar is geconfigureerd om mobiele dataverbinding niet te gebruiken</string>
-  <string name="tor_plugin_status_disabled_battery">Briar is geconfigureerd om het internet niet te gebruiken als apparaat op baterij loopt</string>
-  <string name="tor_plugin_status_disabled_country_blocked">Briar is geconfigureerd om internet niet te gebruiken in dit land</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wifi</string>
-  <string name="transport_lan_long">Hetzelfde wifinetwerk</string>
-  <string name="lan_device_status_on">Je apparaat is verbonden met wifi</string>
-  <string name="lan_device_status_off">Je apparaat is niet verbonden met wifi</string>
-  <string name="lan_plugin_status_enabling">Briar is verbinding aan het maken met het wifinetwerk</string>
-  <string name="lan_plugin_status_active">Briar is verbonden met het wifinetwerk</string>
-  <string name="lan_plugin_status_inactive">Briar kan geen verbinding maken met het wifinetwerk</string>
-  <string name="lan_plugin_status_disabled">Briar is geconfigureerd om het wifinetwerk niet te gebruiken</string>
   <!--Transports: Bluetooth-->
   <string name="transport_bt">Bluetooth</string>
-  <string name="bt_device_status_on">Bluetooth op je apparaat staat aan</string>
-  <string name="bt_device_status_off">Bluetooth op je apparaat staat uit</string>
-  <string name="bt_plugin_status_enabling">Briar is aan het verbinden met bluetooth</string>
-  <string name="bt_plugin_status_active">Briar is verbonden met bluetooth</string>
-  <string name="bt_plugin_status_inactive">Briar kan geen verbinding maken met bluetooth</string>
-  <string name="bt_plugin_status_disabled">Briar is geconfigureerd om bluetooth niet te gebruiken</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Uitgelogd van Briar</string>
   <string name="reminder_notification_text">Tik om opnieuw in te loggen.</string>
@@ -560,7 +536,6 @@
   <string name="lock_is_locked">Briar is vergrendeld</string>
   <string name="lock_tap_to_unlock">Tik om te ontgrendelen</string>
   <!--Connections Screen-->
-  <string name="transports_help_text">Briar kan met je contacten verbinden via het internet, wifi of bluetooth.\n\nAlle internetverbindingen gaan voor privacy door het Tornetwerk.\n\nAls een contact via meerdere methoden te bereiken is, zal Briar die parallel gebruiken.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Veerle</string>

briar-android/src/main/res/values-pt-rBR/strings.xml

@@ -61,7 +61,6 @@
   <string name="lock_button">Bloquear Aplicativo</string>
   <string name="settings_button">Configurações</string>
   <string name="sign_out_button">Sair</string>
-  <string name="transports_onboarding_text">Clique aqui para controlar como o Briar se conecta aos seus contatos.</string>
   <!--Transports: Tor-->
   <string name="transport_tor">Internet</string>
   <!--Transports: Wi-Fi-->

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

@@ -65,36 +65,12 @@
   <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>
-  <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">Wi-Fi</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">Bluetooth</string>
-  <string name="bt_device_status_on">Bluetooth вашего телефона включен.</string>
-  <string name="bt_device_status_off">Bluetooth вашего телефона отключен.</string>
-  <string name="bt_plugin_status_enabling">Briar подключается к Bluetooth</string>
-  <string name="bt_plugin_status_active">Briar подключен к Bluetooth</string>
-  <string name="bt_plugin_status_inactive">Briar не может подключиться к Bluetooth.</string>
-  <string name="bt_plugin_status_disabled">Briar настроен не использовать Bluetooth</string>
   <!--Notifications-->
   <string name="reminder_notification_title">Вы не авторизованы в Briar</string>
   <string name="reminder_notification_text">Нажмите для входа</string>
@@ -223,7 +199,7 @@
   <string name="add_contact_choose_nickname">Выберите ник</string>
   <string name="add_contact_choose_a_nickname">Введите ник</string>
   <string name="nickname_intro">Дайте вашему контакту ник. Увидеть его сможете только вы.</string>
-  <string name="your_link">Передайте эту ссылку контакту, который вы хотите добавить.</string>
+  <string name="your_link">Передайте эту ссылку контакту, которого вы хотите добавить.</string>
   <string name="link_clip_label">Ссылка Briar</string>
   <string name="link_copied_toast">Ссылка скопирована</string>
   <string name="adding_contact_error">При добавлении контакта произошла ошибка.</string>
@@ -582,7 +558,6 @@
   <string name="lock_is_locked">Briar заблокирован</string>
   <string name="lock_tap_to_unlock">Нажмите для разблокировки</string>
   <!--Connections Screen-->
-  <string name="transports_help_text">Briar может подключаться к контактам через интернет, Wi-Fi или Bluetooth.\n\nВсе интернет-соединения проходят через сеть Tor для обеспечения конфиденциальности.\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-zh-rCN/strings.xml

@@ -60,36 +60,12 @@
   <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>
-  <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>
@@ -132,7 +108,6 @@
   <string name="help">帮助</string>
   <string name="sorry">抱歉</string>
   <string name="error_start_activity">在您的系统上不可用</string>
-  <string name="status_heading">状态：</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">尚无联系人可供显示</string>
   <string name="no_contacts_action">轻按 + 号即可添加联系人</string>
@@ -439,7 +414,6 @@
   <!--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>
   <string name="tor_mobile_data_title">使用移动数据</string>
-  <string name="tor_only_when_charging_title">仅在充电时联网</string>
   <string name="tor_only_when_charging_summary">当设备使用电池电量时关闭网络连接</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">安全</string>
@@ -550,7 +524,6 @@
   <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为了保护隐私，所有的互联网连接都通过Tor网络。\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>