Factor out power management UI code into library

bramble-android/build.gradle

@@ -15,8 +15,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10401
-		versionName "1.4.1"
+		versionCode 10308
+		versionName "1.3.8"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java

@@ -10,4 +10,8 @@ public interface FeatureFlags {
 	boolean shouldEnableProfilePictures();
 
 	boolean shouldEnableDisappearingMessages();
+
+	boolean shouldEnableTransferData();
+
+	boolean shouldEnableShareAppViaOfflineHotspot();
 }

bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java

@@ -24,6 +24,16 @@ public class TestFeatureFlagModule {
 			public boolean shouldEnableDisappearingMessages() {
 				return true;
 			}
+
+			@Override
+			public boolean shouldEnableTransferData() {
+				return true;
+			}
+
+			@Override
+			public boolean shouldEnableShareAppViaOfflineHotspot() {
+				return true;
+			}
 		};
 	}
 }

briar-android/artwork/share_app.svg

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
-	xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-	xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="256" height="204"
-	viewBox="0 0 256 204" fill="none" version="1.1" id="svg42" sodipodi:docname="share_app.svg"
-	inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-	<metadata id="metadata48">
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-				<dc:title></dc:title>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<defs id="defs46" />
-	<sodipodi:namedview pagecolor="#000000" bordercolor="#666666" borderopacity="1"
-		objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
-		inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="964"
-		id="namedview44" showgrid="false" inkscape:zoom="2.4705882" inkscape:cx="123.34752"
-		inkscape:cy="83.759737" inkscape:window-x="1920" inkscape:window-y="72"
-		inkscape:window-maximized="0" inkscape:current-layer="svg42" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M41.583 100.841H22.1807V102.841H52.7503V136.663H54.7503V102.841H68.0341C70.9241 102.841 73.267 105.184 73.267 108.074C73.267 112.068 76.5053 115.307 80.4999 115.307H92.727V113.307H80.4999C77.6098 113.307 75.267 110.964 75.267 108.074C75.267 104.079 72.0287 100.841 68.0341 100.841H43.583V63.6593H41.583V100.841Z"
-		fill="#657D99" id="path2" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M122.611 86.0596V46.2531H124.611V86.0596H122.611Z" fill="#657D99" id="path4" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M119.754 179.928L119.754 142.682L121.754 142.682L121.754 179.928L119.754 179.928Z"
-		fill="#657D99" id="path6" />
-	<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
-		d="M195.251 100.841V86.5962H193.251V113.826H148.362V115.826H194.251C198.125 115.826 201.301 118.969 201.301 122.826V127.044H203.301V122.826C203.301 118.186 199.75 114.378 195.251 113.881V102.841H233.052V100.841H195.251Z"
-		fill="#657D99" id="path8" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M32.1213 57.4112L32.8875 55.5637C33.5961 55.8576 34.3747 56.0208 35.1966 56.0208H37.0795V58.0208H35.1966C34.1072 58.0208 33.0686 57.804 32.1213 57.4112ZM48.3769 58.0208V56.0208H50.2598C51.0816 56.0208 51.8602 55.8576 52.5689 55.5637L53.335 57.4112C52.3877 57.804 51.3491 58.0208 50.2598 58.0208H48.3769ZM58.2935 36.8067H56.2935V34.9238C56.2935 34.102 56.1303 33.3234 55.8364 32.6147L57.6839 31.8486C58.0767 32.7959 58.2935 33.8345 58.2935 34.9238V36.8067ZM37.0795 26.8901H35.1966C34.1072 26.8901 33.0686 27.1069 32.1213 27.4997L32.8875 29.3472C33.5961 29.0533 34.3747 28.8901 35.1966 28.8901H37.0795V26.8901ZM27.1628 48.1042H29.1628V49.9871C29.1628 50.8089 29.326 51.5875 29.6199 52.2962L27.7724 53.0623C27.3796 52.115 27.1628 51.0764 27.1628 49.9871V48.1042ZM27.1628 44.3384H29.1628V40.5725H27.1628V44.3384ZM27.1628 36.8067H29.1628V34.9238C29.1628 34.102 29.326 33.3234 29.6199 32.6147L27.7724 31.8486C27.3796 32.7959 27.1628 33.8345 27.1628 34.9238V36.8067ZM40.8453 26.8901V28.8901H44.6111V26.8901H40.8453ZM48.3769 26.8901V28.8901H50.2598C51.0816 28.8901 51.8602 29.0533 52.5689 29.3472L53.335 27.4997C52.3877 27.1069 51.3491 26.8901 50.2598 26.8901H48.3769ZM58.2935 40.5725H56.2935V44.3383H58.2935V40.5725ZM58.2935 48.1042H56.2935V49.9871C56.2935 50.8089 56.1303 51.5875 55.8364 52.2962L57.6839 53.0623C58.0767 52.115 58.2935 51.0764 58.2935 49.9871V48.1042ZM44.6111 58.0208V56.0208H40.8453V58.0208H44.6111Z"
-		fill="#657D99" id="path10" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M112.487 40.4256L112.875 38.4636C113.41 38.5694 113.964 38.6251 114.533 38.6251H116.99V40.6251H114.533C113.833 40.6251 113.149 40.5565 112.487 40.4256ZM131.733 40.6251V38.6251H134.191C134.76 38.6251 135.314 38.5694 135.848 38.4636L136.237 40.4256C135.575 40.5565 134.891 40.6251 134.191 40.6251H131.733ZM140.016 38.8593L138.903 37.1973C139.829 36.5774 140.627 35.7797 141.247 34.8536L142.909 35.9663C142.143 37.1095 141.159 38.0939 140.016 38.8593ZM144.674 12.9411H142.674V10.4839C142.674 9.91475 142.619 9.36059 142.513 8.82599L144.475 8.43785C144.606 9.0996 144.674 9.78374 144.674 10.4839V12.9411ZM142.909 4.65889L141.247 5.77152C140.627 4.84548 139.829 4.04776 138.903 3.42779L140.016 1.76585C141.159 2.53126 142.143 3.5156 142.909 4.65889ZM116.99 0H114.533C113.833 0 113.149 0.0686375 112.487 0.199551L112.875 2.16153C113.41 2.05577 113.964 2 114.533 2H116.99V0ZM108.708 1.76585L109.821 3.42779C108.895 4.04776 108.097 4.84548 107.477 5.77152L105.815 4.65888C106.581 3.5156 107.565 2.53126 108.708 1.76585ZM104.049 27.6841H106.049V30.1412C106.049 30.7104 106.105 31.2645 106.211 31.7992L104.249 32.1873C104.118 31.5255 104.049 30.8414 104.049 30.1412V27.6841ZM105.815 35.9663L107.477 34.8536C108.097 35.7797 108.895 36.5774 109.821 37.1973L108.708 38.8593C107.565 38.0939 106.581 37.1095 105.815 35.9663ZM104.049 22.7697H106.049V17.8554H104.049V22.7697ZM104.049 12.9411H106.049V10.4839C106.049 9.91475 106.105 9.36059 106.211 8.82598L104.249 8.43785C104.118 9.09959 104.049 9.78374 104.049 10.4839V12.9411ZM121.905 0V2H126.819V0H121.905ZM131.733 0V2H134.191C134.76 2 135.314 2.05577 135.848 2.16153L136.237 0.199552C135.575 0.0686377 134.891 0 134.191 0H131.733ZM144.674 17.8554H142.674V22.7697H144.674V17.8554ZM144.674 27.6841H142.674V30.1412C142.674 30.7104 142.619 31.2645 142.513 31.7992L144.475 32.1873C144.606 31.5255 144.674 30.8414 144.674 30.1412V27.6841ZM126.819 40.6251V38.6251H121.905V40.6251H126.819Z"
-		fill="#657D99" id="path12" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M183.397 81.9904L184.163 80.1429C184.902 80.4493 185.714 80.6194 186.57 80.6194H188.513V82.6194H186.57C185.446 82.6194 184.375 82.3957 183.397 81.9904ZM200.171 82.6194V80.6194H202.114C202.97 80.6194 203.782 80.4493 204.521 80.1429L205.287 81.9904C204.309 82.3957 203.238 82.6194 202.114 82.6194H200.171ZM210.403 60.7295H208.403V58.7866C208.403 57.9301 208.233 57.1184 207.927 56.3795L209.774 55.6134C210.18 56.5908 210.403 57.6626 210.403 58.7866V60.7295ZM188.513 50.4969H186.57C185.446 50.4969 184.375 50.7207 183.397 51.126L184.163 52.9734C184.902 52.667 185.714 52.4969 186.57 52.4969H188.513V50.4969ZM178.281 72.3869H180.281V74.3297C180.281 75.1863 180.451 75.998 180.757 76.7368L178.91 77.5029C178.504 76.5255 178.281 75.4538 178.281 74.3297V72.3869ZM178.281 68.5011H180.281V64.6153H178.281V68.5011ZM178.281 60.7295H180.281V58.7866C180.281 57.9301 180.451 57.1184 180.757 56.3795L178.91 55.6134C178.504 56.5908 178.281 57.6626 178.281 58.7866V60.7295ZM192.399 50.4969V52.4969H196.285V50.4969H192.399ZM200.171 50.4969V52.4969H202.114C202.97 52.4969 203.782 52.667 204.521 52.9734L205.287 51.126C204.309 50.7207 203.238 50.4969 202.114 50.4969H200.171ZM210.403 64.6153H208.403V68.5011H210.403V64.6153ZM210.403 72.3869H208.403V74.3297C208.403 75.1863 208.233 75.998 207.927 76.7368L209.774 77.5029C210.18 76.5255 210.403 75.4538 210.403 74.3297V72.3869ZM196.285 82.6194V80.6194H192.399V82.6194H196.285Z"
-		fill="#657D99" id="path14" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M188.271 180.562L188.659 178.6C189.316 178.73 189.996 178.798 190.694 178.798H192.633V180.798H190.694C189.865 180.798 189.055 180.717 188.271 180.562ZM212.029 180.798V178.798H213.968C214.666 178.798 215.346 178.73 216.003 178.6L216.391 180.562C215.607 180.717 214.797 180.798 213.968 180.798H212.029ZM220.865 178.708L219.753 177.046C220.889 176.285 221.868 175.306 222.629 174.17L224.291 175.282C223.384 176.636 222.219 177.801 220.865 178.708ZM226.381 147.05H224.381V145.111C224.381 144.413 224.313 143.733 224.183 143.077L226.145 142.688C226.3 143.472 226.381 144.282 226.381 145.111V147.05ZM224.291 138.214L222.629 139.327C221.868 138.19 220.889 137.211 219.753 136.451L220.865 134.789C222.219 135.695 223.384 136.86 224.291 138.214ZM192.633 132.698H190.694C189.865 132.698 189.055 132.779 188.271 132.934L188.659 134.896C189.316 134.766 189.996 134.698 190.694 134.698H192.633V132.698ZM183.797 134.789L184.91 136.451C183.773 137.211 182.794 138.19 182.033 139.327L180.372 138.214C181.278 136.86 182.443 135.695 183.797 134.789ZM178.281 166.446H180.281V168.385C180.281 169.083 180.349 169.763 180.479 170.42L178.517 170.808C178.362 170.024 178.281 169.214 178.281 168.385V166.446ZM180.372 175.282L182.033 174.17C182.794 175.306 183.773 176.285 184.91 177.046L183.797 178.708C182.443 177.801 181.278 176.636 180.372 175.282ZM178.281 162.567H180.281V158.688H178.281V162.567ZM178.281 154.809H180.281V150.93H178.281V154.809ZM178.281 147.05H180.281V145.111C180.281 144.413 180.349 143.733 180.479 143.077L178.517 142.688C178.362 143.472 178.281 144.282 178.281 145.111V147.05ZM196.512 132.698V134.698H200.392V132.698H196.512ZM204.271 132.698V134.698H208.15V132.698H204.271ZM212.029 132.698V134.698H213.968C214.666 134.698 215.346 134.766 216.003 134.896L216.391 132.934C215.607 132.779 214.797 132.698 213.968 132.698H212.029ZM226.381 150.93H224.381V154.809H226.381V150.93ZM226.381 158.688H224.381V162.567H226.381V158.688ZM226.381 166.446H224.381V168.385C224.381 169.083 224.313 169.763 224.183 170.42L226.145 170.808C226.3 170.024 226.381 169.214 226.381 168.385V166.446ZM208.15 180.798V178.798H204.271V180.798H208.15ZM200.392 180.798V178.798H196.512V180.798H200.392Z"
-		fill="#657D99" id="path16" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M40.3891 175.457L41.1552 173.609C41.9338 173.932 42.7892 174.111 43.6915 174.111H45.7134V176.111H43.6915C42.5217 176.111 41.4063 175.878 40.3891 175.457ZM57.8451 176.111V174.111H59.8671C60.7693 174.111 61.6247 173.932 62.4033 173.609L63.1694 175.457C62.1522 175.878 61.0368 176.111 59.8671 176.111H57.8451ZM68.4941 153.33H66.4941V151.309C66.4941 150.406 66.3149 149.551 65.992 148.772L67.8395 148.006C68.2613 149.023 68.4941 150.139 68.4941 151.309V153.33ZM45.7134 142.682H43.6915C42.5217 142.682 41.4063 142.914 40.3891 143.336L41.1552 145.184C41.9338 144.861 42.7892 144.682 43.6915 144.682H45.7134V142.682ZM35.0645 165.462H37.0645V167.484C37.0645 168.386 37.2437 169.242 37.5665 170.02L35.7191 170.786C35.2973 169.769 35.0645 168.654 35.0645 167.484V165.462ZM35.0645 161.418H37.0645V157.374H35.0645V161.418ZM35.0645 153.33H37.0645V151.309C37.0645 150.406 37.2437 149.551 37.5665 148.772L35.7191 148.006C35.2973 149.023 35.0645 150.139 35.0645 151.309V153.33ZM49.7573 142.682V144.682H53.8012V142.682H49.7573ZM57.8451 142.682V144.682H59.8671C60.7693 144.682 61.6247 144.861 62.4033 145.184L63.1694 143.336C62.1522 142.914 61.0368 142.682 59.8671 142.682H57.8451ZM68.4941 157.374H66.4941V161.418H68.4941V157.374ZM68.4941 165.462H66.4941V167.484C66.4941 168.386 66.3149 169.242 65.992 170.02L67.8395 170.786C68.2613 169.769 68.4941 168.654 68.4941 167.484V165.462ZM53.8012 176.111V174.111H49.7573V176.111H53.8012Z"
-		fill="#657D99" id="path18" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M2.84 110.802L3.60611 108.954C3.91005 109.081 4.24493 109.151 4.60133 109.151H6.75821V111.151H4.60133C3.97743 111.151 3.38253 111.027 2.84 110.802ZM11.072 111.151V109.151H13.2288C13.5852 109.151 13.9201 109.081 14.2241 108.954L14.9902 110.802C14.4476 111.027 13.8527 111.151 13.2288 111.151H11.072ZM17.8302 100.079H15.8302V97.9223C15.8302 97.5659 15.7596 97.231 15.6336 96.927L17.481 96.1609C17.706 96.7035 17.8302 97.2984 17.8302 97.9223V100.079ZM6.75821 93.3209H4.60133C3.97743 93.3209 3.38253 93.4451 2.84 93.6701L3.60611 95.5175C3.91005 95.3915 4.24493 95.3209 4.60133 95.3209H6.75821V93.3209ZM0 104.393H2V106.55C2 106.906 2.07056 107.241 2.1966 107.545L0.349152 108.311C0.124172 107.769 0 107.174 0 106.55V104.393ZM0 100.079H2V97.9223C2 97.5659 2.07056 97.231 2.1966 96.927L0.349152 96.1609C0.124172 96.7035 0 97.2984 0 97.9223V100.079ZM11.072 93.3209V95.3209H13.2288C13.5852 95.3209 13.9201 95.3915 14.2241 95.5175L14.9902 93.6701C14.4476 93.4451 13.8527 93.3209 13.2288 93.3209H11.072ZM17.8302 104.393H15.8302V106.55C15.8302 106.906 15.7596 107.241 15.6336 107.545L17.481 108.311C17.706 107.769 17.8302 107.174 17.8302 106.55V104.393Z"
-		fill="#657D99" id="path20" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M114.745 202.969L115.511 201.122C115.815 201.248 116.149 201.318 116.506 201.318H118.663V203.318H116.506C115.882 203.318 115.287 203.194 114.745 202.969ZM122.977 203.318V201.318H125.133C125.49 201.318 125.825 201.248 126.129 201.122L126.895 202.969C126.352 203.194 125.757 203.318 125.133 203.318H122.977ZM129.735 192.246H127.735V190.09C127.735 189.733 127.664 189.398 127.538 189.094L129.386 188.328C129.611 188.871 129.735 189.466 129.735 190.09V192.246ZM118.663 185.488H116.506C115.882 185.488 115.287 185.612 114.745 185.837L115.511 187.685C115.815 187.559 116.149 187.488 116.506 187.488H118.663V185.488ZM111.905 196.56H113.905V198.717C113.905 199.074 113.975 199.408 114.101 199.712L112.254 200.478C112.029 199.936 111.905 199.341 111.905 198.717V196.56ZM111.905 192.246H113.905V190.09C113.905 189.733 113.975 189.398 114.101 189.094L112.254 188.328C112.029 188.871 111.905 189.466 111.905 190.09V192.246ZM122.977 185.488V187.488H125.133C125.49 187.488 125.825 187.559 126.129 187.685L126.895 185.837C126.352 185.612 125.757 185.488 125.133 185.488H122.977ZM129.735 196.56H127.735V198.717C127.735 199.074 127.664 199.408 127.538 199.712L129.386 200.478C129.611 199.936 129.735 199.341 129.735 198.717V196.56Z"
-		fill="#657D99" id="path22" />
-	<path fill-rule="evenodd" clip-rule="evenodd"
-		d="M240.444 110.802L241.21 108.954C241.514 109.081 241.849 109.151 242.205 109.151H244.362V111.151H242.205C241.581 111.151 240.987 111.027 240.444 110.802ZM248.676 111.151V109.151H250.833C251.189 109.151 251.524 109.081 251.828 108.954L252.594 110.802C252.052 111.027 251.457 111.151 250.833 111.151H248.676ZM255.434 100.079H253.434V97.9223C253.434 97.5659 253.364 97.231 253.238 96.927L255.085 96.1609C255.31 96.7035 255.434 97.2984 255.434 97.9223V100.079ZM244.362 93.3209H242.205C241.581 93.3209 240.987 93.4451 240.444 93.6701L241.21 95.5175C241.514 95.3915 241.849 95.3209 242.205 95.3209H244.362V93.3209ZM237.604 104.393H239.604V106.55C239.604 106.906 239.675 107.241 239.801 107.545L237.953 108.311C237.728 107.769 237.604 107.174 237.604 106.55V104.393ZM237.604 100.079H239.604V97.9223C239.604 97.5659 239.675 97.231 239.801 96.927L237.953 96.1609C237.728 96.7035 237.604 97.2984 237.604 97.9223V100.079ZM248.676 93.3209V95.3209H250.833C251.189 95.3209 251.524 95.3915 251.828 95.5175L252.594 93.6701C252.052 93.4451 251.457 93.3209 250.833 93.3209H248.676ZM255.434 104.393H253.434V106.55C253.434 106.906 253.364 107.241 253.238 107.545L255.085 108.311C255.31 107.769 255.434 107.174 255.434 106.55V104.393Z"
-		fill="#657D99" id="path24" />
-	<path
-		d="M108.75 109.808V129.511C108.75 131.11 110.052 132.429 111.668 132.429H113.036C114.636 132.429 115.955 131.11 115.955 129.511V109.808H108.75V109.808Z"
-		fill="#87C214" id="path26" />
-	<path
-		d="M115.938 100.312V96.6023C115.938 95.003 114.636 93.684 113.036 93.684H111.668C110.069 93.684 108.75 95.003 108.75 96.6023V100.312H115.938V100.312Z"
-		fill="#87C214" id="path28" />
-	<path
-		d="M131.931 116.305V96.6023C131.931 95.003 130.628 93.684 129.029 93.684H127.66C126.061 93.684 124.742 95.003 124.742 96.6023V116.305H131.931V116.305Z"
-		fill="#87C214" id="path30" />
-	<path
-		d="M124.742 125.801V129.511C124.742 131.11 126.061 132.429 127.66 132.429H129.029C130.628 132.429 131.947 131.11 131.947 129.511V125.801H124.742Z"
-		fill="#87C214" id="path32" />
-	<path
-		d="M107.595 117.459H103.886C102.286 117.459 100.967 118.761 100.967 120.377V121.746C100.967 123.345 102.27 124.664 103.886 124.664H107.595V117.459Z"
-		fill="#95D220" id="path34" />
-	<path
-		d="M136.795 117.459H117.092V124.664H136.795C138.394 124.664 139.713 123.345 139.713 121.746V120.377C139.713 118.761 138.394 117.459 136.795 117.459Z"
-		fill="#95D220" id="path36" />
-	<path
-		d="M123.588 101.466H103.886C102.286 101.466 100.967 102.769 100.967 104.385V105.753C100.967 107.352 102.27 108.671 103.886 108.671H123.588V101.466Z"
-		fill="#95D220" id="path38" />
-	<path
-		d="M136.795 101.466H133.085V108.671H136.795C138.394 108.671 139.713 107.369 139.713 105.753V104.384C139.713 102.769 138.394 101.466 136.795 101.466Z"
-		fill="#95D220" id="path40" />
-</svg>

