Fix recent regression (NPE) if < LOLLIPOP

Author: Kaljurand

app/build.gradle

@@ -25,8 +25,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 1695
-        versionName '1.6.95'
+        versionCode 1696
+        versionName '1.6.96'
     }
 
     compileOptions {

app/src/main/java/ee/ioc/phon/android/speak/activity/Preferences.java

@@ -116,7 +116,7 @@ public void onResume() {
             // exist pre Android v5.
             // TODO: also remove it on Wear
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                PreferenceCategory category = (PreferenceCategory) findPreference(getString(R.string.keyCategoryServices));
+                PreferenceCategory category = (PreferenceCategory) findPreference(getString(R.string.keyCategoryDependencies));
                 Preference pref = category.findPreference(getString(R.string.keySystemVoiceInputSettings));
                 if (pref != null) {
                     category.removePreference(pref);

app/src/main/res/values/keys.xml

@@ -31,8 +31,7 @@
     // These keys are needed to locate (to show/hide) the "enable ime" link in the settings
     <string name="keyEnableIme" translatable="false">keyEnableIme</string>
     <string name="keyCategoryIme" translatable="false">keyCategoryIme</string>
-
-    <string name="keyCategoryServices" translatable="false">keyCategoryServices</string>
+    <string name="keyCategoryDependencies" translatable="false">keyCategoryDependencies</string>
 
     <!-- TODO: convert to integer-array -->
     <string-array name="valuesAutoStopAfterTime" translatable="false">

app/src/main/res/xml/preferences.xml

@@ -93,7 +93,9 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/titleCategoryDependencies">
+    <PreferenceCategory
+        android:key="@string/keyCategoryDependencies"
+        android:title="@string/titleCategoryDependencies">
         <Preference
             android:summary="@string/summaryAppList"
             android:title="@string/labelActivityAppList">