aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2015-06-22 17:22:05 +0200
committerTobias Brunner <tobias@strongswan.org>2015-07-28 13:27:31 +0200
commit16e9efc092768d5b2969729f2bcf72a498635bf7 (patch)
treece5986f253f81f1962cf2f468947c0d80e43bc39
parent4dc6275be56d5a924dd5efa4988908b3b30cbddf (diff)
downloadstrongswan-16e9efc092768d5b2969729f2bcf72a498635bf7.tar.bz2
strongswan-16e9efc092768d5b2969729f2bcf72a498635bf7.tar.xz
android: Fix a potential NullPointerException in the IMC state fragment
-rw-r--r--src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java b/src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java
index 39f86b460..7680ee665 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java
@@ -24,6 +24,7 @@ import org.strongswan.android.logic.imc.ImcState;
import org.strongswan.android.logic.imc.RemediationInstruction;
import android.app.Fragment;
+import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.Service;
import android.content.ComponentName;
@@ -174,7 +175,12 @@ public class ImcStateFragment extends Fragment implements VpnStateListener
public void updateView()
{
- FragmentTransaction ft = getFragmentManager().beginTransaction();
+ FragmentManager fm = getFragmentManager();
+ if (fm == null)
+ {
+ return;
+ }
+ FragmentTransaction ft = fm.beginTransaction();
switch (mService.getImcState())
{