commit 16f3a53529dfd466a5a4a8c54f7a5835f06d7e7d Author: Nathan Freitas nathan@freitas.net Date: Fri Apr 18 06:22:37 2014 -0400
enable diagnostics and menu option --- AndroidManifest.xml | 12 +----------- src/org/torproject/android/Orbot.java | 5 +++++ 2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7012833..09e4797 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -68,17 +68,7 @@
</activity>
- <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag" - android:icon="@drawable/ic_launcher" - android:theme="@style/Theme.AppCompat" - android:exported="true" - android:taskAffinity="org.torproject.android.OrbotDiagnosticsActivity" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> + <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag"/> <activity android:name=".wizard.LotsaText" android:exported="false"/> <activity android:name=".wizard.Permissions" android:exported="false"/> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 601b98e..2fa5f01 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -381,6 +381,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
} + else if (item.getItemId() == R.id.menu_diag) + { + startActivity(new Intent(getBaseContext(), OrbotDiagnosticsActivity.class)); + + } else if (item.getItemId() == R.id.menu_about) { showAbout();