summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-17 12:39:11 +0200
committerParménides GV <parmegv@sdf.org>2014-06-17 12:39:11 +0200
commita9ee33a76bd0d49608fae352ef9bb64d5b1b0302 (patch)
treece54a116c2bc2109cb35726c03fc6e3aed33ef3d /app
parent65fb5a54be48e2664f1e4ef1faf1c36f881be09f (diff)
parent55c7a76f27b04db8a05400882897f88f8436bfac (diff)
Merge branch 'bug/crash-if-chosen-provider-doesn't-offer-eip-#5402-reopened' into develop
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 8c60eb0f..a57a2763 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,4 +144,4 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
delete ics_openvpn_untranslatable
}
-build.dependsOn ':app:mergeUntranslatable' \ No newline at end of file
+//build.dependsOn ':app:mergeUntranslatable' \ No newline at end of file
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 446ba1d9..299d89a4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -221,7 +221,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
mEipStartPending = false;
} else if ( level == ConnectionStatus.LEVEL_NONETWORK || level == ConnectionStatus.LEVEL_NOTCONNECTED || level == ConnectionStatus.LEVEL_AUTH_FAILED) {
statusMessage = getString(R.string.eip_state_not_connected);
- getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE);
+ if(getActivity() != null && getActivity().findViewById(R.id.eipProgress) != null)
+ getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE);
mEipStartPending = false;
switchState = false;
} else if (level == ConnectionStatus.LEVEL_CONNECTING_SERVER_REPLIED) {