don't crash if huaweiPreferenceScreen.getIntent() = null

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index 390c4f6a8..1f55b6928 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -92,11 +92,14 @@ public class SettingsActivity extends XmppActivity implements
 
         //this feature is only available on Huawei Android 6.
         PreferenceScreen huaweiPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("huawei");
-        Intent intent = huaweiPreferenceScreen.getIntent();
-        //remove when Api version is above M (Version 6.0) or if the intent is not callable
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M || !isCallable(intent)) {
-            PreferenceCategory generalCategory = (PreferenceCategory) mSettingsFragment.findPreference("general");
-            generalCategory.removePreference(huaweiPreferenceScreen);
+        Intent intent;
+        if (huaweiPreferenceScreen.getIntent() != null) {
+            intent = huaweiPreferenceScreen.getIntent();
+            //remove when Api version is above M (Version 6.0) or if the intent is not callable
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M || !isCallable(intent)) {
+                PreferenceCategory generalCategory = (PreferenceCategory) mSettingsFragment.findPreference("general");
+                generalCategory.removePreference(huaweiPreferenceScreen);
+            }
         }
 
         if (BuildConfig.FLAVOR != "open") {