diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-15 15:24:52 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:00:06 +0100 |
| commit | 250b56762857f2e52626236d3716459786ce126d (patch) | |
| tree | 12aaee0692ed2ecd0aa213d379617bbe4fa98f48 /app/src/main | |
| parent | 744272dd1d43913c8112d1dedcb0b5a9023c491e (diff) | |
More tests, sometimes they don't pass sometimes do
testIsValid depends on the speed of Runtime's exec: sometimes it's quick
and passes (because it changes the date correctly) and sometimes is
not. A waitFor doesn't fix the issue, it waits forever.
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipFragment.java | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_detail_fragment.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2f886c7..0f28e11c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -94,7 +94,7 @@ </activity> <activity android:name="se.leap.bitmaskclient.ConfigurationWizard" - android:label="@string/title_activity_configuration_wizard" + android:label="@string/configuration_wizard_title" android:uiOptions="splitActionBarWhenNarrow" > </activity> <activity diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java index b2898249..588b137b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java @@ -37,7 +37,6 @@ public class EipFragment extends Fragment implements Observer { protected static final String STATUS_MESSAGE = TAG + ".status_message"; public static final String START_ON_BOOT = "start on boot"; - private View view; @InjectView(R.id.eipSwitch) Switch eip_switch; @InjectView(R.id.status_message) @@ -69,7 +68,7 @@ public class EipFragment extends Fragment implements Observer { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - view = inflater.inflate(R.layout.eip_service_fragment, container, false); + View view = inflater.inflate(R.layout.eip_service_fragment, container, false); ButterKnife.inject(this, view); if (eip_status.isConnecting()) diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml index eb90fad9..3b35bae7 100644 --- a/app/src/main/res/layout/provider_detail_fragment.xml +++ b/app/src/main/res/layout/provider_detail_fragment.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" > diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7d03c221..1608f487 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string> <string name="authed_secured_status">Connection secure using your own certificate.</string> <string name="eip_service_label">Encrypted Internet</string> - <string name="title_activity_configuration_wizard">Select a service provider</string> + <string name="configuration_wizard_title">Select a service provider</string> <string name="new_provider_button">Add new Provider</string> <string name="introduce_new_provider">Add a new service provider</string> <string name="save">Save</string> |