briar-android/build.gradle

@@ -26,8 +26,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 30
-		versionCode 10401
-		versionName "1.4.1"
+		versionCode 10308
+		versionName "1.3.8"
 		applicationId "org.briarproject.briar.android"
 
 		vectorDrawables.useSupportLibrary = true
@@ -99,13 +99,14 @@ dependencies {
 	implementation project(path: ':briar-core', configuration: 'default')
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation project(':bramble-android')
+	implementation project(':dont-kill-me-lib')
 
-	implementation 'androidx.fragment:fragment:1.3.4'
+	implementation "androidx.fragment:fragment:$androidx_fragment_version"
 	implementation 'androidx.preference:preference:1.1.1'
 	implementation 'androidx.exifinterface:exifinterface:1.3.2'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
+	implementation "com.google.android.material:material:$google_material_version"
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
 
 	implementation 'info.guardianproject.panic:panic:1.0'

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/PromoVideoTest.java

@@ -39,11 +39,11 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static java.lang.Thread.sleep;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.OverlayTapViewAction.visualClick;
 import static org.briarproject.briar.android.ViewActions.waitFor;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.junit.Assert.assertTrue;
 

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java

@@ -26,9 +26,9 @@ import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 import static org.hamcrest.Matchers.allOf;
 import static org.junit.Assert.assertTrue;
 

briar-android/src/main/AndroidManifest.xml

@@ -34,7 +34,6 @@
 		tools:ignore="ScopedStorage" />
 
 	<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 	<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC" />
 	<uses-permission-sdk-23 android:name="android.permission.FOREGROUND_SERVICE" />
 
@@ -477,9 +476,6 @@
 
 	<queries>
 		<package android:name="info.guardianproject.ripple" />
-		<package android:name="com.huawei.systemmanager" />
-		<package android:name="com.huawei.powergenie" />
-		<package android:name="com.evenwell.PowerMonitor" />
 
 		<intent>
 			<action android:name="android.intent.action.VIEW" />

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

@@ -33,6 +33,7 @@ import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
+import org.briarproject.briar.android.account.DoNotKillMeFragment;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.contact.connect.BluetoothIntroFragment;
@@ -239,4 +240,6 @@ public interface AndroidComponent
 	void inject(ReceiveFragment receiveFragment);
 
 	void inject(BluetoothIntroFragment bluetoothIntroFragment);
+
+	void inject(DoNotKillMeFragment dozeFragment);
 }

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

@@ -76,6 +76,7 @@ import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX;
+import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 
 @Module(includes = {
 		SetupModule.class,
@@ -170,8 +171,11 @@ public class AppModule {
 
 			@Override
 			public Collection<SimplexPluginFactory> getSimplexFactories() {
-				if (SDK_INT >= 19) return singletonList(drive);
-				else return emptyList();
+				if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) {
+					return singletonList(drive);
+				} else {
+					return emptyList();
+				}
 			}
 
 			@Override
@@ -308,6 +312,16 @@ public class AppModule {
 			public boolean shouldEnableDisappearingMessages() {
 				return true;
 			}
+
+			@Override
+			public boolean shouldEnableTransferData() {
+				return IS_DEBUG_BUILD;
+			}
+
+			@Override
+			public boolean shouldEnableShareAppViaOfflineHotspot() {
+				return IS_DEBUG_BUILD;
+			}
 		};
 	}
 }

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

@@ -1,57 +1,16 @@
 package org.briarproject.briar.android;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.PowerManager;
 
+import org.briarproject.android.dontkillmelib.AbstractDozeWatchdogImpl;
 import org.briarproject.bramble.api.lifecycle.Service;
