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

Merge branch '336-remove-testing-activity' into 'master'

Browse Source 
Remove old user feedback activity

Fixes #336.

See merge request !162
This commit is contained in:
str4d
2016-04-29 22:57:23 +00:00
parent 29071fcc79 c72e5be804
commit 5cd2af025d
8 changed files with 53 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
briar-android/AndroidManifest.xml
View File

@@ -34,6 +34,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:logo="@drawable/logo" android:logo="@drawable/logo"
android:theme="@style/BriarTheme"> android:theme="@style/BriarTheme">
<service <service
android:name=".android.BriarService" android:name=".android.BriarService"
android:exported="false"> android:exported="false">
@@ -41,6 +42,7 @@
<action android:name="org.briarproject.android.BriarService"/> <action android:name="org.briarproject.android.BriarService"/>
</intent-filter> </intent-filter>
</service> </service>
<activity <activity
android:name=".android.DevReportActivity" android:name=".android.DevReportActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
@@ -50,19 +52,23 @@
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:process=":briar_error_handler"> android:process=":briar_error_handler">
</activity> </activity>
<activity <activity
android:name=".android.ExpiredActivity" android:name=".android.ExpiredActivity"
android:label="@string/app_name"> android:label="@string/app_name">
</activity> </activity>
<activity <activity
android:name=".android.PasswordActivity" android:name=".android.PasswordActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateVisible"> android:windowSoftInputMode="stateVisible">
</activity> </activity>
<activity <activity
android:name=".android.SetupActivity" android:name=".android.SetupActivity"
android:label="@string/setup_title"> android:label="@string/setup_title">
</activity> </activity>
<activity <activity
android:name=".android.SplashScreenActivity" android:name=".android.SplashScreenActivity"
android:theme="@style/BriarThemeNoActionBar.Default" android:theme="@style/BriarThemeNoActionBar.Default"
@@ -72,16 +78,12 @@
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".android.TestingActivity"
android:label="@string/app_name">
</activity>
<activity <activity
android:name=".android.NavDrawerActivity" android:name=".android.NavDrawerActivity"
android:theme="@style/BriarThemeNoActionBar.Default" android:theme="@style/BriarThemeNoActionBar.Default"
android:launchMode="singleTop" android:launchMode="singleTop">
/> </activity>
<activity <activity
android:name=".android.contact.ConversationActivity" android:name=".android.contact.ConversationActivity"
@@ -94,6 +96,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.AvailableForumsActivity" android:name=".android.forum.AvailableForumsActivity"
android:label="@string/available_forums_title" android:label="@string/available_forums_title"
@@ -103,6 +106,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.CreateForumActivity" android:name=".android.forum.CreateForumActivity"
android:label="@string/create_forum_title" android:label="@string/create_forum_title"
@@ -113,6 +117,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.ForumActivity" android:name=".android.forum.ForumActivity"
android:label="@string/app_name" android:label="@string/app_name"
@@ -122,6 +127,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.ReadForumPostActivity" android:name=".android.forum.ReadForumPostActivity"
android:label="@string/app_name" android:label="@string/app_name"
@@ -131,6 +137,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.ShareForumActivity" android:name=".android.forum.ShareForumActivity"
android:label="@string/app_name" android:label="@string/app_name"
@@ -140,6 +147,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.forum.WriteForumPostActivity" android:name=".android.forum.WriteForumPostActivity"
android:label="@string/app_name" android:label="@string/app_name"
@@ -150,11 +158,13 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.identity.CreateIdentityActivity" android:name=".android.identity.CreateIdentityActivity"
android:label="@string/new_identity_title" android:label="@string/new_identity_title"
android:windowSoftInputMode="stateVisible"> android:windowSoftInputMode="stateVisible">
</activity> </activity>
<activity <activity
android:name=".android.invitation.AddContactActivity" android:name=".android.invitation.AddContactActivity"
android:label="@string/add_contact_title" android:label="@string/add_contact_title"
@@ -164,6 +174,7 @@
android:value=".android.NavDrawerActivity" android:value=".android.NavDrawerActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.keyagreement.KeyAgreementActivity" android:name=".android.keyagreement.KeyAgreementActivity"
android:label="@string/add_contact_title" android:label="@string/add_contact_title"
@@ -173,6 +184,7 @@
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".android.NavDrawerActivity"/> android:value=".android.NavDrawerActivity"/>
</activity> </activity>
<activity <activity
android:name=".android.introduction.IntroductionActivity" android:name=".android.introduction.IntroductionActivity"
android:label="@string/introduction_activity_title" android:label="@string/introduction_activity_title"
@@ -183,10 +195,12 @@
android:value=".android.contact.ConversationActivity" android:value=".android.contact.ConversationActivity"
/> />
</activity> </activity>
<activity <activity
android:name=".android.StartupFailureActivity" android:name=".android.StartupFailureActivity"
android:label="@string/startup_failed_activity_title"> android:label="@string/startup_failed_activity_title">
</activity> </activity>
<activity <activity
android:name=".android.SettingsActivity" android:name=".android.SettingsActivity"
android:label="@string/settings_title" android:label="@string/settings_title"
@@ -200,6 +214,7 @@
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".android.panic.PanicPreferencesActivity" android:name=".android.panic.PanicPreferencesActivity"
android:label="@string/panic_setting"> android:label="@string/panic_setting">
@@ -210,6 +225,7 @@
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".android.panic.PanicResponderActivity" android:name=".android.panic.PanicResponderActivity"
android:noHistory="true" android:noHistory="true"
@@ -220,8 +236,11 @@
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".android.panic.ExitActivity" android:name=".android.panic.ExitActivity"
android:theme="@android:style/Theme.NoDisplay"/> android:theme="@android:style/Theme.NoDisplay">
</activity>
</application> </application>
</manifest> </manifest>

