Add transports activity.

2026-02-14 11:49:04 +01:00 · 2020-04-23 16:19:33 +01:00
parent c75c8da4b9
commit 73c6a29ede
9 changed files with 640 additions and 98 deletions
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-	package="org.briarproject.briar"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	package="org.briarproject.briar">

 	<uses-feature
 		android:name="android.hardware.bluetooth"
-		android:required="false"/>
+		android:required="false" />
 	<uses-feature
 		android:name="android.hardware.camera"
-		android:required="false"/>
+		android:required="false" />
 	<uses-feature
 		android:name="android.hardware.touchscreen"
-		android:required="false"/>
-	<uses-feature android:name="android.software.leanback"
-        android:required="false" />
+		android:required="false" />
+	<uses-feature
+		android:name="android.software.leanback"
+		android:required="false" />

-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-	<uses-permission android:name="android.permission.BLUETOOTH"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-	<uses-permission android:name="android.permission.CAMERA"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.BLUETOOTH" />
+	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+	<uses-permission android:name="android.permission.CAMERA" />
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<!--suppress DeprecatedClassUsageInspection -->
-	<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-	<uses-permission android:name="android.permission.VIBRATE"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

-	<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"/>
+	<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" />

 	<application
 		android:name="org.briarproject.briar.android.BriarApplicationImpl"
 		android:allowBackup="false"
+		android:banner="@mipmap/tv_banner"
 		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
-		android:banner="@mipmap/tv_banner"
 		android:supportsRtl="true"
 		android:theme="@style/BriarTheme"
 		tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
@@ -50,8 +50,8 @@
 			android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
 			android:exported="false">
 			<intent-filter>
-				<action android:name="android.intent.action.BOOT_COMPLETED"/>
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+				<action android:name="android.intent.action.BOOT_COMPLETED" />
+				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
 			</intent-filter>
 		</receiver>

@@ -59,14 +59,13 @@
 			android:name="org.briarproject.briar.android.BriarService"
 			android:exported="false">
 			<intent-filter>
-				<action android:name="org.briarproject.briar.android.BriarService"/>
+				<action android:name="org.briarproject.briar.android.BriarService" />
 			</intent-filter>
 		</service>

 		<service
 			android:name="org.briarproject.briar.android.NotificationCleanupService"
-			android:exported="false">
-		</service>
+			android:exported="false"></service>

 		<activity
 			android:name="org.briarproject.briar.android.reporting.DevReportActivity"
@@ -76,32 +75,29 @@
 			android:label="@string/crash_report_title"
 			android:launchMode="singleInstance"
 			android:theme="@style/BriarTheme.NoActionBar"
-			android:windowSoftInputMode="adjustResize|stateHidden">
-		</activity>
+			android:windowSoftInputMode="adjustResize|stateHidden"></activity>

 		<activity
 			android:name="org.briarproject.briar.android.splash.ExpiredActivity"
-			android:label="@string/app_name">
-		</activity>
+			android:label="@string/app_name"></activity>

 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
-			android:label="@string/app_name">
-		</activity>
+			android:label="@string/app_name"></activity>

 		<activity
 			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:label="@string/setup_title"
-			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
-		</activity>
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible"></activity>

 		<activity
 			android:name="org.briarproject.briar.android.splash.SplashScreenActivity"
 			android:label="@string/app_name"
 			android:theme="@style/BriarTheme.NoActionBar">
 			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-				<category android:name="android.intent.category.LAUNCHER"/>
+				<action android:name="android.intent.action.MAIN" />
+
+				<category android:name="android.intent.category.LAUNCHER" />
 				<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
 			</intent-filter>
 		</activity>
@@ -111,17 +107,17 @@
 			android:launchMode="singleTask"
 			android:theme="@style/BriarTheme.NoActionBar">
 			<intent-filter android:label="@string/add_contact_remotely_title_case">
-				<action android:name="android.intent.action.VIEW"/>
+				<action android:name="android.intent.action.VIEW" />

-				<category android:name="android.intent.category.DEFAULT"/>
-				<category android:name="android.intent.category.BROWSABLE"/>
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />

-				<data android:scheme="briar"/>
+				<data android:scheme="briar" />
 			</intent-filter>
 			<intent-filter android:label="@string/add_contact_remotely_title_case">
-				<action android:name="android.intent.action.SEND"/>
-				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:mimeType="text/plain"/>
+				<action android:name="android.intent.action.SEND" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="text/plain" />
 			</intent-filter>
 		</activity>

@@ -133,7 +129,7 @@
 			android:windowSoftInputMode="adjustResize|stateUnchanged">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -142,7 +138,7 @@
 			android:theme="@style/BriarTheme.ActionBarOverlay">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
 		</activity>

 		<activity
@@ -152,7 +148,7 @@
 			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -163,7 +159,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -172,7 +168,7 @@
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -181,7 +177,7 @@
 			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity"/>
