dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable diagnostics and menu option

This commit is contained in:
Nathan Freitas 2014-04-18 06:22:37 -04:00
parent 4aa3cd6ea2
commit 16f3a53529
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@ -68,17 +68,7 @@
</activity> </activity>
<activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag" <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=".wizard.LotsaText" android:exported="false"/> <activity android:name=".wizard.LotsaText" android:exported="false"/>
<activity android:name=".wizard.Permissions" android:exported="false"/> <activity android:name=".wizard.Permissions" android:exported="false"/>

5
src/org/torproject/android/Orbot.java
View File

@ -380,6 +380,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
doExit(); doExit();
}
else if (item.getItemId() == R.id.menu_diag)
{
startActivity(new Intent(getBaseContext(), OrbotDiagnosticsActivity.class));
} }
else if (item.getItemId() == R.id.menu_about) else if (item.getItemId() == R.id.menu_about)
{ {