-import org.briarproject.bramble.api.lifecycle.ServiceException;
 import org.briarproject.briar.api.android.DozeWatchdog;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static android.content.Context.POWER_SERVICE;
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
-
-class DozeWatchdogImpl implements DozeWatchdog, Service {
-
-	private final Context appContext;
-	private final AtomicBoolean dozed = new AtomicBoolean(false);
-	private final BroadcastReceiver receiver = new DozeBroadcastReceiver();
+class DozeWatchdogImpl extends AbstractDozeWatchdogImpl
+		implements DozeWatchdog, Service {
 
 	DozeWatchdogImpl(Context appContext) {
-		this.appContext = appContext;
+		super(appContext);
 	}
 
-	@Override
-	public boolean getAndResetDozeFlag() {
-		return dozed.getAndSet(false);
-	}
-
-	@Override
-	public void startService() throws ServiceException {
-		if (SDK_INT < 23) return;
-		IntentFilter filter = new IntentFilter(ACTION_DEVICE_IDLE_MODE_CHANGED);
-		appContext.registerReceiver(receiver, filter);
-	}
-
-	@Override
-	public void stopService() throws ServiceException {
-		if (SDK_INT < 23) return;
-		appContext.unregisterReceiver(receiver);
-	}
-
-	private class DozeBroadcastReceiver extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			if (SDK_INT < 23) return;
-			PowerManager pm =
-					(PowerManager) appContext.getSystemService(POWER_SERVICE);
-			if (pm.isDeviceIdleMode()) dozed.set(true);
-		}
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/account/DoNotKillMeFragment.java

@@ -0,0 +1,38 @@
+package org.briarproject.briar.android.account;
+
+import android.content.Context;
+
+import org.briarproject.android.dontkillmelib.AbstractDoNotKillMeFragment;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+
+import javax.inject.Inject;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProvider;
+
+import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class DoNotKillMeFragment extends AbstractDoNotKillMeFragment {
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+	SetupViewModel viewModel;
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		FragmentActivity activity = requireActivity();
+		getAndroidComponent(activity).inject(this);
+		viewModel = new ViewModelProvider(activity, viewModelFactory)
+				.get(SetupViewModel.class);
+	}
+
+	@Override
+	protected void onButtonClicked() {
+		viewModel.dozeExceptionConfirmed();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java

@@ -1,119 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener;
-import org.briarproject.briar.android.util.UiUtils;
-
-import androidx.annotation.Nullable;
-
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_DOZE_WHITELISTING;
-import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class DozeFragment extends SetupFragment
-		implements OnCheckedChangedListener {
-
-	private final static String TAG = DozeFragment.class.getName();
-
-	private DozeView dozeView;
-	private HuaweiProtectedAppsView huaweiProtectedAppsView;
-	private HuaweiAppLaunchView huaweiAppLaunchView;
-	private XiaomiView xiaomiView;
-	private Button next;
-	private boolean secondAttempt = false;
-
-	public static DozeFragment newInstance() {
-		return new DozeFragment();
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		requireActivity().setTitle(getString(R.string.setup_doze_title));
-		setHasOptionsMenu(false);
-		View v = inflater.inflate(R.layout.fragment_setup_doze, container,
-				false);
-		dozeView = v.findViewById(R.id.dozeView);
-		dozeView.setOnCheckedChangedListener(this);
-		huaweiProtectedAppsView = v.findViewById(R.id.huaweiProtectedAppsView);
-		huaweiProtectedAppsView.setOnCheckedChangedListener(this);
-		huaweiAppLaunchView = v.findViewById(R.id.huaweiAppLaunchView);
-		huaweiAppLaunchView.setOnCheckedChangedListener(this);
-		xiaomiView = v.findViewById(R.id.xiaomiView);
-		xiaomiView.setOnCheckedChangedListener(this);
-		next = v.findViewById(R.id.next);
-		ProgressBar progressBar = v.findViewById(R.id.progress);
-
-		dozeView.setOnButtonClickListener(this::askForDozeWhitelisting);
-		next.setOnClickListener(this);
-
-		viewModel.getIsCreatingAccount()
-				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
-					if (isCreatingAccount) {
-						next.setVisibility(INVISIBLE);
-						progressBar.setVisibility(VISIBLE);
-					}
-				});
-
-		return v;
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	protected String getHelpText() {
-		return getString(R.string.setup_doze_explanation);
-	}
-
-	@Override
-	public void onActivityResult(int request, int result,
-			@Nullable Intent data) {
-		super.onActivityResult(request, result, data);
-		if (request == REQUEST_DOZE_WHITELISTING) {
-			if (!dozeView.needsToBeShown() || secondAttempt) {
-				dozeView.setChecked(true);
-			} else if (getContext() != null) {
-				secondAttempt = true;
-				showOnboardingDialog(getContext(), getHelpText());
-			}
-		}
-	}
-
-	@Override
-	public void onCheckedChanged() {
-		next.setEnabled(dozeView.isChecked() &&
-				huaweiProtectedAppsView.isChecked() &&
-				huaweiAppLaunchView.isChecked() &&
-				xiaomiView.isChecked());
-	}
-
-	@SuppressLint("BatteryLife")
-	private void askForDozeWhitelisting() {
-		if (getContext() == null) return;
-		Intent i = UiUtils.getDozeWhitelistingIntent(getContext());
-		startActivityForResult(i, REQUEST_DOZE_WHITELISTING);
-	}
-
-	@Override
-	public void onClick(View view) {
-		viewModel.dozeExceptionConfirmed();
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelper.java

@@ -1,8 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import android.content.Context;
-
-interface DozeHelper {
-
-	boolean needToShowDozeFragment(Context context);
-}

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelperModule.java

@@ -1,5 +1,8 @@
 package org.briarproject.briar.android.account;
 
+import org.briarproject.android.dontkillmelib.DozeHelper;
+import org.briarproject.android.dontkillmelib.DozeHelperImpl;
+
 import dagger.Module;
 import dagger.Provides;
 

briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java

@@ -14,12 +14,14 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
+import static androidx.lifecycle.Lifecycle.State.STARTED;
 import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR_NAME;
 import static org.briarproject.briar.android.account.SetupViewModel.State.CREATED;
@@ -28,6 +30,7 @@ import static org.briarproject.briar.android.account.SetupViewModel.State.FAILED
 import static org.briarproject.briar.android.account.SetupViewModel.State.SET_PASSWORD;
 import static org.briarproject.briar.android.util.UiUtils.setInputStateAlwaysVisible;
 import static org.briarproject.briar.android.util.UiUtils.setInputStateHidden;
+import static org.briarproject.briar.android.util.UiUtils.showFragment;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -77,7 +80,10 @@ public class SetupActivity extends BaseActivity
 
 	@TargetApi(23)
 	void showDozeFragment() {
-		showNextFragment(DozeFragment.newInstance());
+		Fragment f = new DoNotKillMeFragment();
+		String tag = DoNotKillMeFragment.TAG;
+		if (!getLifecycle().getCurrentState().isAtLeast(STARTED)) return;
+		showFragment(getSupportFragmentManager(), f, tag);
 	}
 
 	void showApp() {

briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.account;
 
 import android.app.Application;
 
+import org.briarproject.android.dontkillmelib.DozeHelper;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
@@ -95,7 +96,7 @@ class SetupViewModel extends AndroidViewModel {
 	}
 
 	boolean needToShowDozeFragment() {
-		return dozeHelper.needToShowDozeFragment(getApplication());
+		return dozeHelper.needToShowDoNotKillMeFragment(getApplication());
 	}
 
 	void dozeExceptionConfirmed() {

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

@@ -36,11 +36,11 @@ import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static android.os.Build.VERSION.SDK_INT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.android.dontkillmelib.PowerUtils.getDozeWhitelistingIntent;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_DOZE_WHITELISTING;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PASSWORD;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_UNLOCK;
 import static org.briarproject.briar.android.util.UiUtils.excludeSystemUi;
-import static org.briarproject.briar.android.util.UiUtils.getDozeWhitelistingIntent;
 import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
 
 @MethodsNotNullByDefault

briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java

@@ -27,10 +27,10 @@ import androidx.annotation.CallSuper;
 
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 
 @NotNullByDefault
 public class BriarControllerImpl implements BriarController {

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -380,7 +380,7 @@ public class ConversationActivity extends BriarActivity
 			}
 		});
 		// Transfer Data feature only supported on API 19+
-		if (SDK_INT >= 19) {
+		if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) {
 			menu.findItem(R.id.action_transfer_data).setVisible(true);
 		}
 		// enable alias and bluetooth action once available

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

@@ -25,11 +25,11 @@ import androidx.lifecycle.MutableLiveData;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE;
 import static org.briarproject.briar.android.controller.BriarControllerImpl.DOZE_ASK_AGAIN;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
 
 @NotNullByDefault
 public class NavDrawerViewModel extends DbViewModel {

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

@@ -86,6 +86,12 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 			PreferenceGroup dev = requireNonNull(findPreference(PREF_KEY_DEV));
 			dev.setVisible(false);
 		}
+
+		if (!viewModel.shouldEnableShareAppViaOfflineHotspot()) {
+			Preference shareApp =
+					requireNonNull(findPreference(PREF_KEY_SHARE_APP));
+			shareApp.setVisible(false);
+		}
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java

@@ -262,4 +262,8 @@ class SettingsViewModel extends DbViewModel implements EventListener {
 		return screenLockTimeout;
 	}
 
+	boolean shouldEnableShareAppViaOfflineHotspot() {
+		return featureFlags.shouldEnableShareAppViaOfflineHotspot();
+	}
+
 }

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

@@ -1,7 +1,5 @@
 package org.briarproject.briar.android.util;
 
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.content.ActivityNotFoundException;
@@ -12,7 +10,6 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.location.LocationManager;
 import android.net.Uri;
-import android.os.PowerManager;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -68,13 +65,11 @@ import androidx.lifecycle.Observer;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import static android.content.Context.KEYGUARD_SERVICE;
-import static android.content.Context.POWER_SERVICE;
 import static android.content.Intent.CATEGORY_DEFAULT;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.os.Build.MANUFACTURER;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS;
-import static android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS;
 import static android.text.format.DateUtils.DAY_IN_MILLIS;
 import static android.text.format.DateUtils.FORMAT_ABBREV_ALL;
 import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
@@ -323,23 +318,6 @@ public class UiUtils {
 				.show();
 	}
 
-	public static boolean needsDozeWhitelisting(Context ctx) {
-		if (SDK_INT < 23) return false;
-		PowerManager pm = (PowerManager) ctx.getSystemService(POWER_SERVICE);
-		String packageName = ctx.getPackageName();
-		if (pm == null) throw new AssertionError();
-		return !pm.isIgnoringBatteryOptimizations(packageName);
-	}
-
-	@TargetApi(23)
-	@SuppressLint("BatteryLife")
-	public static Intent getDozeWhitelistingIntent(Context ctx) {
-		Intent i = new Intent();
-		i.setAction(ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-		i.setData(Uri.parse("package:" + ctx.getPackageName()));
-		return i;
-	}
-
 	/**
 	 * @return true if location is enabled,
 	 * or it isn't required due to this being a SDK < 28 device.

briar-android/src/main/res/drawable/ic_share_app.xml

@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="256dp"
-	android:height="204dp"
-	android:viewportWidth="256"
-	android:viewportHeight="204">
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M41.583,100.841H22.181V102.841H52.75V136.663H54.75V102.841H68.034C70.924,102.841 73.267,105.184 73.267,108.074C73.267,112.068 76.505,115.307 80.5,115.307H92.727V113.307H80.5C77.61,113.307 75.267,110.964 75.267,108.074C75.267,104.079 72.029,100.841 68.034,100.841H43.583V63.659H41.583V100.841Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M122.611,86.06V46.253H124.611V86.06H122.611Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M119.754,179.928L119.754,142.682L121.754,142.682L121.754,179.928L119.754,179.928Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M195.251,100.841V86.596H193.251V113.826H148.362V115.826H194.251C198.125,115.826 201.301,118.969 201.301,122.826V127.044H203.301V122.826C203.301,118.186 199.75,114.378 195.251,113.881V102.841H233.052V100.841H195.251Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M32.121,57.411L32.888,55.564C33.596,55.858 34.375,56.021 35.197,56.021H37.079V58.021H35.197C34.107,58.021 33.069,57.804 32.121,57.411ZM48.377,58.021V56.021H50.26C51.082,56.021 51.86,55.858 52.569,55.564L53.335,57.411C52.388,57.804 51.349,58.021 50.26,58.021H48.377ZM58.293,36.807H56.293V34.924C56.293,34.102 56.13,33.323 55.836,32.615L57.684,31.849C58.077,32.796 58.293,33.834 58.293,34.924V36.807ZM37.079,26.89H35.197C34.107,26.89 33.069,27.107 32.121,27.5L32.888,29.347C33.596,29.053 34.375,28.89 35.197,28.89H37.079V26.89ZM27.163,48.104H29.163V49.987C29.163,50.809 29.326,51.588 29.62,52.296L27.772,53.062C27.38,52.115 27.163,51.076 27.163,49.987V48.104ZM27.163,44.338H29.163V40.572H27.163V44.338ZM27.163,36.807H29.163V34.924C29.163,34.102 29.326,33.323 29.62,32.615L27.772,31.849C27.38,32.796 27.163,33.834 27.163,34.924V36.807ZM40.845,26.89V28.89H44.611V26.89H40.845ZM48.377,26.89V28.89H50.26C51.082,28.89 51.86,29.053 52.569,29.347L53.335,27.5C52.388,27.107 51.349,26.89 50.26,26.89H48.377ZM58.293,40.572H56.293V44.338H58.293V40.572ZM58.293,48.104H56.293V49.987C56.293,50.809 56.13,51.588 55.836,52.296L57.684,53.062C58.077,52.115 58.293,51.076 58.293,49.987V48.104ZM44.611,58.021V56.021H40.845V58.021H44.611Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M112.487,40.426L112.875,38.464C113.41,38.569 113.964,38.625 114.533,38.625H116.99V40.625H114.533C113.833,40.625 113.149,40.556 112.487,40.426ZM131.733,40.625V38.625H134.191C134.76,38.625 135.314,38.569 135.848,38.464L136.237,40.426C135.575,40.556 134.891,40.625 134.191,40.625H131.733ZM140.016,38.859L138.903,37.197C139.829,36.577 140.627,35.78 141.247,34.854L142.909,35.966C142.143,37.11 141.159,38.094 140.016,38.859ZM144.674,12.941H142.674V10.484C142.674,9.915 142.619,9.361 142.513,8.826L144.475,8.438C144.606,9.1 144.674,9.784 144.674,10.484V12.941ZM142.909,4.659L141.247,5.772C140.627,4.845 139.829,4.048 138.903,3.428L140.016,1.766C141.159,2.531 142.143,3.516 142.909,4.659ZM116.99,0H114.533C113.833,0 113.149,0.069 112.487,0.2L112.875,2.162C113.41,2.056 113.964,2 114.533,2H116.99V0ZM108.708,1.766L109.821,3.428C108.895,4.048 108.097,4.845 107.477,5.772L105.815,4.659C106.581,3.516 107.565,2.531 108.708,1.766ZM104.049,27.684H106.049V30.141C106.049,30.71 106.105,31.264 106.211,31.799L104.249,32.187C104.118,31.525 104.049,30.841 104.049,30.141V27.684ZM105.815,35.966L107.477,34.854C108.097,35.78 108.895,36.577 109.821,37.197L108.708,38.859C107.565,38.094 106.581,37.11 105.815,35.966ZM104.049,22.77H106.049V17.855H104.049V22.77ZM104.049,12.941H106.049V10.484C106.049,9.915 106.105,9.361 106.211,8.826L104.249,8.438C104.118,9.1 104.049,9.784 104.049,10.484V12.941ZM121.905,0V2H126.819V0H121.905ZM131.733,0V2H134.191C134.76,2 135.314,2.056 135.848,2.162L136.237,0.2C135.575,0.069 134.891,0 134.191,0H131.733ZM144.674,17.855H142.674V22.77H144.674V17.855ZM144.674,27.684H142.674V30.141C142.674,30.71 142.619,31.264 142.513,31.799L144.475,32.187C144.606,31.525 144.674,30.841 144.674,30.141V27.684ZM126.819,40.625V38.625H121.905V40.625H126.819Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M183.397,81.99L184.163,80.143C184.902,80.449 185.714,80.619 186.57,80.619H188.513V82.619H186.57C185.446,82.619 184.375,82.396 183.397,81.99ZM200.171,82.619V80.619H202.114C202.97,80.619 203.782,80.449 204.521,80.143L205.287,81.99C204.309,82.396 203.238,82.619 202.114,82.619H200.171ZM210.403,60.729H208.403V58.787C208.403,57.93 208.233,57.118 207.927,56.38L209.774,55.613C210.18,56.591 210.403,57.663 210.403,58.787V60.729ZM188.513,50.497H186.57C185.446,50.497 184.375,50.721 183.397,51.126L184.163,52.973C184.902,52.667 185.714,52.497 186.57,52.497H188.513V50.497ZM178.281,72.387H180.281V74.33C180.281,75.186 180.451,75.998 180.757,76.737L178.91,77.503C178.504,76.525 178.281,75.454 178.281,74.33V72.387ZM178.281,68.501H180.281V64.615H178.281V68.501ZM178.281,60.729H180.281V58.787C180.281,57.93 180.451,57.118 180.757,56.38L178.91,55.613C178.504,56.591 178.281,57.663 178.281,58.787V60.729ZM192.399,50.497V52.497H196.285V50.497H192.399ZM200.171,50.497V52.497H202.114C202.97,52.497 203.782,52.667 204.521,52.973L205.287,51.126C204.309,50.721 203.238,50.497 202.114,50.497H200.171ZM210.403,64.615H208.403V68.501H210.403V64.615ZM210.403,72.387H208.403V74.33C208.403,75.186 208.233,75.998 207.927,76.737L209.774,77.503C210.18,76.525 210.403,75.454 210.403,74.33V72.387ZM196.285,82.619V80.619H192.399V82.619H196.285Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M188.271,180.562L188.659,178.6C189.316,178.73 189.996,178.798 190.694,178.798H192.633V180.798H190.694C189.865,180.798 189.055,180.717 188.271,180.562ZM212.029,180.798V178.798H213.968C214.666,178.798 215.346,178.73 216.003,178.6L216.391,180.562C215.607,180.717 214.797,180.798 213.968,180.798H212.029ZM220.865,178.708L219.753,177.046C220.889,176.285 221.868,175.306 222.629,174.17L224.291,175.282C223.384,176.636 222.219,177.801 220.865,178.708ZM226.381,147.05H224.381V145.111C224.381,144.413 224.313,143.733 224.183,143.077L226.145,142.688C226.3,143.472 226.381,144.282 226.381,145.111V147.05ZM224.291,138.214L222.629,139.327C221.868,138.19 220.889,137.211 219.753,136.451L220.865,134.789C222.219,135.695 223.384,136.86 224.291,138.214ZM192.633,132.698H190.694C189.865,132.698 189.055,132.779 188.271,132.934L188.659,134.896C189.316,134.766 189.996,134.698 190.694,134.698H192.633V132.698ZM183.797,134.789L184.91,136.451C183.773,137.211 182.794,138.19 182.033,139.327L180.372,138.214C181.278,136.86 182.443,135.695 183.797,134.789ZM178.281,166.446H180.281V168.385C180.281,169.083 180.349,169.763 180.479,170.42L178.517,170.808C178.362,170.024 178.281,169.214 178.281,168.385V166.446ZM180.372,175.282L182.033,174.17C182.794,175.306 183.773,176.285 184.91,177.046L183.797,178.708C182.443,177.801 181.278,176.636 180.372,175.282ZM178.281,162.567H180.281V158.688H178.281V162.567ZM178.281,154.809H180.281V150.93H178.281V154.809ZM178.281,147.05H180.281V145.111C180.281,144.413 180.349,143.733 180.479,143.077L178.517,142.688C178.362,143.472 178.281,144.282 178.281,145.111V147.05ZM196.512,132.698V134.698H200.392V132.698H196.512ZM204.271,132.698V134.698H208.15V132.698H204.271ZM212.029,132.698V134.698H213.968C214.666,134.698 215.346,134.766 216.003,134.896L216.391,132.934C215.607,132.779 214.797,132.698 213.968,132.698H212.029ZM226.381,150.93H224.381V154.809H226.381V150.93ZM226.381,158.688H224.381V162.567H226.381V158.688ZM226.381,166.446H224.381V168.385C224.381,169.083 224.313,169.763 224.183,170.42L226.145,170.808C226.3,170.024 226.381,169.214 226.381,168.385V166.446ZM208.15,180.798V178.798H204.271V180.798H208.15ZM200.392,180.798V178.798H196.512V180.798H200.392Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M40.389,175.457L41.155,173.609C41.934,173.932 42.789,174.111 43.692,174.111H45.713V176.111H43.692C42.522,176.111 41.406,175.878 40.389,175.457ZM57.845,176.111V174.111H59.867C60.769,174.111 61.625,173.932 62.403,173.609L63.169,175.457C62.152,175.878 61.037,176.111 59.867,176.111H57.845ZM68.494,153.33H66.494V151.309C66.494,150.406 66.315,149.551 65.992,148.772L67.84,148.006C68.261,149.023 68.494,150.139 68.494,151.309V153.33ZM45.713,142.682H43.692C42.522,142.682 41.406,142.914 40.389,143.336L41.155,145.184C41.934,144.861 42.789,144.682 43.692,144.682H45.713V142.682ZM35.064,165.462H37.064V167.484C37.064,168.386 37.244,169.242 37.567,170.02L35.719,170.786C35.297,169.769 35.064,168.654 35.064,167.484V165.462ZM35.064,161.418H37.064V157.374H35.064V161.418ZM35.064,153.33H37.064V151.309C37.064,150.406 37.244,149.551 37.567,148.772L35.719,148.006C35.297,149.023 35.064,150.139 35.064,151.309V153.33ZM49.757,142.682V144.682H53.801V142.682H49.757ZM57.845,142.682V144.682H59.867C60.769,144.682 61.625,144.861 62.403,145.184L63.169,143.336C62.152,142.914 61.037,142.682 59.867,142.682H57.845ZM68.494,157.374H66.494V161.418H68.494V157.374ZM68.494,165.462H66.494V167.484C66.494,168.386 66.315,169.242 65.992,170.02L67.84,170.786C68.261,169.769 68.494,168.654 68.494,167.484V165.462ZM53.801,176.111V174.111H49.757V176.111H53.801Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M2.84,110.802L3.606,108.954C3.91,109.081 4.245,109.151 4.601,109.151H6.758V111.151H4.601C3.977,111.151 3.383,111.027 2.84,110.802ZM11.072,111.151V109.151H13.229C13.585,109.151 13.92,109.081 14.224,108.954L14.99,110.802C14.448,111.027 13.853,111.151 13.229,111.151H11.072ZM17.83,100.079H15.83V97.922C15.83,97.566 15.76,97.231 15.634,96.927L17.481,96.161C17.706,96.703 17.83,97.298 17.83,97.922V100.079ZM6.758,93.321H4.601C3.977,93.321 3.383,93.445 2.84,93.67L3.606,95.518C3.91,95.392 4.245,95.321 4.601,95.321H6.758V93.321ZM0,104.393H2V106.55C2,106.906 2.071,107.241 2.197,107.545L0.349,108.311C0.124,107.769 0,107.174 0,106.55V104.393ZM0,100.079H2V97.922C2,97.566 2.071,97.231 2.197,96.927L0.349,96.161C0.124,96.703 0,97.298 0,97.922V100.079ZM11.072,93.321V95.321H13.229C13.585,95.321 13.92,95.392 14.224,95.518L14.99,93.67C14.448,93.445 13.853,93.321 13.229,93.321H11.072ZM17.83,104.393H15.83V106.55C15.83,106.906 15.76,107.241 15.634,107.545L17.481,108.311C17.706,107.769 17.83,107.174 17.83,106.55V104.393Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M114.745,202.969L115.511,201.122C115.815,201.248 116.149,201.318 116.506,201.318H118.663V203.318H116.506C115.882,203.318 115.287,203.194 114.745,202.969ZM122.977,203.318V201.318H125.133C125.49,201.318 125.825,201.248 126.129,201.122L126.895,202.969C126.352,203.194 125.757,203.318 125.133,203.318H122.977ZM129.735,192.246H127.735V190.09C127.735,189.733 127.664,189.398 127.538,189.094L129.386,188.328C129.611,188.871 129.735,189.466 129.735,190.09V192.246ZM118.663,185.488H116.506C115.882,185.488 115.287,185.612 114.745,185.837L115.511,187.685C115.815,187.559 116.149,187.488 116.506,187.488H118.663V185.488ZM111.905,196.56H113.905V198.717C113.905,199.074 113.975,199.408 114.101,199.712L112.254,200.478C112.029,199.936 111.905,199.341 111.905,198.717V196.56ZM111.905,192.246H113.905V190.09C113.905,189.733 113.975,189.398 114.101,189.094L112.254,188.328C112.029,188.871 111.905,189.466 111.905,190.09V192.246ZM122.977,185.488V187.488H125.133C125.49,187.488 125.825,187.559 126.129,187.685L126.895,185.837C126.352,185.612 125.757,185.488 125.133,185.488H122.977ZM129.735,196.56H127.735V198.717C127.735,199.074 127.664,199.408 127.538,199.712L129.386,200.478C129.611,199.936 129.735,199.341 129.735,198.717V196.56Z" />
-	<path
-		android:fillColor="#657D99"
-		android:pathData="M240.444,110.802L241.21,108.954C241.514,109.081 241.849,109.151 242.205,109.151H244.362V111.151H242.205C241.581,111.151 240.987,111.027 240.444,110.802ZM248.676,111.151V109.151H250.833C251.189,109.151 251.524,109.081 251.828,108.954L252.594,110.802C252.052,111.027 251.457,111.151 250.833,111.151H248.676ZM255.434,100.079H253.434V97.922C253.434,97.566 253.364,97.231 253.238,96.927L255.085,96.161C255.31,96.703 255.434,97.298 255.434,97.922V100.079ZM244.362,93.321H242.205C241.581,93.321 240.987,93.445 240.444,93.67L241.21,95.518C241.514,95.392 241.849,95.321 242.205,95.321H244.362V93.321ZM237.604,104.393H239.604V106.55C239.604,106.906 239.675,107.241 239.801,107.545L237.953,108.311C237.728,107.769 237.604,107.174 237.604,106.55V104.393ZM237.604,100.079H239.604V97.922C239.604,97.566 239.675,97.231 239.801,96.927L237.953,96.161C237.728,96.703 237.604,97.298 237.604,97.922V100.079ZM248.676,93.321V95.321H250.833C251.189,95.321 251.524,95.392 251.828,95.518L252.594,93.67C252.052,93.445 251.457,93.321 250.833,93.321H248.676ZM255.434,104.393H253.434V106.55C253.434,106.906 253.364,107.241 253.238,107.545L255.085,108.311C255.31,107.769 255.434,107.174 255.434,106.55V104.393Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M108.75,109.808V129.511C108.75,131.11 110.052,132.429 111.668,132.429H113.036C114.636,132.429 115.955,131.11 115.955,129.511V109.808H108.75V109.808Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M115.938,100.312V96.602C115.938,95.003 114.636,93.684 113.036,93.684H111.668C110.069,93.684 108.75,95.003 108.75,96.602V100.312H115.938V100.312Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M131.931,116.305V96.602C131.931,95.003 130.628,93.684 129.029,93.684H127.66C126.061,93.684 124.742,95.003 124.742,96.602V116.305H131.931V116.305Z" />
-	<path
-		android:fillColor="#87C214"
-		android:pathData="M124.742,125.801V129.511C124.742,131.11 126.061,132.429 127.66,132.429H129.029C130.628,132.429 131.947,131.11 131.947,129.511V125.801H124.742Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M107.595,117.459H103.886C102.286,117.459 100.967,118.761 100.967,120.377V121.746C100.967,123.345 102.27,124.664 103.886,124.664H107.595V117.459Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M136.795,117.459H117.092V124.664H136.795C138.394,124.664 139.713,123.345 139.713,121.746V120.377C139.713,118.761 138.394,117.459 136.795,117.459Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M123.588,101.466H103.886C102.286,101.466 100.967,102.769 100.967,104.385V105.753C100.967,107.352 102.27,108.671 103.886,108.671H123.588V101.466Z" />
-	<path
-		android:fillColor="#95D220"
-		android:pathData="M136.795,101.466H133.085V108.671H136.795C138.394,108.671 139.713,107.369 139.713,105.753V104.384C139.713,102.769 138.394,101.466 136.795,101.466Z" />
-</vector>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/feedList"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	app:emptyText="@string/blogs_rss_feeds_manage_empty_state"
-	app:scrollToEnd="false"
-	tools:listitem="@layout/list_item_rss_feed" />

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

@@ -47,19 +47,6 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/wifi1View" />
 
-		<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/wifi3View"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="6dp"
-			android:drawablePadding="6dp"
-			android:text="@string/hotspot_help_wifi_3"
-			app:drawableLeftCompat="@drawable/ic_circle_small"
-			app:drawableStartCompat="@drawable/ic_circle_small"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/wifi2View" />
-
 		<TextView
 			android:id="@+id/siteTitleView"
 			android:layout_width="0dp"
@@ -70,7 +57,7 @@
 			android:textStyle="bold"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/wifi3View" />
+			app:layout_constraintTop_toBottomOf="@+id/wifi2View" />
 
 		<TextView
 			android:id="@+id/site1View"

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

@@ -14,8 +14,8 @@
 
 		<ImageView
 			android:id="@+id/imageView"
-			android:layout_width="@dimen/hero_rect_width"
-			android:layout_height="@dimen/hero_rect_width"
+			android:layout_width="@dimen/hero_square"
+			android:layout_height="@dimen/hero_square"
 			android:layout_marginHorizontal="@dimen/margin_xlarge"
 			android:layout_marginTop="@dimen/margin_xlarge"
 			app:layout_constraintBottom_toTopOf="@+id/introView"
@@ -24,7 +24,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:layout_constraintVertical_bias="0.25"
 			app:layout_constraintVertical_chainStyle="packed"
-			app:srcCompat="@drawable/ic_share_app"
+			app:srcCompat="@drawable/ic_wifi_tethering"
 			tools:ignore="ContentDescription" />
 
 		<TextView

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

@@ -128,7 +128,7 @@
   <string name="ok">Добре</string>
   <string name="cancel">Отказ</string>
   <string name="got_it">Разбрах</string>
-  <string name="delete">Премахване</string>
+  <string name="delete">Изтриване</string>
   <string name="accept">Приемане</string>
   <string name="decline">Отказване</string>
   <string name="online">На линия</string>
@@ -190,7 +190,7 @@
   <string name="auto_delete_changed_warning_message_enabled">Откакто съставяте съобщението е бил включен механизмът за изчезващи съобщения.</string>
   <string name="auto_delete_changed_warning_message_disabled">Откакто съставяте съобщението е бил изключен механизмът за изчезващи съобщения.</string>
   <string name="auto_delete_changed_warning_send">Изпращане въпреки това</string>
-  <string name="delete_all_messages">Премахване на всички</string>
+  <string name="delete_all_messages">Изтриване на всички</string>
   <string name="dialog_title_delete_all_messages">Потвърждение на премахване на съобщение</string>
   <string name="dialog_message_delete_all_messages">Сигурни ли сте, че желаете всички съобщения да бъдат премахнати?</string>
   <string name="dialog_title_not_all_messages_deleted">Не премахнати съобщения</string>
@@ -238,7 +238,7 @@
   <string name="add_contact_remotely_title_case">Добавяне на контакт отдалечено</string>
   <string name="add_contact_nearby_title">Добавяне на контакт на живо</string>
   <string name="add_contact_remotely_title">Добавяне на контакт отдалечено</string>
-  <string name="contact_link_intro">Въведете препратката на контакта, когото добавяте</string>
+  <string name="contact_link_intro">Въведете препратката от вашия контакт</string>
   <string name="contact_link_hint">Препратка от контакт</string>
   <string name="paste_button">Поставяне</string>
   <string name="add_contact_button">Добавяне на контакт</string>
@@ -277,8 +277,8 @@
   </plurals>
   <string name="offline_state">Няма връзка с интернет.</string>
   <string name="duplicate_link_dialog_title">Дублираща се препратка</string>
-  <string name="duplicate_link_dialog_text_1">Вече има чакаща заявка за контакт с тази препратка: %s</string>
-  <string name="duplicate_link_dialog_text_1_contact">Вече има контакт с тази препратка: %s</string>
+  <string name="duplicate_link_dialog_text_1">Вече имате чакаща заявка за контакт с тази препратка: %s</string>
+  <string name="duplicate_link_dialog_text_1_contact">Вече имате контакт с тази препратка: %s</string>
   <!--This is a question asking whether two nicknames refer to the same person-->
   <string name="duplicate_link_dialog_text_2">%s и %s един и същи човек ли са?</string>
   <!--This is a button for answering that two nicknames do indeed refer to the same person. This
@@ -316,13 +316,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Свързване чрез Bluetooth</string>
   <string name="connect_via_bluetooth_title">Свързване чрез Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">В случай, че връзка чрез Bluetooth не се установява автоматично можете да използвате този екран, за да се свържете ръчно.\n\nВие и контакта трябва да бъдете близо един до друг.\n\nДвамата трябва да докоснете бутона „Старт“ едновременно.</string>
-  <string name="connect_via_bluetooth_already_discovering">Осъществява св връзка през Bluetooth. По-късно опитайте отново.</string>
   <string name="connect_via_bluetooth_no_location_permission">Не може да продължи без разрешение за местоположение</string>
   <string name="connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
-  <string name="connect_via_bluetooth_success">Успешно е създaдена връзка чрез Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Не може да бъде установена връзка чрез Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth не се поддържа от устройството.</string>
+  <string name="connect_via_bluetooth_success">Успешно свързване чрез Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Няма групи</string>
   <string name="groups_list_empty_action">Докоснете иконата с +, за да създадете своя или поискайте от контактите си да споделят група с вас</string>
@@ -438,7 +434,7 @@
   <string name="blogs_blog_post_received">Получена е нова публикация в блога</string>
   <string name="blogs_blog_post_scroll_to">Плъзване до нея</string>
   <string name="blogs_feed_empty_state">Няма публикации</string>
-  <string name="blogs_feed_empty_state_action">Тук се показват публикациите от вашите контакти и блоговете, за които имате абонамент.\n\nЗа да направите вие публикация, докоснете иконата на писалка.</string>
+  <string name="blogs_feed_empty_state_action">Публикации от вашите контакти и абонираните блогове се показват тук.\n\nДокоснете иконата на писалка, за да направите публикация.</string>
   <string name="blogs_remove_blog">Премахване на блог</string>
   <string name="blogs_remove_blog_dialog_message">Сигурни ли сте, че желаете да премахнете блога?\n\nПубликациите ще бъдат премахнати от устройството ви, но не и от устройствата на другите хора.\n\nКонтактите, с които сте споделили този блог може да спрат да получават обновявания.</string>
   <string name="blogs_remove_blog_ok">Премахване</string>
@@ -514,7 +510,7 @@
   <string name="pref_lock_disabled_summary">За да се възползвате от тази възможност, настройте заключване на екрана</string>
   <string name="pref_lock_timeout_title">Заключване при бездействие</string>
   <!--The %s placeholder is replaced with the following time spans, e.g. 5 Minutes, 1 Hour-->
-  <string name="pref_lock_timeout_summary">При неактивност Briar автоматично се заключав след %s</string>
+  <string name="pref_lock_timeout_summary">Briar се изключва автоматично при неактивност от %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 минута</string>
   <!--Will be shown in a list of lock times. Should fit into the %s of "automatically lock it after %s"-->
@@ -543,9 +539,9 @@
   <string name="dialog_message_connect_panic_app">Сигурни ли сте, че желаете да позволите на %1$s да задейства разрушителните действия на бутона за паника?</string>
   <string name="panic_setting_destructive_action">Разрушителни действия</string>
   <string name="panic_setting_signout_title">Отписване</string>
-  <string name="panic_setting_signout_summary">Отписване от Briar при задействан бутон за паника</string>
-  <string name="purge_setting_title">Премахване на профил</string>
-  <string name="purge_setting_summary">Профилът на Briar се изтрива при задействане на бутона за паника. Внимание: Изтрива безвъзвратно профила, контактите и съобщенията</string>
+  <string name="panic_setting_signout_summary">Отписване от Briar при натиснат бутон за паника</string>
+  <string name="purge_setting_title">Изтриване на профил</string>
+  <string name="purge_setting_summary">Профила на Briar се изтрива при натиснат бутон за паника. Внимание: Изтрива безвъзвратно профила, контактите и съобщенията</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">Известия</string>
   <string name="notify_sign_in_title">Напомняне за вписване</string>
@@ -559,8 +555,8 @@
   <string name="notify_forum_posts_setting_title">Публикации във форуми</string>
   <string name="notify_forum_posts_setting_summary">Известия за публикации във форуми</string>
   <string name="notify_forum_posts_setting_summary_26">Настройки на известия за публикации във форуми</string>
-  <string name="notify_blog_posts_setting_title">Публикации в блогове</string>
-  <string name="notify_blog_posts_setting_summary">Известия за публикации в блогове</string>
+  <string name="notify_blog_posts_setting_title">Публикации в блог</string>
+  <string name="notify_blog_posts_setting_summary">Известия за публикации в блог</string>
   <string name="notify_blog_posts_setting_summary_26">Настройки на известия за публикации в блог</string>
   <string name="notify_vibration_setting">Вибрация</string>
   <string name="notify_sound_setting">Звук</string>
@@ -579,7 +575,7 @@
   <string name="disappearing_messages_summary">Бъдещите съобщения в разговора изчезват след 7\u00A0дни</string>
   <!--Settings Actions-->
   <string name="pref_category_actions">Действия</string>
-  <string name="send_feedback">Изпращане на обратна връзка</string>
+  <string name="send_feedback">Изпращане на отзив</string>
   <!--Link Warning-->
   <string name="link_warning_title">Предупреждение за препратка</string>
   <string name="link_warning_intro">Препратката ще бъде отворена от външно приложение.</string>
@@ -587,7 +583,6 @@
   <string name="link_warning_open_link">Отваряне</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Доклад на срив</string>
-  <string name="briar_crashed">Съжаляваме, Briar се срина</string>
   <string name="not_your_fault">Не е по ваша вина.</string>
   <string name="please_send_report">Помогнете да направим Briar по-добър като ни изпратите доклад.</string>
   <string name="report_is_encrypted">Обещаваме, че докладът е ще бъде изпратен шифрован и добре защитен.</string>
@@ -646,44 +641,16 @@
   <!--Connections Screen-->
   <string name="transports_help_text">Briar може да се свърже с контактите ви през интернет, Wi-Fi или Bluetooth.\n\nЗа повече поверителност цялата връзка към интернет се пренасочва през мрежата на Tor.\n\nАко даден контакт може да бъде достъпен чрез няколко метода Briar ги използва успоредно.</string>
   <!--Share app offline-->
-  <string name="hotspot_title">Споделяне на приложението извън мрежа</string>
-  <string name="hotspot_intro">Споделете приложението с някого около вас без достъп до интернет с използване на Wi-Fi на устройствата.
-\n\nВашето устройство създава безжична точка за достъп. Хората около вас биха могли да се свържат към нея и да изтеглят Briar от вашето устройство.</string>
-  <string name="hotspot_button_start_sharing">Включване на безжична точка</string>
-  <string name="hotspot_button_stop_sharing">Спиране на безжична точка</string>
-  <string name="hotspot_progress_text_start">Настройване на безжична точка…</string>
-  <string name="hotspot_notification_channel_title">Безжична точка за достъп</string>
-  <string name="hotspot_notification_title">Споделяне на Briar извън мрежа</string>
   <string name="hotspot_button_connected">Напред</string>
-  <string name="permission_hotspot_location_request_body">За да създаде безжична точка за достъп, на Briar му е необходимо разрешение за достъп до местоположението.\n\nBriar не го пази и не го споделя с никого.</string>
-  <string name="permission_hotspot_location_denied_body">Отказахте достъп до местоположението, но то е необходимо за създаване на безжична точка за достъп.\n\nОбмислете дали да не дадете разрешение.</string>
-  <string name="wifi_settings_title">Настройки на Wi-Fi</string>
-  <string name="wifi_settings_request_enable_body">За създаване на безжична точка за достъп Briar се нуждае от Wi-Fi. Включете го.</string>
   <string name="hotspot_tab_manual">Ръчно</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">като сканират код за QR</string>
   <!--Wi-Fi setup-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Устройството ви създава безжична точка за достъп. Хората, които желаят да изтеглят Briar могат да се свържат към нея като добавят в настройките за Wi-Fi на техните устройства параметрите по-долу или %s. Когато те се свържат към точката за достъп натиснете „Напред“.</string>
   <string name="hotspot_manual_wifi_ssid">Наименование на мрежата</string>
-  <string name="hotspot_qr_wifi">Устройството ви създава безжична точка за достъп. Хората, които желаят да изтеглят Briar могат да се свържат към нея като сканират този код за QR. Когато те се свържат към точката за достъп натиснете „Напред“.</string>
-  <string name="hotspot_no_peers_connected">Няма свързани устройства</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s свързано устройства</item>
-    <item quantity="other">%s свързани устройства</item>
-  </plurals>
   <!--Download link-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Устройството ви създава безжична точка за достъп. Хората, които са свързани към нея могат да изтеглят Briar от следния адрес или %s.</string>
-  <string name="hotspot_manual_site_address">Адрес (URL)</string>
-  <string name="hotspot_qr_site">Устройството ви създава безжична точка за достъп. Хората, които са свързани към нея могат да изтеглят Briar като сканират този код за QR.</string>
   <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Изтеглете %s</string>
-  <string name="website_download_intro">Някой наблизо споделя с вас %s.</string>
-  <string name="website_download_outro">След като файлът се изтегли, отворете го и го инсталирайте.</string>
   <string name="website_troubleshooting_title">Отстраняване на неизправности</string>
-  <string name="website_troubleshooting_1">Ако не можете да изтеглите приложението пробвайте с друг мрежов четец.</string>
-  <string name="hotspot_help_fallback_title">Нищо не става?</string>
   <!--error handling-->
   <!--Transfer Data via Removable Drives-->
   <string name="removable_drive_title_send">Изпращане на сведения</string>

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

@@ -712,9 +712,6 @@
   <string name="hotspot_flag_test">Warnung: Diese App wurde mit Android Studio installiert und kann NICHT auf einem anderen Gerät installiert werden.</string>
   <string name="hotspot_error_framework_busy">Hotspot kann nicht gestartet werden.\n\nWenn du einen anderen Hotspot betreibst oder deine Internetverbindung über WLAN teilst, beende dies und versuche es danach erneut.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Über Wechseldatenträger verbinden</string>
-  <string name="removable_drive_intro">Wenn du keine Verbindung zu deinem Kontakt über das Internet, WLAN oder Bluetooth herstellen kannst, kann Briar auch Nachrichten auf einem Wechseldatenträger wie einem USB-Stick oder einer SD-Karte übertragen.</string>
-  <string name="removable_drive_explanation">Wenn du keine Verbindung zu deinem Kontakt über das Internet, WLAN oder Bluetooth herstellen kannst, kann Briar auch Nachrichten auf einem Wechseldatenträger wie einem USB-Stick oder einer SD-Karte übertragen.n\nWenn du die Schaltfläche \"Daten senden\" verwendest, werden alle Daten, die darauf warten, an den Kontakt gesendet zu werden, auf den Wechseldatenträger geschrieben. Dazu gehören private Nachrichten, Anhänge, Blogs, Foren und private Gruppen.\n\nAlles wird verschlüsselt, bevor es auf den Wechseldatenträger geschrieben wird.\n\nWenn dein Kontakt den Wechseldatenträger erhält, kann er die Schaltfläche \"Daten empfangen\" verwenden, um die Nachrichten in Briar zu importieren.</string>
   <string name="removable_drive_title_send">Daten senden</string>
   <string name="removable_drive_title_receive">Daten empfangen</string>
   <string name="removable_drive_send_intro">Tippe auf die Schaltfläche unten, um eine neue Datei mit den verschlüsselten Nachrichten zu erstellen. Du kannst wählen, wo die Datei gespeichert werden soll.\n\nWenn du die Datei auf einem Wechsellaufwerk speichern möchtest, lege das Laufwerk jetzt ein.</string>

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

@@ -316,13 +316,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Conectar mediante Bluetooth</string>
   <string name="connect_via_bluetooth_title">Conectar mediante Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">En el caso que las conexiones Bluetooth no funcionen automáticamente, puedes usar esta pantalla para conectarte manualmente.\n\nTu contacto necesita estar cerca para que esto funcione.\n\nAmbos deberían presionar \"Inicio\" al mismo tiempo.</string>
-  <string name="connect_via_bluetooth_already_discovering">Ya se está intentando conectar vía Bluetooth. Por favor inténtalo de nuevo en unos segundos.</string>
   <string name="connect_via_bluetooth_no_location_permission">No se puede continuar sin permiso de ubicación</string>
   <string name="connect_via_bluetooth_start">Conectar mediante Bluetooth...</string>
   <string name="connect_via_bluetooth_success">Conectado exitosamente mediante Bluetooth</string>
-  <string name="connect_via_bluetooth_error">No se pudo conectar mediante Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Este dispositivo no soporta Bluetooth.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">No hay grupos para mostrar</string>
   <string name="groups_list_empty_action">Golpea el icono + para crear un grupo, o pregunta a tus contactos si quieren compartir grupos contigo</string>
@@ -662,77 +658,19 @@
   <string name="permission_hotspot_location_request_body">Para crear un punto de acceso Wi-Fi, Briar necesita permiso para acceder tu ubicación.\n\nBriar no la almacena o la comparte con nadie.</string>
   <string name="permission_hotspot_location_denied_body">Has denegado el acceso a tu ubicación, pero Briar necesita este permiso para crear un punto de acceso Wi-Fi.\n\nPor favor considera la posibilidad de conceder el acceso.</string>
   <string name="wifi_settings_title">Configuración de Wi-Fi</string>
-  <string name="wifi_settings_request_enable_body">Para crear un punto de acceso Wi-Fi, Briar necesita usar Wi-Fi. Por favor habilítalo.</string>
   <string name="hotspot_tab_manual">Manual</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">escaneando un código QR</string>
   <!--Wi-Fi setup-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que quieran descargar Briar pueden conectarse al punto de acceso agregándolo en la configuración de Wi-Fi de sus dispositivos, usando los detalles de abajo o mediante %s. Una vez que se hayan conectado al punto de acceso, presiona \'Siguiente\'.</string>
   <string name="hotspot_manual_wifi_ssid">Nombre de red</string>
-  <string name="hotspot_qr_wifi">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que quieran descargar Briar pueden conectarse al punto de acceso escaneando este código QR. Una vez que se hayan conectado al punto de acceso, presiona \'Siguiente\'.</string>
   <string name="hotspot_no_peers_connected">No hay dispositivos conectados</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s dispositivo conectado</item>
-    <item quantity="other">%s dispositivos conectados</item>
-  </plurals>
   <!--Download link-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que están conectadas al mismo pueden descargar Briar tipeando el siguiente vínculo en un navegador web o %s.</string>
-  <string name="hotspot_manual_site_address">Dirección (URL)</string>
-  <string name="hotspot_qr_site">Tu teléfono está proporcionando un punto de acceso Wi-Fi. Las personas que están conectadas al mismo pueden descargar Briar escaneando este código QR.</string>
   <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Descargar %s</string>
-  <string name="website_download_intro">Alguien en las cercanías compartió %s contigo.</string>
-  <string name="website_download_outro">Luego de que la descarga se complete, abre el archivo descargado e instálalo.</string>
   <string name="website_troubleshooting_title">Resolución de problemas</string>
-  <string name="website_troubleshooting_1">Si no puedes descargar la aplicación, inténtalo con una aplicación de navegación web diferente.</string>
-  <string name="website_troubleshooting_2_old">Para instalar la aplicación descargada, podrías necesitar permitir la instalación de aplicaciones desde \"Fuentes desconocidas\" en la configuración del sistema. Con posterioridad, podrías necesitar descargar la aplicación de nuevo. Te recomendamos deshabilitar el ajuste \"Fuentes desconocidas\" después de instalar la aplicación.</string>
-  <string name="website_troubleshooting_2_new">Para instalar la aplicación descargada, podrías necesitar permitirle a tu navegador instalar aplicaciones desconocidas. Luego de instalar la aplicación, recomendamos remover el permiso del navegador para este tipo de instalaciones.</string>
-  <string name="hotspot_help_wifi_title">Problemas para conectar al Wi-Fi:</string>
-  <string name="hotspot_help_wifi_1">Intenta deshabilitar y rehabilitar el Wi-Fi en ambos teléfonos, e intenta de nuevo.</string>
-  <string name="hotspot_help_wifi_2">Si tu teléfono se queja de que el Wi-Fi no tiene Internet, dile que quieres permanecer conectado de todos modos.</string>
-  <string name="hotspot_help_wifi_3">Reinicia el teléfono que está ejecutando el punto de acceso Wi-Fi, luego inicia Briar e intenta compartir de nuevo.</string>
-  <string name="hotspot_help_site_title">Problemas visitando al sitio web local:</string>
-  <string name="hotspot_help_site_1">Comprueba doblemente que hayas entrado la dirección exactamente como se muestra. Un pequeño error puede hacer que falle.</string>
-  <string name="hotspot_help_site_2">Asegúrate de que tu teléfono aún esté conectado al Wi-Fi correcto (ver arriba) cuando intentes acceder al sitio.</string>
-  <string name="hotspot_help_site_3">Si tienes una aplicación de cortafuegos, comprueba que no esté bloqueando el acceso.</string>
-  <string name="hotspot_help_site_4">Si puedes visitar el sitio, pero no descargar la aplicación Briar, inténtalo con una aplicación de navegación web diferente.</string>
-  <string name="hotspot_help_fallback_title">¿Nada funciona?</string>
-  <string name="hotspot_help_fallback_intro">Puedes intentar guardar la aplicación como archivo .apk para compartir de cualquier otra manera. Una vez que el archivo ha sido transferido al otro dispositivo, puede ser usado para instalar Briar.
-		\n\nConsejo: Para compartir vía Bluetooth, primero podrías necesitar renombrar al archivo para que finalice con .zip.</string>
-  <string name="hotspot_help_fallback_button">Guardar aplicación</string>
   <!--error handling-->
-  <string name="hotspot_error_intro">Algo salió mal mientras se intentaba compartir la aplicación vía Wi-Fi:</string>
-  <string name="hotspot_error_no_wifi_direct">El dispositivo no soporta Wi-Fi Direct</string>
-  <string name="hotspot_error_start_callback_failed">Fallo al iniciar punto de acceso: error %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">El punto de acceso falló al iniciar con un error desconocido, la razón es %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Fallo al iniciar punto de acceso: no hay información de grupo</string>
-  <string name="hotspot_error_web_server_start">Error al iniciar el servidor web</string>
-  <string name="hotspot_error_web_server_serve">Error al presentar el sitio web.\n\nPor favor, envía tus comentarios (con datos anónimos) a través de la aplicación Briar si la dificultad persiste.</string>
-  <string name="hotspot_flag_test">Advertencia: Esta aplicación fue instalada con Android Studio, y NO puede ser instalada en otro dispositivo.</string>
-  <string name="hotspot_error_framework_busy">Incapaz de iniciar el punto de acceso.\n\nSi tienes otro punto de acceso ejecutándose o estás compartiendo tu conexión de Internet vía Wi-Fi, intenta detener eso e intentar de nuevo luego.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Conectar a través de Discos Removibles</string>
-  <string name="removable_drive_intro">Si no puedes conectarte con tu contacto vía Internet, Wi-Fi o Bluetooth, Briar también puede transferir mensajes en un disco removible, tal como una memoria USB o tarjeta SD.</string>
-  <string name="removable_drive_explanation">Si no puedes conectarte con tu contacto vía Internet, Wi-Fi o Bluetooth, Briar también puede transferir mensajes en un disco removible, tal como una memoria USB o tarjeta SD.\n\nCuando usas el botón \"Enviar Datos\", cualesquiera datos que estén esperando ser enviados al contacto serán escritos al disco removible. Esto incluye mensajes privados, adjuntos, blogs, foros y grupos privados.\n\nTodo será cifrado antes de que sea escrito al disco removible.\n\nCuando tu contacto reciba el disco removible, puede usar el botón \"Recibir Datos\" para importar los mensajes dentro de Briar.</string>
-  <string name="removable_drive_title_send">Enviar Datos</string>
-  <string name="removable_drive_title_receive">Recibir Datos</string>
-  <string name="removable_drive_send_intro">Pulsa el botón de abajo para crear un nuevo archivo conteniendo los mensajes cifrados. Puedes elegir dónde será guardado el archivo.\n\nSi quieres guardarlo en un disco removible, insértalo ahora.</string>
-  <string name="removable_drive_send_no_data">Actualmente no hay mensajes esperando ser enviados a este contacto.</string>
-  <string name="removable_drive_send_not_supported">Este contacto está usando una versión vieja de Briar, o un dispositivo viejo que no soporta esta característica.</string>
-  <string name="removable_drive_send_button">Selecciona el archivo a exportar</string>
-  <string name="removable_drive_ongoing">Por favor espera hasta que la tarea en curso se complete</string>
-  <string name="removable_drive_receive_intro">Pulsa el botón de abajo para elegir el archivo que envió tu contacto.\n\nSi el archivo está en un disco removible, insértalo ahora.</string>
-  <string name="removable_drive_receive_button">Selecciona el archivo a importar</string>
-  <string name="removable_drive_success_send_title">Exportado con éxito</string>
-  <string name="removable_drive_success_send_text">Datos exportados exitosamente. Ahora tienes 28 días para transportar el archivo hasta tu contacto.\n\nSi el archivo está en un disco removible, usa la notificación en la barra de estado para expulsar el disco antes de desconectarlo.</string>
   <string name="removable_drive_success_receive_title">Importado con éxito</string>
-  <string name="removable_drive_success_receive_text">Todos los mensajes cifrados contenidos en este archivo han sido recibidos.</string>
-  <string name="removable_drive_error_send_title">Error al exportar datos</string>
-  <string name="removable_drive_error_send_text">Hubo un error escribiendo los datos al archivo.\n\nSi estás usando un disco removible, asegúrate de que esté apropiadamente insertado e inténtalo de nuevo.\n\nSi el error persiste, por favor envía tus comentarios para que el equipo de Briar conozca acerca de esta dificultad.</string>
-  <string name="removable_drive_error_receive_title">Error al importar datos</string>
-  <string name="removable_drive_error_receive_text">El archivo seleccionado no contenía nada que Briar pudiera reconocer.\n\nPor favor comprueba que hayas elegido el archivo correcto.\n\nSi tu contacto creó el archivo más de 28 días atrás, Briar no será capaz de reconocerlo.</string>
   <!--Screenshots-->
   <!--This is a name to be used in screenshots. Feel free to change it to a local name.-->
   <string name="screenshot_alice">Alicia</string>

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

@@ -20,16 +20,12 @@
   <string name="more_info">Nánari upplýsingar</string>
   <string name="don_t_ask_again">Ekki spyrja aftur</string>
   <string name="setup_huawei_text">Ýttu á hnappinn hér fyrir neðan og gakktu úr skugga um að Briar sé varið á skjánum \"Varin forrit\".</string>
-  <string name="setup_huawei_button">Vernda Briar</string>
+  <string name="setup_huawei_button">Verja Briar</string>
   <string name="setup_huawei_help">Ef Briar er ekki bætt á listann yfir varin forrit, getur það ekki keyrt í bakgrunni.</string>
   <string name="setup_huawei_app_launch_text">Ýttu á hnappinn hér fyrir neðan, opnaðu \"Ræsing forrits\" skjáinn og gakktu úr skugga um að Briar sé stillt á \"Stýra handvirkt\".</string>
   <string name="setup_huawei_app_launch_button">Opna rafhlöðustillingar</string>
   <string name="setup_huawei_app_launch_help">Ef Briar er ekki stillt á \"Stýra handvirkt\" í \"Ræsing forrits\" skjánum, mun það ekki geta keyrt í bakgrunni.</string>
-  <string name="setup_xiaomi_text">Til að keyra í bakgrunni þarf Briar að vera læst við listann yfir nýleg forrit.</string>
-  <string name="setup_xiaomi_button">Vernda Briar</string>
-  <string name="setup_xiaomi_help">Ef Briar er ekki læst við listann yfir nýleg forrit, mun það ekki geta keyrt í bakgrunni.</string>
-  <string name="setup_xiaomi_dialog_body_old">1. Opnaðu listann yfir nýleg forrit (einnig kallað forritaskiptir)\n\n2. Strjúktu niður myndina af Briar til að birta hengilástáknið\n\n3. Ef hengilásinn er ekki læstur, ýttu á hann til að læsa</string>
-  <string name="setup_xiaomi_dialog_body_new">1. Opnaðu listann yfir nýleg forrit (einnig kallað forritaskiptir)\n\n2. Ýttu og haltu niðri á myndina af Briar til að birta hengiláshnappinn\n\n3. Ef hengilásinn er ekki læstur, ýttu á hann til að læsa</string>
+  <string name="setup_xiaomi_button">Verja Briar</string>
   <string name="warning_dozed">%s gat ekki keyrt í bakgrunni</string>
   <!--Login-->
   <string name="enter_password">Lykilorð</string>
@@ -41,9 +37,6 @@
   <string name="dialog_title_lost_password">Týnt lykilorð</string>
   <string name="dialog_message_lost_password">Notandaaðgangur þinn í Briar er geymdur dulritaður á tækinu þínu, ekki í tölvuskýi, þannig að við getum ekki endurstillt lykilorðið þitt. Myndirðu vilja eyða notandaaðgangnum þínum og byrja aftur?\n\nVarúð: Auðkennin þín, tengiliðir og skilaboð munu tapast óendurkræft.</string>
   <string name="startup_failed_activity_title">Bilun í ræsingu Briar</string>
-  <string name="startup_failed_clock_error">Briar gat ekki farið af stað því klukka tækisins þíns er ekki rétt stillt.\n\nLeiðréttu klukku tækisins og prófaðu síðan aftur.</string>
-  <string name="startup_failed_data_too_old_error">Notandaaðgangurinn þinn var útbúinn með eldri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\Þú þarft annað hvort að setja gömlu útgáfuna upp aftur, eða setja upp nýjan notandaaðgang með því að velja \'Ég hef gleymt lykilorðinu mínu\' þegar beðið er um lykilorð.</string>
-  <string name="startup_failed_data_too_new_error">Notandaaðgangurinn þinn var útbúinn með nýrri útgáfu forritsins og er ekki hægt að opna hann með þessari útgáfu.\n\Þú þarft að setja upp nýjustu útgáfuna og prófa svo aftur.</string>
   <plurals name="expiry_warning">
     <item quantity="one">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d dag og er ekki hægt að endurnýja hann.</item>
     <item quantity="other">Þetta er prufuútgáfa af Briar. Notandaaðgangurinn þinn mun renna út eftir %d daga og er ekki hægt að endurnýja hann.</item>
@@ -314,12 +307,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
   <string name="connect_via_bluetooth_title">Tengjast í gegnum Bluetooth</string>
-  <string name="connect_via_bluetooth_already_discovering">Er þegar að reyna að tengjast með Bluetooth. Prófaðu aftur eftir dálitla stund.</string>
   <string name="connect_via_bluetooth_no_location_permission">Get ekki haldið áfram án heimildar til að nota staðsetningu</string>
   <string name="connect_via_bluetooth_start">Tengist í gegnum Bluetooth…</string>
   <string name="connect_via_bluetooth_success">Tókst að tengjast í gegnum Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Gat ekki tengst í gegnum Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth er ekki stutt af tækinu.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Engir hópar sem hægt er að birta</string>
   <string name="groups_list_empty_action">Ýttu á + táknið til að útbúa hóp, eða biddu tengiliðina þína um að deila hópi með þér</string>
@@ -579,7 +569,6 @@
   <string name="learn_more">Fræðast frekar</string>
   <string name="disappearing_messages_summary">Láta öll frekari skilaboð í þessu samtali hverfa sjálfkrafa eftir 7\u00A0daga.</string>
   <!--Settings Actions-->
-  <string name="pref_category_actions">Aðgerðir</string>
   <string name="send_feedback">Senda umsögn</string>
   <!--Link Warning-->
   <string name="link_warning_title">Aðvörun vegna tengils</string>
@@ -588,7 +577,6 @@
   <string name="link_warning_open_link">Opna tengil</string>
   <!--Crash Reporter-->
   <string name="crash_report_title">Hrunskýrsla fyrir Briar</string>
-  <string name="briar_crashed">Því miður, Briar hefur hrunið</string>
   <string name="not_your_fault">Það er ekki þér að kenna.</string>
   <string name="please_send_report">Hjálpaðu okkur við að bæta Briar með því að senda okkur hrunskýrslu.</string>
   <string name="report_is_encrypted">Við lofum að skýrslan sé dulrituð og send á öruggan máta.</string>
@@ -647,64 +635,16 @@
   <!--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>
   <!--Share app offline-->
-  <string name="hotspot_title">Deila þessu forriti án nettengingar</string>
-  <string name="hotspot_button_start_sharing">Ræsa tengipunkt</string>
-  <string name="hotspot_button_stop_sharing">Stöðva tengipunkt</string>
-  <string name="hotspot_progress_text_start">Set upp tengipunkt…</string>
-  <string name="hotspot_notification_channel_title">Þráðlaus Wi-Fi tengipunktur</string>
-  <string name="hotspot_notification_title">Deiling Briar án nettengingar</string>
   <string name="hotspot_button_connected">Næsta</string>
-  <string name="permission_hotspot_location_request_body">Til að útbúa Wi-Fi-aðgangsstað, þarf Briar heimild til að nota staðsetningu þína.\n\nBriar geymir ekki staðsetningar eða deilir þeim með neinum.</string>
-  <string name="permission_hotspot_location_denied_body">Þú hefur hafnað aðgangi að staðsetningu, en Briar þarf þessa heimild til að geta útbúið Wi-Fi-aðgangsstað.\n\nÍhugaðu að veita þennan aðgang.</string>
-  <string name="wifi_settings_title">Wi-Fi-stillingar</string>
-  <string name="wifi_settings_request_enable_body">Til að útbúa Wi-Fi aðgangsstað þarf Briar að nota Wi-Fi. Virkjaðu það.</string>
-  <string name="hotspot_tab_manual">Handvirk</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
-  <string name="hotspot_scanning_a_qr_code">skönnun QR-kóða</string>
   <!--Wi-Fi setup-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_wifi_ssid">Heiti netkerfis</string>
-  <string name="hotspot_no_peers_connected">Engin tæki tengd</string>
-  <plurals name="hotspot_peers_connected">
-    <item quantity="one">%s tæki tengt</item>
-    <item quantity="other">%s tæki tengd</item>
-  </plurals>
   <!--Download link-->
   <!--The %s placeholder will be replaced with the translation of 'hotspot_scanning_a_qr_code'-->
-  <string name="hotspot_manual_site_address">Vistfang (URL)</string>
   <!--e.g. Download Briar 1.2.20-->
-  <string name="website_download_title">Sækja %s</string>
-  <string name="website_download_intro">Einhver í nágrenninu hefur deilt %s með þér.</string>
-  <string name="website_download_outro">Eftir að niðurhalinu er lokið, skaltu opna sóttu skrána og setja hana upp.</string>
   <string name="website_troubleshooting_title">Lausn á vandamálum</string>
-  <string name="website_troubleshooting_1">Ef þú getur ekki sótt forritið, ættirðu að prófa það með öðrum vafra.</string>
-  <string name="hotspot_help_wifi_title">Vandamál við að tengjast við Wi-Fi:</string>
-  <string name="hotspot_help_wifi_1">Prófaðu að gera Wi-Fi óvirkt og virkja það aftur á báðum símunum og reyndu svo aftur.</string>
-  <string name="hotspot_help_site_title">Vandamál við að skoða staðvært vefsvæði:</string>
-  <string name="hotspot_help_site_3">Ef þú ert með eldveggjarhugbúnað í gangi, skaltu vera viss um að það sé ekki að loka fyrir aðgang.</string>
-  <string name="hotspot_help_site_4">Ef þú getur skoðað vefsvæðið en ekki sótt Briar-forritið, ættirðu að prófa það með öðrum vafra.</string>
-  <string name="hotspot_help_fallback_title">Virkar ekkert?</string>
-  <string name="hotspot_help_fallback_button">Vista forrit</string>
   <!--error handling-->
-  <string name="hotspot_error_intro">Eitthvað fór úrskeiðis þegar reynt var að deila forritinu með Wi-Fi:</string>
-  <string name="hotspot_error_no_wifi_direct">Þetta tæki styður ekki beint Wi-Fi samband.</string>
-  <string name="hotspot_error_start_callback_failed">Tengipunktur ræstist ekki: villa %s</string>
-  <string name="hotspot_error_start_callback_failed_unknown">Tengipunktur ræstist ekki vegna óþekktrar villu, ástæðan er %d</string>
-  <string name="hotspot_error_start_callback_no_group_info">Tengipunktur ræstist ekki: engar hópupplýsingar</string>
-  <string name="hotspot_error_web_server_start">Villa við að ræsa vefþjón</string>
-  <string name="hotspot_flag_test">Aðvörun: Þetta forrit var sett upp með Android Studio og er EKKI hægt að setja upp á öðru tæki.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Tengjast í gegnum útskiptanlegt drif</string>
-  <string name="removable_drive_title_send">Senda gögn</string>
-  <string name="removable_drive_title_receive">Taka við gögnum</string>
-  <string name="removable_drive_send_button">Veldu skrá til að flytja út</string>
-  <string name="removable_drive_ongoing">Bíddu eftir að verk sem er í gangi klárist</string>
-  <string name="removable_drive_receive_intro">Ýttu á hnappinn hér fyrir neðan til að velja skrána sem tengiliðurinn sendi þér.\n\nEf skráin er á útskiptanlegu drifi, skaltu tengja það núna.</string>
-  <string name="removable_drive_receive_button">Veldu skrá til að flytja inn</string>
-  <string name="removable_drive_success_send_title">Útflutningur tókst</string>
-  <string name="removable_drive_success_receive_title">Innflutningur tókst</string>
-  <string name="removable_drive_error_send_title">Villa við útflutning gagna</string>
-  <string name="removable_drive_error_receive_title">Villa í innflutningi gagna</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-it/strings.xml

@@ -692,7 +692,6 @@
   <string name="hotspot_help_wifi_title">Problemi di connessione al Wi-Fi:</string>
   <string name="hotspot_help_wifi_1">Prova a disattivare e riattivare il Wi-Fi su entrambi i telefoni e riprova.</string>
   <string name="hotspot_help_wifi_2">Se il telefono ti segnala che il Wi-Fi non ha internet, digli che vuoi restare comunque connesso.</string>
-  <string name="hotspot_help_wifi_3">Riavvia il telefono su cui è in esecuzione l\'hotspot Wi-Fi, poi avvia Briar e riprova a condividere.</string>
   <string name="hotspot_help_site_title">Problemi visitando il sito web locale:</string>
   <string name="hotspot_help_site_1">Controlla di avere inserito l\'indirizzo esattamente come mostrato. Un piccolo errore può impedire il funzionamento.</string>
   <string name="hotspot_help_site_2">Assicurati che il telefono sia ancora connesso al Wi-Fi giusto (vedi sopra) quando provi ad accedere al sito.</string>
@@ -713,9 +712,6 @@
   <string name="hotspot_flag_test">Attenzione: questa app è stata installata con Android Studio e NON può essere installata su un altro dispositivo.</string>
   <string name="hotspot_error_framework_busy">Impossibile avviare l\'hotspot.\n\nSe ne hai un altro in esecuzione o se stai condividendo la connessione internet via Wi-Fi, fermalo e poi riprova.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Connessione tramite unità rimovibile</string>
-  <string name="removable_drive_intro">Se non riesci a connetterti al tuo contatto tramite Internet, Wi-Fi o Bluetooth, Briar può anche trasferire i messaggi su un\'unità rimovibile come una chiavetta USB o una scheda SD.</string>
-  <string name="removable_drive_explanation">Se non riesci a connetterti al tuo contatto tramite Internet, Wi-Fi o Bluetooth, Briar può anche trasferire i messaggi su un\'unità rimovibile come una chiavetta USB o una scheda SD.\n\nQuando usi il pulsante \"Invia dati\" , tutti i dati in attesa di essere inviati al contatto verranno scritti sull\'unità rimovibile. Ciò include messaggi privati, allegati, blog, forum e gruppi privati.\n\nTutto sarà crittografato prima di essere scritto sull\'unità rimovibile.\n\nQuando il tuo contatto riceve l\'unità rimovibile, può utilizzare il pulsante \"Ricevi dati\" per importare i messaggi in Briar.</string>
   <string name="removable_drive_title_send">Invia dati</string>
   <string name="removable_drive_title_receive">Ricevi dati</string>
   <string name="removable_drive_send_intro">Tocca il pulsante sottostante per creare un nuovo file contenente i messaggi cifrati. Puoi scegliere dove verrà salvato il file.\n\nSe vuoi salvarlo in un supporto rimovibile, inseriscilo ora.</string>

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

@@ -31,15 +31,10 @@
   <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="forgotten_password">パスワードを忘れました。</string>
   <string name="dialog_title_lost_password">パスワードを紛失</string>
   <string name="dialog_message_lost_password">あなたのBriarアカウントはクラウド上ではなく、暗号化さた上であなたのデバイスに保存さています。したがってBriarはパスワードをリセットできません。アカウントを削除しはじめからやりなおしますか？\n\n注意：あなたのID、連絡先、メッセージは永久に復元できません。</string>
   <string name="startup_failed_activity_title">起動に失敗しました</string>
-  <string name="startup_failed_clock_error">デバイスの時計が不正なので、Briarは起動できませんでした。\n\nデバイスの時計を正しい時刻に設定して、再試行してください。</string>
-  <string name="startup_failed_db_error">Briarは、あなたのアカウント、連絡先、メッセージを含むデータベースを開くことができませんでした。\n\nアプリを最新版にアップグレードして再度お試しいただくか、パスワード入力画面で\'パスワードを忘れました\'を選択して新しいアカウントを設定してください。</string>
-  <string name="startup_failed_data_too_old_error">あなたのアカウントは古いバージョンのアプリで作成されたもので、このバージョンでは開くことができません。\n\n古いバージョンを再インストールするか、パスワード入力画面で\'パスワードを忘れました\'を選択して新しいアカウントを設定する必要があります。</string>
-  <string name="startup_failed_data_too_new_error">あなたのアカウントは、このアプリの新しいバージョンで作成されたもので、このバージョンでは開くことができません。\n\n最新のバージョンにアップグレードしてから再度お試しください。</string>
-  <string name="startup_failed_service_error">Briarは、必要なコンポーネントを起動できませんでした。\n\n最新版のアプリにアップグレードしてから再度お試しください。</string>
   <plurals name="expiry_warning">
     <item quantity="other">これは、Briarのテストバージョンです。 アカウントは%d日で期限切れになり、更新できません。</item>
   </plurals>
@@ -294,12 +289,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Bluetooth経由で接続する</string>
   <string name="connect_via_bluetooth_title">Bluetooth経由で接続する</string>
-  <string name="connect_via_bluetooth_intro">Bluetooth接続が自動的に行われない場合は、この画面を使って手動で接続することができます。\n\nこの機能を利用するには、あなたの連絡先が近くにある必要があります。\n\nあなたと連絡先が同時に\"開始\"を押してください。</string>
   <string name="connect_via_bluetooth_no_location_permission">位置情報の権限なくして続行不可能</string>
   <string name="connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
   <string name="connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
-  <string name="connect_via_bluetooth_error">Bluetooth経由で接続不可能。</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetoothはデバイスによってサポートされていません。</string>
   <!--Private Groups-->
   <string name="groups_list_empty">表示するグループがありません</string>
   <string name="groups_list_empty_action">「＋」アイコンをタップしてグループを作成するか、連絡先に登録している誰かにグループを共有してもらう</string>
@@ -542,7 +534,6 @@
   <string name="choose_ringtone_title">着信音を選択</string>
   <string name="cannot_load_ringtone">着信音を読み込めません</string>
   <!--Conversation Settings-->
-  <string name="disappearing_messages_title">消えたメッセージ</string>
   <string name="learn_more">詳細情報</string>
   <!--Settings Actions-->
   <string name="pref_category_actions">操作</string>
@@ -587,7 +578,6 @@
   <string name="screen_filter_body">別のアプリがBriarの画面上に描画しています。 セキュリティを保護するために、Briarは、別のアプリがBriarの画面上に描画している場合、タッチに応答しません。\n\n次のアプリが上に描画されている可能性があります：\n\n%1$s</string>
   <string name="screen_filter_body_api_30">他のアプリがBriarの上に描画されています。セキュリティ保護のため、他のアプリが上に描画しているときは、Briarに触れても反応しません。\n\n以下のアプリを確認して、原因のアプリを見つけてください。</string>
   <string name="screen_filter_allow">これらのアプリがBriarの画面上に描画できるようにする</string>
-  <string name="screen_filter_review_apps">アプリを確認</string>
   <!--Permission Requests-->
   <string name="permission_camera_title">カメラへのアクセス許可</string>
   <string name="permission_camera_request_body">QRコードをスキャンするには、Briarはカメラにアクセスする必要があります。</string>
@@ -647,30 +637,7 @@
   <string name="website_download_intro">近くの誰かが、あなたと %s を共有しました。</string>
   <string name="website_download_outro">ダウンロードが完了した後に、ダウンロードしたファイルを開いて、インストールしてください。</string>
   <string name="website_troubleshooting_title">トラブルシューティング</string>
-  <string name="website_troubleshooting_1">アプリをインストールできない場合、別のブラウザアプリで試してください。</string>
-  <string name="website_troubleshooting_2_old">ダウンロードしたアプリをインストールするには、システム設定で\"提供元不明\"のアプリのインストールを許可する必要がある場合があります。その後、再度アプリのダウンロードが必要になる場合があります。アプリをインストールした後は、\"提供元不明\"の設定を解除することをお勧めします。</string>
-  <string name="website_troubleshooting_2_new">ダウンロードしたアプリをインストールするには、ブラウザに不明なアプリのインストールを許可する必要がある場合があります。アプリをインストールした後は、ブラウザの不明なアプリのインストール許可を解除することをお勧めします。</string>
-  <string name="hotspot_help_wifi_title">W-Fi接続の問題:</string>
-  <string name="hotspot_help_wifi_1">双方の電話機でWi-Fiを無効にして、再び有効にするのを試してください。</string>
-  <string name="hotspot_help_wifi_2">もし携帯電話が「Wi-Fiにはインターネットがない」と不満を訴えてきたら、「とにかく接続していたい」と伝えてください。</string>
-  <string name="hotspot_help_site_title">ローカルのウェブサイト訪問の問題:</string>
-  <string name="hotspot_help_site_1">表示されている通りにアドレスを入力したかどうかを再確認してください。小さなミスで失敗することがあります。</string>
-  <string name="hotspot_help_site_2">サイトにアクセスする際に、電話機が正しいWi-Fi（上記を参照）に接続されていることを確認してください。</string>
-  <string name="hotspot_help_site_3">ファイアウォールアプリを使用している場合は、それがアクセスをブロックしていないか確認してください。</string>
-  <string name="hotspot_help_site_4">サイトにはアクセスできるが、Briarアプリがダウンロードできない場合は、別のウェブブラウザアプリで試してみてください。</string>
-  <string name="hotspot_help_fallback_title">どれもうまくいきませんか?</string>
-  <string name="hotspot_help_fallback_intro">他の方法で共有するために、アプリを.apkファイルとして保存してみてください。そのファイルをもう一方のデバイスに転送すれば、Briarをインストールすることができます。
-		\n\nヒント: Bluetoothで共有する場合は、まずファイル名を.zipで終わるように名前変更する必要があるかもしれません。</string>
-  <string name="hotspot_help_fallback_button">アプリを保存する</string>
   <!--error handling-->
-  <string name="hotspot_error_intro">Wi-Fiでアプリを共有しようとしたときに、何か問題が発生しました。</string>
-  <string name="hotspot_error_no_wifi_direct">デバイスはWi-Fiダイレクトをサポートしていません</string>
-  <string name="hotspot_error_start_callback_failed">ホットスポットの開始に失敗しました: エラー %s</string>
-  <string name="hotspot_error_start_callback_no_group_info">ホットスポットの開始に失敗しました: グループ情報なし</string>
-  <string name="hotspot_error_web_server_start">ウェブサーバー起動エラー</string>
-  <string name="hotspot_error_web_server_serve">ウェブサイトの表示にエラーが発生しました。\n\n問題が解決しない場合は、Briarアプリから（匿名のデータで）フィードバックを送ってください。</string>
-  <string name="hotspot_flag_test">警告: このアプリはAndroid Studioでインストールされたものであり、他の端末にインストールすることはできません。</string>
-  <string name="hotspot_error_framework_busy">ホットスポットの起動ができません。\n\n他のホットスポットを起動している場合や、Wi-Fiでインターネット接続を共有している場合は、そのホットスポットを停止してから再度試してみてください。</string>
   <!--Transfer Data via Removable Drives-->
   <string name="removable_drive_success_receive_title">インポート成功</string>
   <!--Screenshots-->

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

@@ -334,13 +334,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Prisijungti per Bluetooth</string>
   <string name="connect_via_bluetooth_title">Prisijungti per Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">Tuo atveju, jei Bluetooth ryšiai neveikia automatiškai, galite naudoti šį langą, kad prisijungtumėte rankiniu būdu.\n\nTam, kad tai suveiktų, jūsų adresatas turi būti šalia jūsų.\n\nJūs ir jūsų adresatas vienu metu turėtumėte paspausti „Pradėti“.</string>
-  <string name="connect_via_bluetooth_already_discovering">Jau bandoma jungtis per Bluetooth. Netrukus bandykite dar kartą.</string>
   <string name="connect_via_bluetooth_no_location_permission">Nepavyksta tęsti be įrenginio vietovės leidimo</string>
   <string name="connect_via_bluetooth_start">Jungiamasi per Bluetooth…</string>
   <string name="connect_via_bluetooth_success">Sėkmingai prisijungta per Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Nepavyko prisijungti per Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Įrenginys nepalaiko Bluetooth.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nėra rodytinų grupių</string>
   <string name="groups_list_empty_action">Norėdami sukurti grupę ar paprašyti savo adresatų pradėti su jumis bendrinti grupes, bakstelėkite + piktogramą</string>
@@ -720,7 +716,6 @@
   <string name="hotspot_help_wifi_title">Problemos jungiantis prie belaidžio (Wi-Fi):</string>
   <string name="hotspot_help_wifi_1">Pabandykite abiejuose telefonuose išjungti ir vėl įjungti belaidį (Wi-Fi) ryšį ir bandykite dar kartą.</string>
   <string name="hotspot_help_wifi_2">Jeigu jūsų telefonas skundžiasi, jog belaidžiame (Wi-Fi) tinkle nėra interneto ryšio, nurodykite jam, kad norite likti prisijungę.</string>
-  <string name="hotspot_help_wifi_3">Paleiskite telefoną, kuriame įjungtas belaidis (Wi-Fi) prieigos taškas, iš naujo, o tuomet paleiskite Briar ir bandykite bendrinti dar kartą.</string>
   <string name="hotspot_help_site_title">Iškilo problemų apsilankant vietinėje svetainėje:</string>
   <string name="hotspot_help_site_1">Dar kartą įsitikinkite, kad tiksliai įvedėte nurodytą adresą. Maža klaida gali sukelti nesėkmę.</string>
   <string name="hotspot_help_site_2">Bandydami pasiekti šią svetainę, įsitikinkite, kad jūsų telefonas vis dar yra prisijungęs prie teisingo belaidžio (Wi-Fi) ryšio (žiūrėkite aukščiau).</string>
@@ -741,9 +736,6 @@
   <string name="hotspot_flag_test">Įspėjimas: Ši programėlė buvo įdiegta naudojant „Android Studio“ ir NEGALI būti įdiegta kitame įrenginyje.</string>
   <string name="hotspot_error_framework_busy">Nepavyko įjungti prieigos taško.\n\nJei turite veikiantį kitą prieigos tašką arba, jei bendrinate interneto ryšį per belaidį (Wi-Fi) ryšį, pabandykite to nebedaryti ir po to, bandykite dar kartą.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Prisijungti per keičiamąjį diską</string>
-  <string name="removable_drive_intro">Jei negalite prisijungti prie savo adresato per internetą, belaidį (Wi-Fi) ar Bluetooth, Briar taip pat gali perkelti žinutes į keičiamąjį diską, pavyzdžiui, USB atmintuką ar SD kortelę.</string>
-  <string name="removable_drive_explanation">Jei negalite prisijungti prie savo adresato per internetą, belaidį (Wi-Fi) ar Bluetooth, Briar taip pat gali perkelti žinutes į keičiamąjį diską, pavyzdžiui, USB atmintuką ar SD kortelę.\n\nKai naudojate mygtuką „Siųsti duomenis“, bet kokie duomenys, laukiantys, kad būtų išsiųsti adresatui, bus įrašyti į keičiamąjį diską. Į juos įeina privačios žinutės, priedai, tinklaraščiai, forumai ir privačios grupės.\n\nVisa tai, prieš įrašant į keičiamąjį diską, bus užšifruota.\n\nJūsų adresatas, gavęs keičiamąjį diską, galės naudoti mygtuką „Gauti duomenis“, kad importuotų žinutes į Briar.</string>
   <string name="removable_drive_title_send">Siųsti duomenis</string>
   <string name="removable_drive_title_receive">Gauti duomenis</string>
   <string name="removable_drive_send_intro">Bakstelėkite mygtuką žemiau, kad sukurtumėte naują failą su šifruotomis žinutėmis. Galite pasirinkti, kur failą įrašyti.\n\nJei norite įrašyti failą į keičiamąjį diską, tuomet įdėkite diską dabar.</string>

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

@@ -2,10 +2,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Setup-->
   <string name="setup_title">Briar မှ ကြိုဆိုပါသည်</string>
-  <string name="setup_name_explanation">သင့်နာမည်ပြောင်သည် သင်တင်ထားသမျှ၏ဘေးတွင် ပေါ်နေပါလိမ့်မည်။ သို့ပါ၍ သင့်နာမည်ပြောင်အား အကောင့်ဖွင့်ပြီးနောက် ပြောင်း၍မရတော့ပါ။</string>
+  <string name="setup_name_explanation">သင့်နာမည်ပြောင်သည် သင်တင်ထားသမျှအရာ၏ဘေးတွင် ပေါ်နေပါလိမ့်မည်။ သို့ပါ၍ သင့်နာမည်ပြောင်အား အကောင့်ဖွင့်ပြီးနောက် ပြောင်း၍မရတော့ပါ။</string>
   <string name="setup_next">ရှေ့သို့</string>
   <string name="setup_password_intro">စကားဝှက်တစ်ခု ရွေးပါ</string>
-  <string name="setup_password_explanation">သင့် Briar အကောင့်ကို ကလောက်တွင်မဟုတ်ဘဲ သင့်ကိရိယာတွင်သာ လျှို့ဝှက်ကုဒ်ပြောင်းသိမ်းဆည်းထားပါသည်။ သင့်စကားဝှက်ကို မေ့သွားလျှင် (သို့) Briar ကို ဖြုတ်လိုက်လျှင် သင့်အကောင့်ကို မည်သည့်နည်းနှင့်မျှ ပြန်မရယူနိုင်ပါ။\n\nကြုံရာစကားလုံးလေးလုံး (သို့) ကြုံရာအက္ခရာဆယ်လုံး၊ နံပါတ်များနှင့် သင်္ကေတများကဲ့သို့ ခန့်မှန်းရခက်သည့် ရှည်လျားသောစကားဝှက်ကို ရွေးချယ်ပါ။</string>
+  <string name="setup_password_explanation">သင့် Briar အကောင့်ကို ကလောက်တွင်မဟုတ်ဘဲ သင့်ကိရိယာတွင်သာ လျှို့ဝှက်ကုဒ်ပြောင်းသိမ်းဆည်းထားပါသည်။ သင့်စကားဝှက်ကို မေ့သွားလျှင် (သို့) Briar ကို ဖြုတ်လိုက်လျှင် သင့်အကောင့်ကို မည်သည့်နည်းနှင့်မှ ပြန်မရယူနိုင်တော့ပါ။\n\nကြုံရာစကားလုံးလေးလုံး (သို့) ကြုံရာအက္ခရာဆယ်လုံး၊ နံပါတ်များနှင့် သင်္ကေတများကဲ့သို့ ခန့်မှန်းရခက်သည့် ရှည်လျားသောစကားဝှက်ကို ရွေးချယ်ပါ။</string>
   <string name="setup_doze_title">နောက်ခံချိတ်ဆက်မှုများ</string>
   <string name="setup_doze_intro">မက်ဆေ့ချ်များလက်ခံရယူနိုင်ရန် Briar သည် နောက်ခံချိတ်ဆက်နေရန် လိုအပ်သည်။</string>
   <string name="setup_doze_explanation">မက်ဆေ့ချ်များလက်ခံရယူနိုင်ရန် Briar သည် နောက်ခံချိတ်ဆက်နေရန် လိုအပ်သည်။ Briar အနေဖြင့် ချိတ်ဆက်မှုမပြတ်ရှိနေစေရန် ဘတ္ထရီအားအကောင်းဆုံးထိန်းညှိခြင်းကို ကျေးဇူးပြု၍ ပိတ်ထားပေးပါ။</string>
@@ -22,35 +22,30 @@
   <string name="setup_huawei_text">အောက်ပါခလုတ်ကိုနှိပ်၍ \"ကာကွယ်မှုပေးထားသောအက်ပ်များ\" စခရင်တွင် Briar ကို ကာကွယ်ထားကြောင်း သေချာစေပါ။</string>
   <string name="setup_huawei_button">Briar ကို ကာကွယ်မည်</string>
   <string name="setup_huawei_help">ကာကွယ်မှုပေးထားသောအက်ပ်များစာရင်းတွင် ထည့်မထားလျှင် Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_huawei_app_launch_text">အောက်ပါခလုတ်ကိုနှိပ်ပြီး \"အက်ပ်စတင်ခြင်း\" စခရင်ကို ဖွင့်၍ Briar ကို \"ကိုယ်တိုင်စီမံမည်\" ဟု သတ်မှတ်ပါ။</string>
-  <string name="setup_huawei_app_launch_button">ဘတ္ထရီဆက်တင်များကို ဖွင့်မည်</string>
-  <string name="setup_huawei_app_launch_help">\"အက်ပ်စတင်ခြင်း\" စခရင်တွင် \"ကိုယ်တိုင်စီမံမည်\" ဟု သတ်မှတ်မထားလျှင် Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_xiaomi_text">ဖွင့်ထားသောအက်ပ်များစာရင်းတွင် Briar ကို လော့ခ်ချထားမှ နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်။</string>
-  <string name="setup_xiaomi_button">Briar ကို ကာကွယ်ထားမည်</string>
-  <string name="setup_xiaomi_help">ဖွင့်ထားသောအက်ပ်များစာရင်းတွင် လော့ခ်ချမထားပါက Briar ကို နောက်ကွယ်တွင် ဖွင့်ထားနိုင်မည်မဟုတ်ပါ။</string>
-  <string name="setup_xiaomi_dialog_body_old">၁။ ဖွင့်ထားသောအက်ပ်များစာရင်း (တစ်နည်းအားဖြင့် အက်ပ်ပြောင်းရာ) ကို ဖွင့်ပါ\n\n၂။ သော့ခလောက်အိုင်ကွန်ပေါ်လာရန် Briar ပုံပေါ်မှ ပွတ်ဆွဲချပါ\n\n၃။ သော့ခတ်မထားပါက သော့ခတ်ရန်နှိပ်လိုက်ပါ</string>
-  <string name="setup_xiaomi_dialog_body_new">၁။ ဖွင့်ထားသောအက်ပ်များစာရင်း (တစ်နည်းအားဖြင့် အက်ပ်ပြောင်းရာ) ကို ဖွင့်ပါ\n\n၂။ သော့ခလောက်ခလုတ်ပေါ်လာသည်အထိ Briar ပုံကို နှိပ်ထားပါ\n\n၃။ သော့ခတ်မထားပါက သော့ခတ်ရန်နှိပ်လိုက်ပါ</string>
-  <string name="warning_dozed">%s ကို နောက်ကွယ်တွင် ဖွင့်မထားနိုင်ပါ</string>
+  <string name="setup_huawei_app_launch_text">အောက်က ခလုတ်ကို နှိပ်၍ \"အပ္ပလီကေးရှင်း ဖွင့်ရန်\" စကင်ရင်ကို ဖွင့်ပါ၊ ပြီးလျှင် Briar ကို \"ကိုယ်တိုင်စီမံမယ်\" လို့ သတ်မှတ်ပါ။</string>
+  <string name="setup_huawei_app_launch_button">ဘက်ထရီအပြင်အဆင်များကို ဖွင့်ပါ</string>
+  <string name="setup_huawei_app_launch_help">Briar ကို \"အပ္ပလီကေးရှင်း ဖွင့်ရန်\" စကင်ရင်ပေါ်တွင် \"ကိုယ်တိုင်စီမံမယ်\" လို့မသတ်မှတ်ထားလျှင် နောက်ခံတွင် ၎င်းကို လည်ပတ်၍ မရနိုင်ပါ။</string>
+  <string name="setup_xiaomi_text">နောက်ခံတွင်အလုပ်လုပ်စေရန် လတ်တလောအက်ပလီကေးရှင်းများစာရင်းတွင် Briar အား သော့ခတ်ထားရန် လိုအပ်သည်။</string>
+  <string name="setup_xiaomi_button">Briar ကို ကာကွယ်ပါ</string>
+  <string name="setup_xiaomi_help">အကယ်၍ Briar ကို သော့မခတ်ထားပါက၊ ထိုအက်ပလီကေးရှင်းသည် နောက်ခံတွင် အလုပ်လုပ်နေနိုင်မည် မဟုတ်ပါ။</string>
+  <string name="setup_xiaomi_dialog_body_old">၁။ လတ်တလောအက်ပ်များစာရင်းကိုဖွင့်ပါ (ဒါ့အပြင် app switcher လို့လည်းခေါ်ပါသည်) \n\n2. သော့ခလောက်အိုင်ကွန်ကို \n\n3. ပြသရန် Briar ၏ပုံကို အောက်ကိုတွန်းပါ။ </string>
+  <string name="setup_xiaomi_dialog_body_new">၁။ လတ်တလော အက်ပလီကေးရှင်းများစာရင်း (ဒါ့အပြင် အက်ပလီကေးရှင်းခလုတ်ဟုလည်းခေါ်သည်) ကိုလည်းဖွင့်ပါ \n\n2 ။ အဆိုပါသော့ခလောက်ခလုတ်မှ \n\n3 ပေါ်လာသည်အထိ Briar ၏ ပုံကို နှိပ်၍ ဖိထားပါ။ အကယ်၍ သော့ခလောက်သည် သော့ခတ်ထားခြင်းမရှိပါက ၎င်းကိုသော့ခတ်ရန် ပွတ်ဆွဲပါ။ </string>
+  <string name="warning_dozed">%s ကို နောက်ကွယ်တွင် မဖွင့်ထားနိုင်ပါ</string>
   <!--Login-->
   <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="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>
   <string name="dialog_message_lost_password">သင့် Briar အကောင့်ကို ကလောက်တွင်မဟုတ်ဘဲ သင့်ကိရိယာတွင်သာ လျှို့ဝှက်ကုဒ်ပြောင်းသိမ်းဆည်းထားသောကြောင့် သင့်စကားဝှက်ကို ပြန်လည်သတ်မှတ်မပေးနိုင်ပါ။ သင့်အကောင့်ကို ဖျက်ပစ်ပြီး အသစ်ပြန်ဖွင့်ချင်ပါသလား။\n\nသတိ - သင့်ကိုယ်ပိုင်အချက်အလက်များ၊ အဆက်အသွယ်များနှင့် မက်ဆေ့ချ်များအားလုံး အပြီးပျက်သွားပါလိမ့်မည်။</string>
   <string name="startup_failed_activity_title">Briar မစတင်နိုင်ပါ</string>
-  <string name="startup_failed_clock_error">သင့်ကိရိယာ၏နာရီသည် မှားနေပါသဖြင့် Briar မစတင်နိုင်ပါ။\n\nသင့်ကိရိယာ၏နာရီကို အချိန်မှန်အောင်တိုက်ပြီး ပြန်စမ်းကြည့်ပါ။</string>
-  <string name="startup_failed_db_error">Briar သည် သင့်အကောင့်၊ သင့်အဆက်အသွယ်များနှင့် သင့်မက်ဆေ့ချ်များပါရှိသော အချက်အလက်အစုကို မဖွင့်နိုင်ပါ။\n\nအက်ပ်နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
-  <string name="startup_failed_data_too_old_error">သင့်အကောင့်ကို ဤအက်ပ်၏ဗားရှင်းအဟောင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။\n\nဗားရှင်းအဟောင်းကို ပြန်ထည့်သွင်းရပါမည် (သို့) စကားဝှက်တောင်းသည့်နေရာတွင် \'ကျွန်ုပ်၏စကားဝှက်ကို မေ့သွားပါသည်\' ကို ရွေးချယ်ပြီး အကောင့်အသစ်တစ်ခု ဖွင့်နိုင်ပါသည်။</string>
-  <string name="startup_failed_data_too_new_error">သင့်အကောင့်ကို ဤအက်ပ်ဗားရှင်းထက်နောက်ကျသောဗားရှင်းတစ်ခုဖြင့် ဖွင့်ခဲ့သောကြောင့် ယခုဗားရှင်းဖြင့် ဖွင့်၍မရပါ။\n\nနောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။</string>
-  <string name="startup_failed_service_error">Briar သည် လိုအပ်သည့် အစိတ်အပိုင်းတစ်ခုကို မဖွင့်နိုင်ပါ။\n\nအက်ပ်နောက်ဆုံးဗားရှင်းသို့ အဆင့်မြှင့်ပြီး ထပ်စမ်းကြည့်ပါ။</string>
   <plurals name="expiry_warning">
-    <item quantity="other">ဤအရာသည် Briar ၏ စမ်းသပ်ဆဲဗားရှင်းဖြစ်ပါသည်။ သင့်အကောင့်သည် %d ရက်ကြာလျှင် သက်တမ်းကုန်ဆုံးမည်ဖြစ်ပြီး သက်တမ်းတိုး၍မရနိုင်ပါ။</item>
+    <item quantity="other">ဤအရာသည် Briar ၏ စမ်းသပ်ဆဲဗားရှင်းဖြစ်ပါသည်။ သင့်အကောင့်သည် %d ရက်နေ့တွင် သက်တမ်းကုန်ဆုံးမည်ဖြစ်ပြီး သက်တမ်းတိုး၍မရနိုင်ပါ။</item>
   </plurals>
   <string name="expiry_date_reached">ဤဆော့ဖ်ဝဲသည် သက်တမ်းကုန်သွားပါပြီ။\nစမ်းသပ်အသုံးပြုခြင်းအတွက် ကျေးဇူးတင်ပါသည်။</string>
-  <string name="download_briar">Briar ကို ဆက်လက်အသုံးပြုရန် နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်ပါ။</string>
+  <string name="download_briar">Briar ကို ဆက်လက်အသုံးပြုလိုပါက နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်ပါ။</string>
   <string name="create_new_account">အကောင့်အသစ်ဖွင့်ရန် လိုအပ်သော်လည်း သုံးလက်စနာမည်ပြောင်ကို ဆက်သုံးနိုင်ပါသည်။</string>
   <string name="download_briar_button">နောက်ဆုံးထွက်ထားသည်ကို ဒေါင်းလုဒ်လုပ်မည်</string>
   <string name="startup_open_database">အချက်အလက်အစုကို ပြန်ဖြည်နေသည်…</string>
@@ -642,7 +637,6 @@
   <string name="website_troubleshooting_title">အကူအညီ</string>
   <!--error handling-->
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_success_receive_text">ဤဖိုင်တွင်ပါဝင်သည့် လျှို့ဝှက်ကုဒ်ပြောင်းမက်ဆေ့ချ်အားလုံးကို လက်ခံရရှိပါပြီ။</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-ro/strings.xml

@@ -22,14 +22,14 @@
   <string name="setup_huawei_text">Vă rugăm să apăsați butonul de mai jos și să vă asigurați că Briar este marcat ca protejat în fereastra de \"Aplicații protejate\".</string>
   <string name="setup_huawei_button">Protejează Briar</string>
   <string name="setup_huawei_help">Dacă Briar nu este adăugat în lista de aplicații protejate, nu va fi capabil să ruleze în fundal.</string>
-  <string name="setup_huawei_app_launch_text">Vă rugăm să atingeți butonul de mai jos, să deschideți ecranul \"Lansare aplicație\" și să vă asigurați că Briar este setat la \"Gestionare manuală\".</string>
+  <string name="setup_huawei_app_launch_text">Vă rugăm să atingeți butonul de mai jos, să deschideți ecranul \"Lansare app\" și să vă asigurați că Briar este setat la \"Gestionare manuală\".</string>
   <string name="setup_huawei_app_launch_button">Deschide setările de baterie</string>
-  <string name="setup_huawei_app_launch_help">Dacă Briar nu este setat la \" Gestionare manuală\" în ecranul \"Lansare aplicație\", nu va putea rula în fundal.</string>
+  <string name="setup_huawei_app_launch_help">Dacă Briar nu este setat la \" Gestionare manuală\" în ecranul \"Lansare app\", nu va putea rula în fundal.</string>
   <string name="setup_xiaomi_text">Pentru a funcționa în fundal, Briar trebuie să fie blocat în lista de aplicații recente.</string>
   <string name="setup_xiaomi_button">Protejează Briar</string>
   <string name="setup_xiaomi_help">Dacă Briar nu este blocat în lista de aplicații recente, acesta nu va putea rula în fundal.</string>
-  <string name="setup_xiaomi_dialog_body_old">1. Deschideți lista de aplicații recente (denumită și comutatorul de aplicații)\n\n2. Trageți cu degetul în jos pe imaginea lui Briar pentru a afișa pictograma lacătului\n\n3. Dacă lacătul nu este blocat, atingeți pentru a-l bloca</string>
-  <string name="setup_xiaomi_dialog_body_new">1. Deschideți lista de aplicații recente (denumită și comutatorul de aplicatii)\n\n2. Țineți apăsată imaginea lui Briar până când apare butonul cu lacăt\n\n3. Dacă lacătul nu este blocat, apăsați pentru a-l bloca</string>
+  <string name="setup_xiaomi_dialog_body_old">1. Deschideți lista de aplicații recente (denumită și comutatorul de app-uri)\n\n2. Trageți cu degetul în jos pe imaginea lui Briar pentru a afișa pictograma lacătului\n\n\n3. Dacă lacătul nu este blocat, atingeți pentru a-l bloca</string>
+  <string name="setup_xiaomi_dialog_body_new">1. Deschideți lista de aplicații recente (denumită și comutatorul de app-uri)\n\n2. Țineți apăsată imaginea lui Briar până când apare butonul cu lacăt\n\n3. Dacă lacătul nu este blocat, apăsați pentru a-l bloca</string>
   <string name="warning_dozed">%s nu poate rula în fundal</string>
   <!--Login-->
   <string name="enter_password">Parola</string>
@@ -42,10 +42,10 @@
   <string name="dialog_message_lost_password">Contul dvs. Briar este stocat criptat pe dispozitiv, nu în cloud. Dacă vă uitați parola sau ștergeți Briar, nu veți putea să vă recuperați contul. Doriți să vă ștergeți contul și să începeți din nou?\n\nAtenție: identitățile, contactele și mesajele dvs. vor fi pierdute definitiv.</string>
   <string name="startup_failed_activity_title">Eroare de pornire Briar</string>
   <string name="startup_failed_clock_error">Briar nu a putut porni deoarece ceasul dispozitivului dvs. este greșit.\n\nVă rugăm să setați ceasul dispozitivului dvs. la ora corectă și să încercați din nou.</string>
-  <string name="startup_failed_db_error">Briar nu a reușit să deschidă baza de date care conține contul dvs., contactele și mesajele dvs.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a aplicației și să încercați din nou, sau să configurați un cont nou alegând \"Mi-am uitat parola\" la solicitarea parolei.</string>
-  <string name="startup_failed_data_too_old_error">Contul dvs. a fost creat cu o versiune veche a acestei aplicații și nu poate fi deschis cu această versiune.\n\nTrebuie fie să reinstalați versiunea veche, fie să creați un cont nou alegând \"Mi-am uitat parola\" la solicitarea de parolă.</string>
-  <string name="startup_failed_data_too_new_error">Contul dvs. a fost creat cu o versiune mai nouă a acestei aplicații și nu poate fi deschis cu această versiune.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune și să încercați din nou.</string>
-  <string name="startup_failed_service_error">Briar nu a reușit să pornească o componentă necesară.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a acestei aplicații și să încercați din nou.</string>
+  <string name="startup_failed_db_error">Briar nu a reușit să deschidă baza de date care conține contul dvs., contactele și mesajele dvs.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a app-ului și să încercați din nou, sau să configurați un cont nou alegând \"Mi-am uitat parola\" la solicitarea parolei.</string>
+  <string name="startup_failed_data_too_old_error">Contul dvs. a fost creat cu o versiune veche a acestui app și nu poate fi deschis cu această versiune.\n\nTrebuie fie să reinstalați versiunea veche, fie să creați un cont nou alegând \"Mi-am uitat parola\" la solicitarea de parolă.</string>
+  <string name="startup_failed_data_too_new_error">Contul dvs. a fost creat cu o versiune mai nouă a acestui app și nu poate fi deschis cu această versiune.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune și să încercați din nou.</string>
+  <string name="startup_failed_service_error">Briar nu a reușit să pornească o componentă necesară.\n\nVă rugăm să faceți upgrade la cea mai recentă versiune a acestui app și să încercați din nou.</string>
   <plurals name="expiry_warning">
     <item quantity="one">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d zi și nu se poate reînnoi</item>
     <item quantity="few">Aceasta este o versiune de test pentru Briar. Contul dumneavoastră va expira în %d zile și nu se poate reînnoi.</item>
@@ -325,13 +325,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Conectare prin Bluetooth</string>
   <string name="connect_via_bluetooth_title">Conectare prin Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">În cazul în care conexiunile Bluetooth nu funcționează automat, puteți utiliza acest ecran pentru a vă conecta manual.\n\nPersoana de contact trebuie să fie în apropiere pentru ca acest lucru să funcționeze.\n\nDumneavoastră și persoana de contact trebuie să apăsați \"Start\" în același timp.</string>
-  <string name="connect_via_bluetooth_already_discovering">Încercați deja să vă conectați prin Bluetooth. Vă rugăm să încercați din nou în scurt timp.</string>
   <string name="connect_via_bluetooth_no_location_permission">Nu se poate continua fără permisiunea locației</string>
   <string name="connect_via_bluetooth_start">Conectarea prin Bluetooth...</string>
   <string name="connect_via_bluetooth_success">Conectat cu succes prin Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Nu s-a putut conecta prin Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Dispozitivul nu suportă Bluetooth.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nici un grup de arătat</string>
   <string name="groups_list_empty_action">Atingeți iconița + pentru a crea un grup sau rugați-vă contactele să partajele grupuri cu dumneavoastră</string>
@@ -706,7 +702,6 @@ De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</str
   <string name="hotspot_help_wifi_title">Probleme la conectarea Wi-Fi:</string>
   <string name="hotspot_help_wifi_1">Încercați să dezactivați și să reactivați Wi-Fi pe ambele dispozitive și reîncercați.</string>
   <string name="hotspot_help_wifi_2">Dacă dispozitivul se plânge că nu este accesibil Internetul prin Wi-Fi, spuneți-i că doriți să rămână conectat oricum.</string>
-  <string name="hotspot_help_wifi_3">Reporniți telefonul pe care rulează hotspotul Wi-Fi, apoi porniți Briar și încercați din nou distribuirea.</string>
   <string name="hotspot_help_site_title">Problemă la vizitarea siteului local:</string>
   <string name="hotspot_help_site_1">Verificați că ați introdus adresa exact cum este afișată. O mică eroare poate să o facă să eșueze.</string>
   <string name="hotspot_help_site_2">Asigurați-vă că dispozitivul este încă conectat la Wi-Fi-ul corect (vedeți mai sus) când încercați să accesați siteul.</string>
@@ -727,9 +722,6 @@ De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</str
   <string name="hotspot_flag_test">Atenție: Această aplicație a fost instalată din Android Studio și NU poate fi instalată pe un alt dispozitiv.</string>
   <string name="hotspot_error_framework_busy">Nu s-a putut porni hotspotul.\n\nDacă aveți alt hotspot pornit sau dacă partajați conexiunea la Internet prin Wi-Fi, încercați să opriți asta și să reîncercați apoi.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Conectare prin intermediul unei unități detașabile</string>
-  <string name="removable_drive_intro">Dacă nu vă puteți conecta la persoana de contact prin intermediul Internetului, Wi-Fi sau Bluetooth, Briar poate, de asemenea, transfera mesaje pe o unitate detașabilă, cum ar fi un stick USB sau un card SD.</string>
-  <string name="removable_drive_explanation">Dacă nu vă puteți conecta la persoana de contact prin Internet, Wi-Fi sau Bluetooth, Briar poate transfera mesaje și pe o unitate detașabilă, cum ar fi un stick USB sau un card SD.\n\nCând folosiți butonul \"Trimite date\", orice date care așteaptă să fie trimise contactului vor fi scrise pe unitatea detașabilă. Aceasta include mesaje private, atașamente, bloguri, forumuri și grupuri private.\n\nToate vor fi criptate înainte de a fi scrise pe unitatea detașabilă.\n\nCând persoana de contact primește unitatea detașabilă, poate folosi butonul \"Primește date\" pentru a importa mesajele în Briar.</string>
   <string name="removable_drive_title_send">Trimiteți date</string>
   <string name="removable_drive_title_receive">Primiți date</string>
   <string name="removable_drive_send_intro">Atingeți butonul de mai jos pentru a crea un nou fișier care conține mesajele criptate. Puteți alege unde va fi salvat fișierul.\n\nDacă doriți să salvați fișierul pe o unitate detașabilă, introduceți unitatea acum.</string>
@@ -744,7 +736,7 @@ De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</str
   <string name="removable_drive_success_receive_title">Importat cu succes</string>
   <string name="removable_drive_success_receive_text">Toate mesajele criptate conținute în acest fișier au fost primite.</string>
   <string name="removable_drive_error_send_title">Eroare la exportul de date</string>
-  <string name="removable_drive_error_send_text">A avut loc o eroare de scriere a datelor în fișier.\n\nDacă utilizați o unitate detașabilă, asigurați-vă că aceasta este introdusă corect și încercați din nou.\n\nDacă eroarea persistă, vă rugăm să trimiteți feedback pentru a informa echipa Briar despre problemă.</string>
+  <string name="removable_drive_error_send_text">A avut loc o eroare de scriere a datelor în fișier.\n\nDacă utilizați o unitate detașabilă, asigurați-vă că aceasta este introdusă corect și încercați din nou.\n\n\nDacă eroarea persistă, vă rugăm să trimiteți feedback pentru a informa echipa Briar despre problemă.</string>
   <string name="removable_drive_error_receive_title">Eroare la importul de date</string>
   <string name="removable_drive_error_receive_text">Fișierul selectat nu conține nimic care să poată fi recunoscut de Briar.\n\nVă rugăm să verificați dacă ați ales fișierul corect.\n\nDacă persoana de contact a creat fișierul cu mai mult de 28 de zile în urmă, Briar nu îl va putea recunoaște.</string>
   <!--Screenshots-->

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

@@ -25,11 +25,11 @@
   <string name="setup_huawei_app_launch_text">Пожалуйста, нажмите кнопку ниже, откройте экран \"Запуск приложения\" и убедитесь, что для Briar установлено значение \"Управлять вручную\".</string>
   <string name="setup_huawei_app_launch_button">Открыть настройки батареи</string>
   <string name="setup_huawei_app_launch_help">Если для Briar не установлено значение \"Управлять вручную\" на экране \"Запуск приложения\", он не сможет работать в фоновом режиме.</string>
-  <string name="setup_xiaomi_text">Для работы в фоновом режиме Briar должен быть закреплен в списке недавних приложений.</string>
+  <string name="setup_xiaomi_text">Для работы в фоновом режиме Briar должен быть заблокирован в списке недавних приложений.</string>
   <string name="setup_xiaomi_button">Защитить Briar</string>
-  <string name="setup_xiaomi_help">Если Briar не закреплен в списке последних приложений, он не сможет работать в фоновом режиме.</string>
-  <string name="setup_xiaomi_dialog_body_old">1. Откройте список недавних приложений (иначе называемый переключателем приложений)\n\n2. Смахните вниз изображение Briar, чтобы появился значок замка\n\n3. Если замок не закреплен, нажмите на него для закрепления.</string>
-  <string name="setup_xiaomi_dialog_body_new">1. Откройте список недавних приложений (иначе называемый переключателем приложений)\n\n2. Нажмите и удерживайте изображение Briar, пока не появится кнопка с замком\n\n3. Если замок не закреплен, нажмите на него для закрепления.</string>
+  <string name="setup_xiaomi_help">Если Briar не заблокирован в списке последних приложений, он не сможет работать в фоновом режиме.</string>
+  <string name="setup_xiaomi_dialog_body_old">1. Откройте список недавних приложений (также называемый переключателем приложений)\n\n2. Смахните вниз изображение Briar, чтобы появился значок замка\n\n3. Если замок не заблокирован, нажмите на него для блокировки.</string>
+  <string name="setup_xiaomi_dialog_body_new">1. Откройте список недавних приложений (также называемый переключателем приложений)\n\n2. Нажмите и удерживайте изображение Briar, пока не появится кнопка с замком\n\n3. Если замок не заблокирован, нажмите на него для блокировки.</string>
   <string name="warning_dozed">%s не удалось выполнить в фоновом режиме</string>
   <!--Login-->
   <string name="enter_password">Пароль</string>
@@ -334,13 +334,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Подключение через Bluetooth</string>
   <string name="connect_via_bluetooth_title">Подключение через Bluetooth</string>
-  <string name="connect_via_bluetooth_intro">Если соединение Bluetooth не устанавливается автоматически, вы можете использовать этот экран для подключения вручную.\n\nДля этого ваш собеседник должен находиться рядом.\n\nВы и ваш собеседник должны одновременно нажать кнопку \'Начать\'.</string>
-  <string name="connect_via_bluetooth_already_discovering">Пытаемся подключиться через Bluetooth. Пожалуйста, повторите попытку в ближайшее время.</string>
   <string name="connect_via_bluetooth_no_location_permission">Невозможно продолжить без доступа к местоположению</string>
   <string name="connect_via_bluetooth_start">Подключение через Bluetooth...</string>
   <string name="connect_via_bluetooth_success">Успешное подключение через Bluetooth</string>
-  <string name="connect_via_bluetooth_error">Не удалось подключиться через Bluetooth.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth не поддерживается устройством.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Нет групп для отображения</string>
   <string name="groups_list_empty_action">Для создания группы нажмите значок + или попросите ваши контакты поделиться с вами группами</string>
@@ -740,9 +736,6 @@
   <string name="hotspot_flag_test">Предупреждение: Это приложение было установлено с помощью Android Studio и НЕ может быть установлено на другое устройство.</string>
   <string name="hotspot_error_framework_busy">Невозможно запустить точку доступа.\n\nЕсли у вас запущена другая точка доступа или вы используете подключение к интернету через Wi-Fi, попробуйте отключить его, а затем повторить попытку.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Подключиться через съемный носитель</string>
-  <string name="removable_drive_intro">Если вы не можете подключиться к контакту через интернет, Wi-Fi или Bluetooth, Briar также может передавать сообщения на съемном носителе, таком как USB-накопитель или SD-карта.</string>
-  <string name="removable_drive_explanation">Если вы не можете подключиться к контакту через интернет, Wi-Fi или Bluetooth, Briar также может передавать сообщения на съемном носителе, таком как USB-накопитель или SD-карта.\n\n\nКогда вы используете кнопку \"Отправить данные\", все данные, которые ожидают отправки контакту, будут записаны на съемный носитель. Сюда входят личные сообщения, вложения, блоги, форумы и личные группы.\n\n\nВсе данные будут зашифрованы перед записью.\n\n\nКогда ваш собеседник получит съемный носитель, он может воспользоваться кнопкой \"Получить данные\", чтобы импортировать сообщения в Briar.</string>
   <string name="removable_drive_title_send">Отправить данные</string>
   <string name="removable_drive_title_receive">Принять данные</string>
   <string name="removable_drive_send_intro">Нажмите кнопку ниже, чтобы создать новый файл, содержащий зашифрованные сообщения. Вы сможете выбрать, где будет сохранен этот файл.\n\nЕсли вы хотите сохранить файл на съемном диске, вставьте диск сейчас.</string>

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

@@ -696,7 +696,6 @@ Briar-i i përdor ato paralelisht.</string>
   <string name="hotspot_help_wifi_title">Probleme me lidhjen me Wi-Fi:</string>
   <string name="hotspot_help_wifi_1">Provoni çaktivizimin dhe riaktivizimin e Wi-Fi-it në të dy telefonat dhe riprovoni.</string>
   <string name="hotspot_help_wifi_2">Nëse telefoni juaj ankohet se Wi-Fi s’ka internet, i thoni se dëshironi të jeni i lidhur sido qoftë.</string>
-  <string name="hotspot_help_wifi_3">Rinisni telefonin që xhiron hotspot-in Wi-Fi, mandej rinisni Briar-in dhe riprovoni ta jepni lidhjen.</string>
   <string name="hotspot_help_site_title">Probleme në vizita të sajtit vendor:</string>
   <string name="hotspot_help_site_1">Rikontrolloni se e keni dhënë adresën saktësisht siç shfaqet. Një gabim i vockël mund të bëjë të dështojë.</string>
   <string name="hotspot_help_site_2">Sigurohuni se telefoni juaj është ende i lidhur me Wi-Fi e duhur (shihni më sipër), kur provoni të hyni te sajti.</string>
@@ -717,9 +716,6 @@ Briar-i i përdor ato paralelisht.</string>
   <string name="hotspot_flag_test">Kujdes: Ky aplikacion qe instaluar me Android Studio dhe NUK mund të instalohet në një pajisje tjetër.</string>
   <string name="hotspot_error_framework_busy">S’arrihet të niset hotspot-i.\n\nNëse keni një tjetër hotspot në punë, ose e jepni lidhjen tuaj Internet përmes Wi-Fi, provoni ta ndalni dhe të riprovoni pas kësaj.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Lidhu përmes Disku të Heqshëm</string>
-  <string name="removable_drive_intro">Nëse s’lidheni dot me kontaktin tuaj përmes Interneti, Wi-Fi apo Bluetooth-i, Briar-i mund të shpërngulë mesazhe edhe përmes disqesh të heqshëm, bie fjala një diskth USB, ose një kartë SD.</string>
-  <string name="removable_drive_explanation">Nëse s’lidheni dot me kontaktin tuaj përmes Interneti, Wi-Fi apo Bluetooth-i, Briar-i mund të shpërngulë mesazhe edhe përmes disqesh të heqshëm, bie fjala një diskth USB, ose një kartë SD.\n\nKur përdorni butonin “Dërgo të Dhëna”, çfarëdo të dhënash që po presin të dërgohen te kontakti, do të shkruhen te disku i heqshëm. Kjo përfshin mesazhe privates, bashkëngjitje, blogje, forume dhe grupe private.\n\nPara se të shkruhet te disku i heqshëm, gjithçka do të fshehtëzohet.\n\nKur kontakti juaj merr diskun e heqshëm, ai mund të përdorë butonin “Merr të Dhëna” që të importoni mesazhet në Briar.</string>
   <string name="removable_drive_title_send">Dërgoni të dhëna</string>
   <string name="removable_drive_title_receive">Merrni të dhëna</string>
   <string name="removable_drive_send_intro">Prekni butonin më poshtë që të krijoni një kartelë të re që përmban mesazhe të fshehtëzuar. Mund të zgjidhni ku të ruhen kartelat.\n\nNëse doni të ruhet kartela në një disk të heqshëm, futeni diskun tani.</string>

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

@@ -316,13 +316,9 @@
   <!--Connect via Bluetooth-->
   <string name="menu_item_connect_via_bluetooth">Bluetooth ile Bağlan</string>
   <string name="connect_via_bluetooth_title">Bluetooth ile Bağlan</string>
-  <string name="connect_via_bluetooth_intro">Bluetooth bağlantıları otomatik olarak çalışmadığında, elle bağlanmak için bu ekranı kullanabilirsiniz.\n\nBunun çalışması için kişinin yakınınızda olması gerekiyor.\n\nSizin ve kişinin aynı anda \"Başlat\" seçeneğine basması gerekiyor.</string>
-  <string name="connect_via_bluetooth_already_discovering">Bluetooth ile zaten bağlanmaya çalışıyor. Lütfen daha sonra tekrar deneyin.</string>
   <string name="connect_via_bluetooth_no_location_permission">Konum izni olmadan devam edilemez</string>
   <string name="connect_via_bluetooth_start">Bluetooth ile bağlanılıyor…</string>
   <string name="connect_via_bluetooth_success">Bluetooth ile başarılı bir şekilde bağlandı</string>
-  <string name="connect_via_bluetooth_error">Bluetooth ile bağlanamıyor.</string>
-  <string name="connect_via_bluetooth_error_not_supported">Bluetooth aygıt tarafından desteklemiyor.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Gösterilecek grup yok</string>
   <string name="groups_list_empty_action">Bir grup oluşturmak için + simgesine dokunun veya kişilerinizden grupları sizinle paylaşmasını isteyin</string>
@@ -712,9 +708,6 @@
   <string name="hotspot_flag_test">Uyarı: Bu uygulama Android Studio ile kurulduğu için başka bir aygıta kurulamaz.</string>
   <string name="hotspot_error_framework_busy">Erişim noktası başlatılamıyor.\n\nEğer başka bir erişim noktası çalışıyorsa veya İnternet bağlantınızı kablosuz üzerinden paylaşıyorsanız, lütfen önce onu durdurun ve sonra yeniden deneyin.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Çıkarılabilir Sürücü ile Bağlan</string>
-  <string name="removable_drive_intro">Eğer İnternet, Wi-Fi veya Bluetooth ile bağlanamıyorsanız, Briar iletileri USB bellek veya hafıza kart gibi çıkarılabilir sürücüyle de aktarabilir.</string>
-  <string name="removable_drive_explanation">Eğer İnternet, Wi-Fi veya Bluetooth ile bağlanamıyorsanız, Briar iletileri USB bellek veya hafıza kart gibi çıkarılabilir sürücüyle de aktarabilir.\n\n\"Veri Gönder\" düğmesini kullandığınızda, kişilere gönderilmeyi bekleyen herhangi bir veri çıkarılabilir sürücüye yazılacaktır. Bu özel iletileri, ekleri, blogları, forumları ve özel grupları içerir.\n\nÇıkarılabilir sürücüye kaydedilmeden önce her şey şifrelenecektir.\n\nKişiler çıkarılabilir sürücüyü aldığında, \"Veri Al\" düğmesini kullanarak iletileri Briar\'a aktarabilir.</string>
   <string name="removable_drive_title_send">Veri gönder</string>
   <string name="removable_drive_title_receive">Veri al</string>
   <string name="removable_drive_send_intro">Şifreli iletileri içeren yeni bir dosya oluşturmak için aşağıdaki düğmeye dokunun. Dosyanın kaydedileceği yeri seçebilirsiniz.\n\nEğer dosyayı taşınabilir bir sürücüye saklamak istiyorsanız, sürücüyü şimdi takın.</string>

briar-android/src/main/res/values-zh-rCN/strings.xml

@@ -680,7 +680,6 @@
   <string name="hotspot_help_wifi_title">连接 Wi-Fi 出现问题:</string>
   <string name="hotspot_help_wifi_1">尝试禁用和重新启用这两部手机的 Wi-Fi，然后再试一次。</string>
   <string name="hotspot_help_wifi_2">如果你的手机抱怨 Wi-Fi 没有网络，告诉它无论如何你都想保持连接。</string>
-  <string name="hotspot_help_wifi_3">重启正在运行 Wi-Fi 热点的手机，然后启动 Briar 并再次尝试共享。</string>
   <string name="hotspot_help_site_title">访问本地网站出现问题：</string>
   <string name="hotspot_help_site_1">再次检查您输入的地址是否完全和所显示的一样。一个小的错误就可能导致失败。</string>
   <string name="hotspot_help_site_2">当你尝试访问网站时，确保你的手机仍然连接到正确的 Wi-Fi (见上文)。</string>
@@ -701,9 +700,6 @@
   <string name="hotspot_flag_test">警告：此应用程序通过 Android Studio 安装，不能安装在其他设备上</string>
   <string name="hotspot_error_framework_busy">无法启动热点。\n\n如果您有另一个热点正在运行或通过 Wi-Fi 共享您的互联网连接，尝试停止它稍后再试一次。</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">通过可移动驱动器连接</string>
-  <string name="removable_drive_intro">如果你无法通过互联网、Wi-Fi 或蓝牙连接到你的联系人，Briar 还可以通过U 盘或 SD 卡等可移动驱动器传输信息。</string>
-  <string name="removable_drive_explanation">如果你无法通过互联网、Wi-Fi 或蓝牙连接到你的联系人，Briar 还可以通过U 盘或 SD 卡等可移动驱动器传输信息。\n\n当您使用“发送数据”按钮时，任何等待发送到联系人的数据将被写入可移动驱动器。这包括私人消息、附件、博客、论坛和私人群组。\n\n在写入移动驱动器之前，所有内容都将被加密。\n\n当您的联系人收到可移动驱动器时，他们可以使用“接收数据”按钮将消息导入 Briar。</string>
   <string name="removable_drive_title_send">发送数据</string>
   <string name="removable_drive_title_receive">接收数据</string>
   <string name="removable_drive_send_intro">轻按下面的按钮创建一个包含加密消息的新文件。您可以选择将文件保存在哪里。\n\n如果您想将文件保存在可移动驱动器上，请立即插入驱动器。</string>

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

@@ -697,7 +697,7 @@
 
 	<!-- Share app offline -->
 	<string name="hotspot_title">Share this app offline</string>
-	<string name="hotspot_intro">Share this app with someone nearby without an Internet connection by using your phone\'s Wi-Fi.
+	<string name="hotspot_intro">Share this app with someone nearby without Internet connection by using your phone\'s Wi-Fi.
 		\n\nYour phone will start a Wi-Fi hotspot. People nearby can connect to the hotspot and download the Briar app from your phone.</string>
 	<string name="hotspot_button_start_sharing">Start hotspot</string>
 	<string name="hotspot_button_stop_sharing">Stop hotspot</string>
@@ -744,7 +744,6 @@
 	<string name="hotspot_help_wifi_title">Problems with connecting to Wi-Fi:</string>
 	<string name="hotspot_help_wifi_1">Try disabling and re-enabling Wi-Fi on both phones and try again.</string>
 	<string name="hotspot_help_wifi_2">If your phone complains that the Wi-Fi has no Internet, tell it that you want to stay connected anyway.</string>
-	<string name="hotspot_help_wifi_3">Restart the phone which is running the Wi-Fi hotspot, then start Briar and try sharing again.</string>
 	<string name="hotspot_help_site_title">Problems visiting the local website:</string>
 	<string name="hotspot_help_site_1">Double check that you entered the address exactly as shown. A small error can make it fail.</string>
 	<string name="hotspot_help_site_2">Ensure that your phone is still connected to the correct Wi-Fi (see above) when you try to access the site.</string>

briar-android/src/main/res/values/styles.xml

@@ -65,6 +65,12 @@
 		<item name="android:minWidth">@dimen/button_size</item>
 	</style>
 
+	<style name="HelpButton" parent="BriarButtonFlat.Positive">
+		<item name="android:tint">@color/briar_button_text_positive</item>
+	</style>
+
+	<style name="DoNotKillMeButton" parent="BriarButton" />
+
 	<style name="Divider">
 		<item name="android:background">@color/divider</item>
 	</style>

briar-android/src/test/java/org/briarproject/briar/android/account/SetupViewModelTest.java

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.account;
 import android.app.Application;
 import android.content.Context;
 
+import org.briarproject.android.dontkillmelib.DozeHelper;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.test.BrambleMockTestCase;
@@ -48,7 +49,7 @@ public class SetupViewModelTest extends BrambleMockTestCase {
 		context.checking(new Expectations() {{
 			oneOf(accountManager).accountExists();
 			will(returnValue(false));
-			allowing(dozeHelper).needToShowDozeFragment(app);
+			allowing(dozeHelper).needToShowDoNotKillMeFragment(app);
 			allowing(app).getApplicationContext();
 			will(returnValue(appContext));
 			allowing(appContext).getPackageManager();

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

@@ -95,5 +95,7 @@ internal class HeadlessModule(private val appDir: File) {
         override fun shouldEnableImageAttachments() = false
         override fun shouldEnableProfilePictures() = false
         override fun shouldEnableDisappearingMessages() = false
+        override fun shouldEnableTransferData() = false
+        override fun shouldEnableShareAppViaOfflineHotspot() = false
     }
 }

build.gradle

@@ -36,4 +36,8 @@ buildscript {
 	ext.dagger_version = "2.33"
 	ext.junit_version = "4.13.2"
 	ext.jmock_version = '2.12.0'
+
+	ext.androidx_fragment_version = '1.3.4'
+	ext.androidx_constraintlayout_version = '2.0.4'
+	ext.google_material_version = '1.3.0'
 }

dont-kill-me-lib/.gitignore

@@ -0,0 +1 @@
+/build

dont-kill-me-lib/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+	id 'com.android.library'
+}
+
+android {
+	compileSdkVersion 31
+
+	defaultConfig {
+		minSdkVersion 16
+		targetSdkVersion 30
+
+		vectorDrawables.useSupportLibrary = true
+		consumerProguardFiles "consumer-rules.pro"
+	}
+
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+		}
+	}
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+}
+
+dependencies {
+	implementation "androidx.fragment:fragment:$androidx_fragment_version"
+	implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
+	implementation "com.google.android.material:material:$google_material_version"
+}

dont-kill-me-lib/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

dont-kill-me-lib/src/main/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.briarproject.android.dontkillmelib">
+
+	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+
+	<queries>
+		<package android:name="com.huawei.systemmanager" />
+		<package android:name="com.huawei.powergenie" />
+		<package android:name="com.evenwell.PowerMonitor" />
+	</queries>
+
+</manifest>

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/AbstractDoNotKillMeFragment.java

@@ -0,0 +1,115 @@
+package org.briarproject.android.dontkillmelib;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ProgressBar;
+
+import org.briarproject.android.dontkillmelib.PowerView.OnCheckedChangedListener;
+
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static org.briarproject.android.dontkillmelib.PowerUtils.getDozeWhitelistingIntent;
+import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
+
+public abstract class AbstractDoNotKillMeFragment extends Fragment
+		implements OnCheckedChangedListener,
+		ActivityResultCallback<ActivityResult> {
+
+	public final static String TAG =
+			AbstractDoNotKillMeFragment.class.getName();
+
+	private DozeView dozeView;
+	private HuaweiProtectedAppsView huaweiProtectedAppsView;
+	private HuaweiAppLaunchView huaweiAppLaunchView;
+	private XiaomiView xiaomiView;
+	private Button next;
+	private boolean secondAttempt = false;
+	private boolean buttonWasClicked = false;
+
+	private final ActivityResultLauncher<Intent> dozeLauncher =
+			registerForActivityResult(new StartActivityForResult(), this);
+
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		requireActivity().setTitle(getString(R.string.setup_doze_title));
+		setHasOptionsMenu(false);
+		View v = inflater.inflate(R.layout.fragment_dont_kill_me, container,
+				false);
+		dozeView = v.findViewById(R.id.dozeView);
+		dozeView.setOnCheckedChangedListener(this);
+		huaweiProtectedAppsView = v.findViewById(R.id.huaweiProtectedAppsView);
+		huaweiProtectedAppsView.setOnCheckedChangedListener(this);
+		huaweiAppLaunchView = v.findViewById(R.id.huaweiAppLaunchView);
+		huaweiAppLaunchView.setOnCheckedChangedListener(this);
+		xiaomiView = v.findViewById(R.id.xiaomiView);
+		xiaomiView.setOnCheckedChangedListener(this);
+		next = v.findViewById(R.id.next);
+		ProgressBar progressBar = v.findViewById(R.id.progress);
+
+		dozeView.setOnButtonClickListener(this::askForDozeWhitelisting);
+		next.setOnClickListener(view -> {
+			buttonWasClicked = true;
+			next.setVisibility(INVISIBLE);
+			progressBar.setVisibility(VISIBLE);
+			onButtonClicked();
+		});
+
+		// restore UI state if button was clicked already
+		buttonWasClicked = savedInstanceState != null &&
+				savedInstanceState.getBoolean("buttonWasClicked", false);
+		if (buttonWasClicked) {
+			next.setVisibility(INVISIBLE);
+			progressBar.setVisibility(VISIBLE);
+		}
+
+		return v;
+	}
+
+	protected abstract void onButtonClicked();
+
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putBoolean("buttonWasClicked", buttonWasClicked);
+	}
+
+	@Override
+	public void onActivityResult(ActivityResult result) {
+		if (!dozeView.needsToBeShown() || secondAttempt) {
+			dozeView.setChecked(true);
+		} else if (getContext() != null) {
+			secondAttempt = true;
+			String s = getString(R.string.setup_doze_explanation);
+			showOnboardingDialog(getContext(), s);
+		}
+	}
+
+	@Override
+	public void onCheckedChanged() {
+		next.setEnabled(dozeView.isChecked() &&
+				huaweiProtectedAppsView.isChecked() &&
+				huaweiAppLaunchView.isChecked() &&
+				xiaomiView.isChecked());
+	}
+
+	@SuppressLint("BatteryLife")
+	private void askForDozeWhitelisting() {
+		if (getContext() == null) return;
+		dozeLauncher.launch(getDozeWhitelistingIntent(getContext()));
+	}
+}

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/AbstractDozeWatchdogImpl.java

@@ -0,0 +1,49 @@
+package org.briarproject.android.dontkillmelib;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.PowerManager;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static android.content.Context.POWER_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
+
+public abstract class AbstractDozeWatchdogImpl {
+
+	private final Context appContext;
+	private final AtomicBoolean dozed = new AtomicBoolean(false);
+	private final BroadcastReceiver receiver = new DozeBroadcastReceiver();
+
+	public AbstractDozeWatchdogImpl(Context appContext) {
+		this.appContext = appContext;
+	}
+
+	public boolean getAndResetDozeFlag() {
+		return dozed.getAndSet(false);
+	}
+
+	public void startService() {
+		if (SDK_INT < 23) return;
+		IntentFilter filter = new IntentFilter(ACTION_DEVICE_IDLE_MODE_CHANGED);
+		appContext.registerReceiver(receiver, filter);
+	}
+
+	public void stopService() {
+		if (SDK_INT < 23) return;
+		appContext.unregisterReceiver(receiver);
+	}
+
+	private class DozeBroadcastReceiver extends BroadcastReceiver {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if (SDK_INT < 23) return;
+			PowerManager pm =
+					(PowerManager) appContext.getSystemService(POWER_SERVICE);
+			if (pm.isDeviceIdleMode()) dozed.set(true);
+		}
+	}
+}

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/DozeHelper.java

@@ -0,0 +1,7 @@
+package org.briarproject.android.dontkillmelib;
+
+import android.content.Context;
+
+public interface DozeHelper {
+	boolean needToShowDoNotKillMeFragment(Context context);
+}

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/DozeHelperImpl.java

@@ -1,12 +1,12 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 import android.content.Context;
 
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 
-class DozeHelperImpl implements DozeHelper {
+public class DozeHelperImpl implements DozeHelper {
 	@Override
-	public boolean needToShowDozeFragment(Context context) {
+	public boolean needToShowDoNotKillMeFragment(Context context) {
 		Context appContext = context.getApplicationContext();
 		return needsDozeWhitelisting(appContext) ||
 				HuaweiProtectedAppsView.needsToBeShown(appContext) ||

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/DozeView.java

@@ -1,19 +1,15 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
+import static org.briarproject.android.dontkillmelib.PowerUtils.needsDozeWhitelisting;
 
 @UiThread
-@NotNullByDefault
 class DozeView extends PowerView {
 
 	@Nullable

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/HuaweiAppLaunchView.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 
 import android.content.Context;
@@ -7,13 +7,9 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.util.AttributeSet;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
 import java.util.List;
 
-import javax.annotation.Nullable;
-
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 
@@ -21,7 +17,6 @@ import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
 import static android.os.Build.VERSION.SDK_INT;
 
 @UiThread
-@NotNullByDefault
 class HuaweiAppLaunchView extends PowerView {
 
 	private final static String PACKAGE_NAME = "com.huawei.systemmanager";

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/HuaweiProtectedAppsView.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 
 import android.content.Context;
@@ -7,13 +7,9 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.util.AttributeSet;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
 import java.util.List;
 
-import javax.annotation.Nullable;
-
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 
@@ -21,7 +17,6 @@ import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
 import static android.os.Build.VERSION.SDK_INT;
 
 @UiThread
-@NotNullByDefault
 class HuaweiProtectedAppsView extends PowerView {
 
 	private final static String PACKAGE_NAME = "com.huawei.systemmanager";

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerUtils.java

@@ -0,0 +1,60 @@
+package org.briarproject.android.dontkillmelib;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PowerManager;
+
+import java.io.IOException;
+import java.util.Scanner;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import static android.content.Context.POWER_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS;
+import static java.lang.Runtime.getRuntime;
+
+public class PowerUtils {
+
+	public static boolean needsDozeWhitelisting(Context ctx) {
+		if (SDK_INT < 23) return false;
+		PowerManager pm = (PowerManager) ctx.getSystemService(POWER_SERVICE);
+		String packageName = ctx.getPackageName();
+		if (pm == null) throw new AssertionError();
+		return !pm.isIgnoringBatteryOptimizations(packageName);
+	}
+
+	@TargetApi(23)
+	@SuppressLint("BatteryLife")
+	public static Intent getDozeWhitelistingIntent(Context ctx) {
+		Intent i = new Intent();
+		i.setAction(ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+		i.setData(Uri.parse("package:" + ctx.getPackageName()));
+		return i;
+	}
+
+	static void showOnboardingDialog(Context ctx, String text) {
+		new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme)
+				.setMessage(text)
+				.setNeutralButton(R.string.got_it,
+						(dialog, which) -> dialog.cancel())
+				.show();
+	}
+
+	@Nullable
+	static String getSystemProperty(String propName) {
+		try {
+			Process p = getRuntime().exec("getprop " + propName);
+			Scanner s = new Scanner(p.getInputStream());
+			String line = s.nextLine();
+			s.close();
+			return line;
+		} catch (SecurityException | IOException e) {
+			return null;
+		}
+	}
+}

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerView.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 import android.content.Context;
 import android.os.Parcel;
@@ -11,19 +11,15 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
+import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
 
 @UiThread
-@NotNullByDefault
 abstract class PowerView extends ConstraintLayout {
 
 	private final TextView textView;

dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/XiaomiView.java

@@ -1,24 +1,18 @@
-package org.briarproject.briar.android.account;
+package org.briarproject.android.dontkillmelib;
 
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
-import javax.annotation.Nullable;
-
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 
 import static android.os.Build.BRAND;
-import static org.briarproject.bramble.util.AndroidUtils.getSystemProperty;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
+import static org.briarproject.android.dontkillmelib.PowerUtils.getSystemProperty;
+import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
 
 @UiThread
-@NotNullByDefault
 class XiaomiView extends PowerView {
 
 	public XiaomiView(Context context) {
@@ -63,7 +57,7 @@ class XiaomiView extends PowerView {
 
 	private boolean isMiuiTenOrLater() {
 		String version = getSystemProperty("ro.miui.ui.version.name");
-		if (isNullOrEmpty(version)) return false;
+		if (version == null || version.equals("")) return false;
 		version = version.replaceAll("[^\\d]", "");
 		try {
 			return Integer.parseInt(version) >= 10;

dont-kill-me-lib/src/main/res/drawable/ic_check_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>

dont-kill-me-lib/src/main/res/drawable/ic_help_outline_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
+</vector>

dont-kill-me-lib/src/main/res/layout/fragment_dont_kill_me.xml

@@ -9,47 +9,47 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:padding="@dimen/margin_activity_vertical">
+		android:padding="16dp">
 
-		<org.briarproject.briar.android.account.DozeView
+		<org.briarproject.android.dontkillmelib.DozeView
 			android:id="@+id/dozeView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingBottom="@dimen/margin_large"
+			android:paddingBottom="16dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent" />
 
-		<org.briarproject.briar.android.account.HuaweiProtectedAppsView
+		<org.briarproject.android.dontkillmelib.HuaweiProtectedAppsView
 			android:id="@+id/huaweiProtectedAppsView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingBottom="@dimen/margin_large"
+			android:paddingBottom="16dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/dozeView" />
 
-		<org.briarproject.briar.android.account.HuaweiAppLaunchView
+		<org.briarproject.android.dontkillmelib.HuaweiAppLaunchView
 			android:id="@+id/huaweiAppLaunchView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingBottom="@dimen/margin_large"
+			android:paddingBottom="16dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiProtectedAppsView" />
 
-		<org.briarproject.briar.android.account.XiaomiView
+		<org.briarproject.android.dontkillmelib.XiaomiView
 			android:id="@+id/xiaomiView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingBottom="@dimen/margin_large"
+			android:paddingBottom="16dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiAppLaunchView" />
 
 		<Button
 			android:id="@+id/next"
-			style="@style/BriarButton"
+			style="@style/DoNotKillMeButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:enabled="false"

dont-kill-me-lib/src/main/res/layout/power_view.xml

@@ -10,12 +10,12 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/margin_large"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginTop="@dimen/margin_medium"
-		android:layout_marginEnd="@dimen/margin_large"
-		android:layout_marginRight="@dimen/margin_large"
-		android:textSize="@dimen/text_size_medium"
+		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:textSize="16sp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
@@ -25,7 +25,7 @@
 		android:id="@+id/checkImage"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_margin="@dimen/margin_medium"
+		android:layout_margin="8dp"
 		android:visibility="invisible"
 		app:layout_constraintBottom_toBottomOf="@+id/button"
 		app:layout_constraintStart_toStartOf="parent"
@@ -36,10 +36,10 @@
 
 	<Button
 		android:id="@+id/button"
-		style="@style/BriarButton"
+		style="@style/DoNotKillMeButton"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_medium"
+		android:layout_margin="8dp"
 		app:layout_constraintEnd_toStartOf="@+id/helpButton"
 		app:layout_constraintStart_toEndOf="@+id/checkImage"
 		app:layout_constraintTop_toBottomOf="@+id/textView"
@@ -47,15 +47,14 @@
 
 	<ImageButton
 		android:id="@+id/helpButton"
-		style="@style/BriarButtonFlat.Positive"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
-		android:layout_margin="@dimen/margin_medium"
+		style="@style/HelpButton"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:background="?attr/selectableItemBackgroundBorderless"
 		android:contentDescription="@string/help"
-		android:tint="@color/briar_button_text_positive"
 		app:layout_constraintBottom_toBottomOf="@+id/button"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/button"
 		app:srcCompat="@drawable/ic_help_outline_white" />
 
-</merge>
+</merge>

dont-kill-me-lib/src/main/res/values/strings.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+	<!--
+	WARNING: These strings typically get overwritten by library consumers.
+	         If adding/removing strings here, consumers need to adapt.
+	-->
+
+	<string name="setup_doze_title">Background Connections</string>
+	<string name="setup_doze_intro">To work properly, this app needs to run in the background.</string>
+	<string name="setup_doze_explanation">Please disable battery optimizations so this app can run in the background.</string>
+	<string name="setup_doze_button">Allow Connections</string>
+	<string name="create_account_button">Continue</string>
+
+	<string name="setup_huawei_text">Please tap the button below and make sure this app is protected in the \"Protected Apps\" screen.</string>
+	<string name="setup_huawei_button">Protect this app</string>
+	<string name="setup_huawei_help">If this app is not added to the protected apps list, it will be unable to run in the background.</string>
+	<string name="setup_huawei_app_launch_text">Please tap the button below, open the \"App launch\" screen and make sure this app is set to \"Manage manually\".</string>
+	<string name="setup_huawei_app_launch_button">Open Battery Settings</string>
+	<string name="setup_huawei_app_launch_help">If this app is not set to \"Manage manually\" in the \"App launch\" screen, it will not be able to run in the background.</string>
+	<string name="setup_xiaomi_text">To run in the background, this app needs to be locked to the recent apps list.</string>
+	<string name="setup_xiaomi_button">Protect this app</string>
+	<string name="setup_xiaomi_help">If this app is not locked to the recent apps list, it will be unable to run in the background.</string>
+	<string name="setup_xiaomi_dialog_body_old">1. Open the recent apps list (also called the app switcher)\n\n2. Swipe down on the image of this app to show the padlock icon\n\n3. If the padlock is not locked, tap to lock it</string>
+	<string name="setup_xiaomi_dialog_body_new">1. Open the recent apps list (also called the app switcher)\n\n2. Press and hold the image of this app until the padlock button appears\n\n3. If the padlock is not locked, tap to lock it</string>
+
+	<string name="got_it">Got it</string>
+	<string name="help">Help</string>
+</resources>

dont-kill-me-lib/src/main/res/values/styles.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="OnboardingDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth" />
+
+	<style name="DoNotKillMeButton" parent="Widget.AppCompat.Button.Colored" />
+
+	<style name="HelpButton" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:tint">#418cd8</item>
+	</style>
+
+</resources>

settings.gradle

@@ -6,3 +6,4 @@ include ':briar-api'
 include ':briar-core'
 include ':briar-android'
 include ':briar-headless'
+include ':dont-kill-me-lib'