8
briar-android/res/values/strings.xml
View File

@@ -112,6 +112,8 @@
<item quantity="one">New forum post.</item> <item quantity="one">New forum post.</item>
<item quantity="other">%d new forum posts.</item> <item quantity="other">%d new forum posts.</item>
</plurals> </plurals>
<!-- Settings -->
<string name="settings_title">Settings</string> <string name="settings_title">Settings</string>
<string name="network_settings_title">Networks</string> <string name="network_settings_title">Networks</string>
<string name="bluetooth_setting">Connect via Bluetooth</string> <string name="bluetooth_setting">Connect via Bluetooth</string>
@@ -131,11 +133,13 @@
<string name="notify_sound_setting_default">Default ringtone</string> <string name="notify_sound_setting_default">Default ringtone</string>
<string name="notify_sound_setting_disabled">None</string> <string name="notify_sound_setting_disabled">None</string>
<string name="choose_ringtone_title">Choose ringtone</string> <string name="choose_ringtone_title">Choose ringtone</string>
<string name="crash_report_settings_title">Crash reports</string>
<string name="enable_acra_setting">Enable crash reporter</string> <string name="enable_acra_setting">Enable crash reporter</string>
<string name="acra_syslog_setting">Send system logs</string> <string name="acra_syslog_setting">Send system logs</string>
<string name="acra_user_email_setting">Optional contact email</string> <string name="acra_user_email_setting">Optional contact email</string>
<string name="acra_alwaysaccept_setting">Always send reports</string> <string name="acra_alwaysaccept_setting">Always send reports</string>
<string name="panic_app_setting_title">Panic Button App</string> <string name="panic_app_setting_title">Panic Button App</string>
<string name="unknown_app">an unknown app</string>
<string name="panic_app_setting_summary">No app has been set</string> <string name="panic_app_setting_summary">No app has been set</string>
<string name="panic_app_setting_none">None</string> <string name="panic_app_setting_none">None</string>
<string name="lock_setting_title">Sign Out</string> <string name="lock_setting_title">Sign Out</string>
@@ -144,6 +148,9 @@
<string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string> <string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
<string name="uninstall_setting_title">Uninstall Briar</string> <string name="uninstall_setting_title">Uninstall Briar</string>
<string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string> <string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string>
<string name="feedback_settings_title">Feedback</string>
<string name="send_feedback">Send feedback</string>
<string name="step">Step %1$d/%2$d</string> <string name="step">Step %1$d/%2$d</string>
<string name="online">Online</string> <string name="online">Online</string>
<string name="offline">Offline</string> <string name="offline">Offline</string>
@@ -152,7 +159,6 @@
<string name="transport_bt">Bluetooth</string> <string name="transport_bt">Bluetooth</string>
<string name="transport_lan">Wi-Fi</string> <string name="transport_lan">Wi-Fi</string>
<string name="no_data">No data</string> <string name="no_data">No data</string>
<string name="unknown_app">an unknown app</string>
<!-- Introduction Client --> <!-- Introduction Client -->
<string name="introduction_activity_title">Select Contact</string> <string name="introduction_activity_title">Select Contact</string>

