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

add a bridge toggle button

This commit is contained in:
Nathan Freitas 2015-02-14 02:30:02 -05:00
parent ee82b5afb1
commit a1ba41ce0b
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/layout_main.xml
View File

@ -146,7 +146,7 @@
android:textSize="14sp" android:textSize="14sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:text="status" android:text=""
android:background="#aa333333" android:background="#aa333333"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_margin="10dp" android:layout_margin="10dp"
@ -167,15 +167,23 @@
android:id="@+id/btnBrowser" android:id="@+id/btnBrowser"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Open Browser" android:text="@string/menu_verify_browser"
/>
<ToggleButton
android:id="@+id/btnBridges"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOff="@string/bridges"
android:textOn="@string/bridges"
/> />
<ToggleButton <ToggleButton
android:id="@+id/btnVPN" android:id="@+id/btnVPN"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="VPN Off" android:textOff="@string/menu_vpn"
android:textOn="VPN On" android:textOn="@string/menu_vpn"
/> />
</LinearLayout> </LinearLayout>

2
res/values/strings.xml
View File

@ -301,5 +301,5 @@
<string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string>
<string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string>
<string name="menu_vpn">Start VPN</string> <string name="menu_vpn">VPN</string>
</resources> </resources>

23
src/org/torproject/android/OrbotMainActivity.java
View File

@ -75,6 +75,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
private Button mBtnBrowser = null; private Button mBtnBrowser = null;
private ToggleButton mBtnVPN = null; private ToggleButton mBtnVPN = null;
private ToggleButton mBtnBridges = null;
private DrawerLayout mDrawer; private DrawerLayout mDrawer;
private ActionBarDrawerToggle mDrawerToggle; private ActionBarDrawerToggle mDrawerToggle;
@ -267,6 +269,27 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC
}); });
mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges);
boolean useBridges = mPrefs.getBoolean("pref_bridges_enabled", false);
mBtnBridges.setChecked(useBridges);
mBtnBridges.setOnClickListener(new View.OnClickListener ()
{
@Override
public void onClick(View v) {
Editor edit = mPrefs.edit();
edit.putBoolean("pref_bridges_enabled", mBtnBridges.isChecked());
edit.commit();
updateSettings();
}
});
} }