diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 7abd037f..5f48818c 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -146,7 +146,7 @@ android:textSize="14sp" android:gravity="center_vertical" android:fontFamily="sans-serif-light" - android:text="status" + android:text="" android:background="#aa333333" android:layout_gravity="center_horizontal|bottom" android:layout_margin="10dp" @@ -167,15 +167,23 @@ android:id="@+id/btnBrowser" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Open Browser" + android:text="@string/menu_verify_browser" /> + + diff --git a/res/values/strings.xml b/res/values/strings.xml index f699314d..d3bf0dd8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -301,5 +301,5 @@ You do not have ROOT access enabled You may need to stop and start Orbot for settings change to be enabled. - Start VPN + VPN diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index f0ba4841..af5c2e5d 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -75,6 +75,8 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC private Button mBtnBrowser = null; private ToggleButton mBtnVPN = null; + private ToggleButton mBtnBridges = null; + private DrawerLayout mDrawer; 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(); + + } + + + }); + }