11
briar-android/res/xml/settings.xml
View File

@@ -68,7 +68,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="Crash reports"> android:title="@string/crash_report_settings_title">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
@@ -96,4 +96,13 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory
android:title="@string/feedback_settings_title">
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

23
briar-android/res/xml/settings_debug.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:title="Debug">
<Preference
android:title="Debug information">
<intent
android:targetClass="org.briarproject.android.TestingActivity"
android:targetPackage="org.briarproject"/>
</Preference>
<Preference
android:key="send_feedback"
android:title="Send feedback"/>
</PreferenceCategory>
</PreferenceScreen>

2
briar-android/src/org/briarproject/android/AndroidComponent.java
View File

@@ -62,8 +62,6 @@ public interface AndroidComponent extends CoreEagerSingletons {
void inject(CreateIdentityActivity activity); void inject(CreateIdentityActivity activity);
void inject(TestingActivity activity);
void inject(AvailableForumsActivity activity); void inject(AvailableForumsActivity activity);
void inject(WriteForumPostActivity activity); void inject(WriteForumPostActivity activity);

452
briar-android/src/org/briarproject/android/TestingActivity.java
View File

@@ -1,452 +0,0 @@
package org.briarproject.android;
import android.annotation.SuppressLint;
import android.app.ActivityManager;
import android.bluetooth.BluetoothAdapter;
import android.content.Intent;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import org.briarproject.R;
import org.briarproject.android.util.AndroidUtils;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.properties.TransportProperties;
import org.briarproject.api.properties.TransportPropertyManager;
import org.briarproject.util.StringUtils;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
import java.util.logging.Logger;
import java.util.regex.Pattern;
import javax.inject.Inject;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
import static android.content.Intent.ACTION_SEND;
import static android.content.Intent.EXTRA_EMAIL;
import static android.content.Intent.EXTRA_SUBJECT;
import static android.content.Intent.EXTRA_TEXT;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
public class TestingActivity extends BriarActivity implements OnClickListener {
private static final Logger LOG =
Logger.getLogger(TestingActivity.class.getName());
@Inject protected PluginManager pluginManager;
@Inject protected LifecycleManager lifecycleManager;
@Inject protected TransportPropertyManager transportPropertyManager;
private ScrollView scroll = null;
private ListLoadingProgressBar progress = null;
private LinearLayout status = null;
private ImageButton refresh = null, share = null;
private volatile BluetoothAdapter bt = null;
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
bt = BluetoothAdapter.getDefaultAdapter();
LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_MATCH);
layout.setOrientation(VERTICAL);
layout.setGravity(CENTER_HORIZONTAL);
scroll = new ScrollView(this);
scroll.setLayoutParams(MATCH_WRAP_1);
status = new LinearLayout(this);
status.setOrientation(VERTICAL);
status.setGravity(CENTER_HORIZONTAL);
int pad = LayoutUtils.getPadding(this);
status.setPadding(pad, pad, pad, pad);
scroll.addView(status);
layout.addView(scroll);
progress = new ListLoadingProgressBar(this);
progress.setVisibility(GONE);
layout.addView(progress);
layout.addView(new HorizontalBorder(this));
LinearLayout footer = new LinearLayout(this);
footer.setLayoutParams(MATCH_WRAP);
footer.setGravity(CENTER);
Resources res = getResources();
footer.setBackgroundColor(res.getColor(R.color.button_bar_background));
footer.addView(new ElasticHorizontalSpace(this));
refresh = new ImageButton(this);
refresh.setBackgroundResource(0);
refresh.setImageResource(R.drawable.navigation_refresh);
refresh.setOnClickListener(this);
footer.addView(refresh);
footer.addView(new ElasticHorizontalSpace(this));
share = new ImageButton(this);
share.setBackgroundResource(0);
share.setImageResource(R.drawable.social_share_old);
share.setOnClickListener(this);
footer.addView(share);
footer.addView(new ElasticHorizontalSpace(this));
layout.addView(footer);
setContentView(layout);
}
@Override
public void injectActivity(AndroidComponent component) {
component.inject(this);
}
@Override
public void onResume() {
super.onResume();
refresh();
}
public void onClick(View view) {
if (view == refresh) refresh();
else if (view == share) share();
}
private void refresh() {
status.removeAllViews();
scroll.setVisibility(GONE);
progress.setVisibility(VISIBLE);
new AsyncTask<Void, Void, Map<String, String>>() {
@Override
protected Map<String, String> doInBackground(Void... args) {
return getStatusMap();
}
@Override
protected void onPostExecute(Map<String, String> result) {
int pad = LayoutUtils.getPadding(TestingActivity.this);
for (Entry<String, String> e : result.entrySet()) {
TextView title = new TextView(TestingActivity.this);
title.setTextSize(18);
title.setText(e.getKey());
status.addView(title);
TextView content = new TextView(TestingActivity.this);
content.setPadding(0, 0, 0, pad);
content.setText(e.getValue());
status.addView(content);
}
scroll.scrollTo(0, 0);
scroll.setVisibility(VISIBLE);
progress.setVisibility(GONE);
}
}.execute();
}
// FIXME: Load strings from resources if we're keeping this activity
@SuppressLint("NewApi")
private Map<String, String> getStatusMap() {
Map<String, String> statusMap = new LinkedHashMap<String, String>();
// Device type
String deviceType;
String manufacturer = Build.MANUFACTURER;
String model = Build.MODEL;
String brand = Build.BRAND;
if (model.startsWith(manufacturer)) deviceType = capitalize(model);
else deviceType = capitalize(manufacturer) + " " + model;
if (!StringUtils.isNullOrEmpty(brand))
deviceType += " (" + capitalize(brand) + ")";
statusMap.put("Device type:", deviceType);
// Android version
String release = Build.VERSION.RELEASE;
int sdk = Build.VERSION.SDK_INT;
statusMap.put("Android version:", release + " (" + sdk + ")");
// CPU architectures
Collection<String> abis = AndroidUtils.getSupportedArchitectures();
String joined = StringUtils.join(abis, ", ");
statusMap.put("Architecture:", joined);
// System memory
Object o = getSystemService(ACTIVITY_SERVICE);
ActivityManager am = (ActivityManager) o;
ActivityManager.MemoryInfo mem = new ActivityManager.MemoryInfo();
am.getMemoryInfo(mem);
String systemMemory;
if (Build.VERSION.SDK_INT >= 16) {
systemMemory = (mem.totalMem / 1024 / 1024) + " MiB total, "
+ (mem.availMem / 1024 / 1204) + " MiB free, "
+ (mem.threshold / 1024 / 1024) + " MiB threshold";
} else {
systemMemory = (mem.availMem / 1024 / 1204) + " MiB free, "
+ (mem.threshold / 1024 / 1024) + " MiB threshold";
}
statusMap.put("System memory:", systemMemory);
// Virtual machine memory
Runtime runtime = Runtime.getRuntime();
long heap = runtime.totalMemory();
long heapFree = runtime.freeMemory();
long heapMax = runtime.maxMemory();
String vmMemory = (heap / 1024 / 1024) + " MiB allocated, "
+ (heapFree / 1024 / 1024) + " MiB free, "
+ (heapMax / 1024 / 1024) + " MiB maximum";
statusMap.put("Virtual machine memory:", vmMemory);
// Internal storage
File root = Environment.getRootDirectory();
long rootTotal = root.getTotalSpace();
long rootFree = root.getFreeSpace();
String internal = (rootTotal / 1024 / 1024) + " MiB total, "
+ (rootFree / 1024 / 1024) + " MiB free";
statusMap.put("Internal storage:", internal);
// External storage (SD card)
File sd = Environment.getExternalStorageDirectory();
long sdTotal = sd.getTotalSpace();
long sdFree = sd.getFreeSpace();
String external = (sdTotal / 1024 / 1024) + " MiB total, "
+ (sdFree / 1024 / 1024) + " MiB free";
statusMap.put("External storage:", external);
// Is mobile data available?
o = getSystemService(CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager) o;
NetworkInfo mobile = cm.getNetworkInfo(TYPE_MOBILE);
boolean mobileAvailable = mobile != null && mobile.isAvailable();
// Is mobile data enabled?
boolean mobileEnabled = false;
try {
Class<?> clazz = Class.forName(cm.getClass().getName());
Method method = clazz.getDeclaredMethod("getMobileDataEnabled");
method.setAccessible(true);
mobileEnabled = (Boolean) method.invoke(cm);
} catch (ClassNotFoundException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} catch (NoSuchMethodException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} catch (IllegalAccessException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} catch (IllegalArgumentException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} catch (InvocationTargetException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
// Is mobile data connected ?
boolean mobileConnected = mobile != null && mobile.isConnected();
String mobileStatus;
if (mobileAvailable) mobileStatus = "Available, ";
else mobileStatus = "Not available, ";
if (mobileEnabled) mobileStatus += "enabled, ";
else mobileStatus += "not enabled, ";
if (mobileConnected) mobileStatus += "connected";
else mobileStatus += "not connected";
statusMap.put("Mobile data:", mobileStatus);
// Is wifi available?
NetworkInfo wifi = cm.getNetworkInfo(TYPE_WIFI);
boolean wifiAvailable = wifi != null && wifi.isAvailable();
// Is wifi enabled?
WifiManager wm = (WifiManager) getSystemService(WIFI_SERVICE);
boolean wifiEnabled = wm != null &&
wm.getWifiState() == WIFI_STATE_ENABLED;
// Is wifi connected?
boolean wifiConnected = wifi != null && wifi.isConnected();
String wifiStatus;
if (wifiAvailable) wifiStatus = "Available, ";
else wifiStatus = "Not available, ";
if (wifiEnabled) wifiStatus += "enabled, ";
else wifiStatus += "not enabled, ";
if (wifiConnected) wifiStatus += "connected";
else wifiStatus += "not connected";
if (wm != null) {
WifiInfo wifiInfo = wm.getConnectionInfo();
if (wifiInfo != null) {
int ip = wifiInfo.getIpAddress(); // Nice API, Google
int ip1 = ip & 0xFF;
int ip2 = (ip >> 8) & 0xFF;
int ip3 = (ip >> 16) & 0xFF;
int ip4 = (ip >> 24) & 0xFF;
String address = ip1 + "." + ip2 + "." + ip3 + "." + ip4;
wifiStatus += "\nAddress: " + address;
}
}
statusMap.put("Wi-Fi:", wifiStatus);
// Is Bluetooth available?
boolean btAvailable = bt != null;
// Is Bluetooth enabled?
boolean btEnabled = bt != null && bt.isEnabled() &&
!StringUtils.isNullOrEmpty(bt.getAddress());
// Is Bluetooth connectable?
boolean btConnectable = bt != null &&
(bt.getScanMode() == SCAN_MODE_CONNECTABLE ||
bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE);
// Is Bluetooth discoverable?
boolean btDiscoverable = bt != null &&
bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE;
String btStatus;
if (btAvailable) btStatus = "Available, ";
else btStatus = "Not available, ";
if (btEnabled) btStatus += "enabled, ";
else btStatus += "not enabled, ";
if (btConnectable) btStatus += "connectable, ";
else btStatus += "not connectable, ";
if (btDiscoverable) btStatus += "discoverable";
else btStatus += "not discoverable";
if (bt != null) btStatus += "\nAddress: " + bt.getAddress();
try {
String btAddr = Settings.Secure.getString(getContentResolver(),
"bluetooth_address");
btStatus += "\nAddress from settings: " + btAddr;
} catch (SecurityException e) {
btStatus += "\nCould not get address from settings";
}
statusMap.put("Bluetooth:", btStatus);
Map<TransportId, TransportProperties> props = Collections.emptyMap();
try {
lifecycleManager.waitForDatabase();
props = transportPropertyManager.getLocalProperties();
} catch (InterruptedException e) {
LOG.info("Interrupted while waiting for database");
Thread.currentThread().interrupt();
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
Plugin torPlugin = pluginManager.getPlugin(new TransportId("tor"));
boolean torPluginEnabled = torPlugin != null;
boolean torPluginRunning = torPlugin != null && torPlugin.isRunning();
String torPluginStatus;
if (torPluginEnabled) torPluginStatus = "Enabled, ";
else torPluginStatus = "Not enabled, ";
if (torPluginRunning) torPluginStatus += "running";
else torPluginStatus += "not running";
TransportProperties torProps = props.get(new TransportId("tor"));
if (torProps != null)
torPluginStatus += "\nAddress: " + torProps.get("onion");
statusMap.put("Tor plugin:", torPluginStatus);
Plugin lanPlugin = pluginManager.getPlugin(new TransportId("lan"));
boolean lanPluginEnabled = lanPlugin != null;
boolean lanPluginRunning = lanPlugin != null && lanPlugin.isRunning();
String lanPluginStatus;
if (lanPluginEnabled) lanPluginStatus = "Enabled, ";
else lanPluginStatus = "Not enabled, ";
if (lanPluginRunning) lanPluginStatus += "running";
else lanPluginStatus += "not running";
TransportProperties lanProps = props.get(new TransportId("lan"));
if (lanProps != null)
lanPluginStatus += "\nAddress: " + lanProps.get("address");
statusMap.put("LAN plugin:", lanPluginStatus);
Plugin btPlugin = pluginManager.getPlugin(new TransportId("bt"));
boolean btPluginEnabled = btPlugin != null;
boolean btPluginRunning = btPlugin != null && btPlugin.isRunning();
String btPluginStatus;
if (btPluginEnabled) btPluginStatus = "Enabled, ";
else btPluginStatus = "Not enabled, ";
if (btPluginRunning) btPluginStatus += "running";
else btPluginStatus += "not running";
TransportProperties btProps = props.get(new TransportId("bt"));
if (btProps != null)
btPluginStatus += "\nAddress: " + btProps.get("address");
statusMap.put("Bluetooth plugin:", btPluginStatus);
// All log output from the current process
StringBuilder log = new StringBuilder();
try {
int pid = android.os.Process.myPid();
Pattern pattern = Pattern.compile(".*\\( *" + pid + "\\).*");
Process process = runtime.exec("logcat -d -v time *:I");
Scanner scanner = new Scanner(process.getInputStream());
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (pattern.matcher(line).matches()) {
log.append(line);
log.append('\n');
}
}
scanner.close();
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
statusMap.put("Debugging log:", log.toString());
return Collections.unmodifiableMap(statusMap);
}
private String capitalize(String s) {
if (StringUtils.isNullOrEmpty(s)) return s;
char first = s.charAt(0);
if (Character.isUpperCase(first)) return s;
return Character.toUpperCase(first) + s.substring(1);
}
private void share() {
StringBuilder s = new StringBuilder();
for (Entry<String, String> e : getStatusMap().entrySet()) {
s.append(e.getKey());
s.append('\n');
s.append(e.getValue());
s.append("\n\n");
}
String body = s.toString();
Intent i = new Intent(ACTION_SEND);
i.setType("message/rfc822");
i.putExtra(EXTRA_EMAIL, new String[] { "contact@briarproject.org" });
i.putExtra(EXTRA_SUBJECT, "Testing report");
i.putExtra(EXTRA_TEXT, body);
startActivity(Intent.createChooser(i, "Send to developers"));
}
}

12
briar-android/src/org/briarproject/android/TestingConstants.java
View File

@@ -1,10 +1,10 @@
package org.briarproject.android; package org.briarproject.android;
import java.util.logging.Level;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.OFF; import static java.util.logging.Level.OFF;
import java.util.logging.Level;
public interface TestingConstants { public interface TestingConstants {
/** /**
@@ -23,12 +23,4 @@ public interface TestingConstants {
* intentionally. * intentionally.
*/ */
boolean PREVENT_SCREENSHOTS = TESTING ? false : true; boolean PREVENT_SCREENSHOTS = TESTING ? false : true;
/**
* Whether to allow TestingActivity to be launched from SettingsFragment.
*/
boolean SHOW_TESTING_ACTIVITY = TESTING ? true : false;
/** Whether to allow crash reports to be submitted by email. */
boolean SHARE_CRASH_REPORTS = TESTING ? true : false;
} }

20
briar-android/src/org/briarproject/android/fragment/SettingsFragment.java
View File

@@ -44,7 +44,6 @@ import static android.media.RingtoneManager.TYPE_NOTIFICATION;
import static android.provider.Settings.System.DEFAULT_NOTIFICATION_URI; import static android.provider.Settings.System.DEFAULT_NOTIFICATION_URI;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.android.TestingConstants.SHOW_TESTING_ACTIVITY;
public class SettingsFragment extends PreferenceFragmentCompat public class SettingsFragment extends PreferenceFragmentCompat
implements EventListener, Preference.OnPreferenceChangeListener { implements EventListener, Preference.OnPreferenceChangeListener {
@@ -131,17 +130,14 @@ public class SettingsFragment extends PreferenceFragmentCompat
} }
}); });
if (SHOW_TESTING_ACTIVITY) { findPreference("pref_key_send_feedback").setOnPreferenceClickListener(
addPreferencesFromResource(R.xml.settings_debug); new Preference.OnPreferenceClickListener() {
findPreference("send_feedback").setOnPreferenceClickListener( @Override
new Preference.OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) {
@Override triggerFeedback();
public boolean onPreferenceClick(Preference preference) { return true;
triggerFeedback(); }
return true; });
}
});
}
loadSettings(); loadSettings();
} }