Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Add help button to transports activity.

Browse Source
This commit is contained in:
akwizgran
2020-08-14 11:57:52 +01:00
parent 82e85bdb39
commit 4310e4d1af
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.android.navdrawer;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -24,7 +23,6 @@ import org.briarproject.bramble.api.plugin.TransportId;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.settings.SettingsActivity;
import java.util.ArrayList;
import java.util.List;
@@ -50,6 +48,7 @@ import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING
import static org.briarproject.bramble.api.plugin.TorConstants.REASON_BATTERY;
import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED;
import static org.briarproject.bramble.api.plugin.TorConstants.REASON_MOBILE_DATA;
import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -94,8 +93,9 @@ public class TransportsActivity extends BriarActivity {
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
} else if (item.getItemId() == R.id.action_open_settings) {
startActivity(new Intent(this, SettingsActivity.class));
} else if (item.getItemId() == R.id.action_help) {
String text = getString(R.string.transports_help_text);
showOnboardingDialog(this, text);
return true;
}
return false;
@@ -104,7 +104,7 @@ public class TransportsActivity extends BriarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.transports_actions, menu);
inflater.inflate(R.menu.help_action, menu);
return super.onCreateOptionsMenu(menu);
}

12
briar-android/src/main/res/menu/transports_actions.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_open_settings"
android:icon="@drawable/ic_settings_white"
android:title="@string/settings_button"
app:showAsAction="always"/>
</menu>

6
briar-android/src/main/res/values/strings.xml
View File

@@ -72,7 +72,6 @@
<!-- Transports: Tor -->
<string name="transport_tor">Internet</string>
<string name="tor_status">Internet status:</string>
<string name="tor_device_status_online_wifi">Your phone has Internet access via Wi-Fi</string>
<string name="tor_device_status_online_mobile">Your phone has Internet access via mobile data</string>
<string name="tor_device_status_offline">Your phone does not have Internet access</string>
@@ -87,7 +86,6 @@
<!-- Transports: Wi-Fi -->
<string name="transport_lan">Wi-Fi</string>
<string name="transport_lan_long">Same Wi-Fi network</string>
<string name="lan_status">Wi-Fi status:</string>
<string name="lan_device_status_on">Your phone is connected to Wi-Fi</string>
<string name="lan_device_status_off">Your phone is not connected to Wi-Fi</string>
<string name="lan_plugin_status_enabling">Briar is connecting to the Wi-Fi network</string>
@@ -97,7 +95,6 @@
<!-- Transports: Bluetooth -->
<string name="transport_bt">Bluetooth</string>
<string name="bt_status">Bluetooth status:</string>
<string name="bt_device_status_on">Your phone\'s Bluetooth is turned on</string>
<string name="bt_device_status_off">Your phone\'s Bluetooth is turned off</string>
<string name="bt_plugin_status_enabling">Briar is connecting to Bluetooth</string>
@@ -603,6 +600,9 @@
<string name="lock_is_locked">Briar is locked</string>
<string name="lock_tap_to_unlock">Tap to unlock</string>
<!-- Connections Screen -->
<string name="transports_help_text">Briar can connect to your contacts via the Internet, Wi-Fi or Bluetooth.\n\nAll Internet connections go through the Tor network for privacy.\n\nIf a contact can be reached by multiple methods, Briar uses them in parallel.</string>
<!-- Screenshots -->
<!-- This is a name to be used in screenshots. Feel free to change it to a local name. -->