+				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity" />
 		</activity>

 		<activity
@@ -190,7 +186,7 @@
 			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity"/>
+				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity" />
 		</activity>

 		<activity
@@ -200,7 +196,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity"/>
+				android:value="org.briarproject.briar.android.privategroup.conversation.GroupActivity" />
 		</activity>

 		<activity
@@ -209,7 +205,7 @@
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -218,7 +214,7 @@
 			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
 		</activity>

 		<activity
@@ -228,7 +224,7 @@
 			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -239,7 +235,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -249,7 +245,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.forum.ForumActivity"/>
+				android:value="org.briarproject.briar.android.forum.ForumActivity" />
 		</activity>

 		<activity
@@ -259,7 +255,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
+				android:value="org.briarproject.briar.android.blog.BlogActivity" />
 		</activity>

 		<activity
@@ -268,8 +264,7 @@
 			android:parentActivityName="org.briarproject.briar.android.forum.ForumActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.forum.ForumActivity"
-				/>
+				android:value="org.briarproject.briar.android.forum.ForumActivity" />
 		</activity>

 		<activity
@@ -278,7 +273,7 @@
 			android:parentActivityName="org.briarproject.briar.android.blog.BlogActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
+				android:value="org.briarproject.briar.android.blog.BlogActivity" />
 		</activity>

 		<activity
@@ -287,7 +282,7 @@
 			android:theme="@style/BriarTheme.NoActionBar">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -297,7 +292,7 @@
 			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
+				android:value="org.briarproject.briar.android.blog.BlogActivity" />
 		</activity>

 		<activity
@@ -307,7 +302,7 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.blog.BlogActivity"/>
+				android:value="org.briarproject.briar.android.blog.BlogActivity" />
 		</activity>

 		<activity
@@ -317,7 +312,7 @@
 			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -326,7 +321,7 @@
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -336,7 +331,7 @@
 			android:theme="@style/BriarTheme.NoActionBar">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 		</activity>

 		<activity
@@ -346,13 +341,12 @@
 			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
 		</activity>

 		<activity
 			android:name="org.briarproject.briar.android.StartupFailureActivity"
-			android:label="@string/startup_failed_activity_title">
-		</activity>
+			android:label="@string/startup_failed_activity_title"></activity>

 		<activity
 			android:name="org.briarproject.briar.android.settings.SettingsActivity"
@@ -361,13 +355,22 @@
 			android:permission="android.permission.READ_NETWORK_USAGE_HISTORY">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
 			<intent-filter>
-				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE"/>
-				<category android:name="android.intent.category.DEFAULT"/>
+				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
+				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>

+		<activity
+			android:name="org.briarproject.briar.android.navdrawer.TransportsActivity"
+			android:label="Connections"
+			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.login.ChangePasswordActivity"
 			android:label="@string/change_password"
@@ -375,7 +378,7 @@
 			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.settings.SettingsActivity"/>
+				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
 		</activity>

 		<activity
@@ -384,7 +387,7 @@
 			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.settings.SettingsActivity"/>
+				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
 		</activity>

 		<activity
@@ -393,7 +396,7 @@
 			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.settings.SettingsActivity"/>
+				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
 		</activity>

 		<activity
@@ -402,37 +405,35 @@
 			android:theme="@style/TranslucentTheme">
 			<!-- this can never have launchMode singleTask or singleInstance! -->
 			<intent-filter>
-				<action android:name="info.guardianproject.panic.action.TRIGGER"/>
-				<category android:name="android.intent.category.DEFAULT"/>
+				<action android:name="info.guardianproject.panic.action.TRIGGER" />
+				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>

 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
-			android:theme="@android:style/Theme.NoDisplay">
-		</activity>
+			android:theme="@android:style/Theme.NoDisplay"></activity>

 		<activity
 			android:name=".android.logout.HideUiActivity"
-			android:theme="@android:style/Theme.NoDisplay">
-		</activity>
+			android:theme="@android:style/Theme.NoDisplay"></activity>

 		<activity
 			android:name=".android.account.UnlockActivity"
 			android:label="@string/lock_unlock"
 			android:launchMode="singleTask"
-			android:theme="@style/BriarTheme.NoActionBar"/>
+			android:theme="@style/BriarTheme.NoActionBar" />

 		<activity
 			android:name=".android.contact.add.remote.AddContactActivity"
 			android:label="@string/add_contact_remotely_title_case"
 			android:theme="@style/BriarTheme"
-			android:windowSoftInputMode="adjustResize|stateHidden"/>
+			android:windowSoftInputMode="adjustResize|stateHidden" />

 		<activity
 			android:name=".android.contact.add.remote.PendingContactListActivity"
 			android:label="@string/pending_contact_requests"
-			android:theme="@style/BriarTheme"/>
+			android:theme="@style/BriarTheme" />

 	</application>
 </manifest>