Merge branch 'misc_fixes' into 'master'

Localized category list

res/values-ru/strings.xml

@@ -155,4 +155,20 @@
   <string name="repo_disabled_notification">\"%1$s\" отключен. Вам нужно повторно включить этот репозиторий для установки приложений из него.</string>
   <string name="minsdk_or_later">%s или позднее</string>
   <string name="up_to_maxsdk">до %s</string>
+
+  <string name="Children">Детские</string>
+  <string name="Development">Разработка</string>
+  <string name="Games">Игры</string>
+  <string name="Internet">Интернет</string>
+  <string name="Mathematics">Математика</string>
+  <string name="Multimedia">Мультимедиа</string>
+  <string name="Navigation">Навигация</string>
+  <string name="News">Новости</string>
+  <string name="Office">Офис</string>
+  <string name="Phone_SMS">Связь</string>
+  <string name="Reading">Чтение</string>
+  <string name="Science_Education">Научные</string>
+  <string name="Security">Безопасность</string>
+  <string name="System">Системные</string>
+  <string name="Wallpaper">Обои</string>
 </resources>

res/values/strings.xml

@@ -216,4 +216,20 @@
     <string name="app_icon">App icon</string>
     <string name="repo_icon">Repo icon</string>
 
+    <string name="Children">Children</string>
+    <string name="Development">Development</string>
+    <string name="Games">Games</string>
+    <string name="Internet">Internet</string>
+    <string name="Mathematics">Mathematics</string>
+    <string name="Multimedia">Multimedia</string>
+    <string name="Navigation">Navigation</string>
+    <string name="News">News</string>
+    <string name="Office">Office</string>
+    <string name="Phone_SMS">Phone &amp; SMS</string>
+    <string name="Reading">Reading</string>
+    <string name="Science_Education">Science &amp; Education</string>
+    <string name="Security">Security</string>
+    <string name="System">System</string>
+    <string name="Wallpaper">Wallpaper</string>
+
 </resources>

src/org/fdroid/fdroid/CompatibilityChecker.java

@@ -34,6 +34,8 @@ public class CompatibilityChecker extends Compatibility {
         logMsg.append("Available device features:");
         features = new HashSet<String>();
         if (pm != null) {
+            final FeatureInfo[] featureArray = pm.getSystemAvailableFeatures();
+            if (featureArray != null)
                 for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
                     features.add(fi.name);
                     logMsg.append('\n');

src/org/fdroid/fdroid/SearchResults.java

@@ -47,6 +47,7 @@ public class SearchResults extends ListActivity {
 
     private static final int SEARCH = Menu.FIRST;
 
+    private Cursor cursor;
     private AppListAdapter adapter;
 
     protected String getQuery() {
@@ -107,10 +108,12 @@ public class SearchResults extends ListActivity {
         if (query == null || query.length() == 0)
             finish();
 
-        Cursor cursor = getContentResolver().query(
+        if (cursor != null) cursor.close();
+        cursor = managedQuery(
             AppProvider.getSearchUri(query), AppListFragment.APP_PROJECTION,
             null, null, AppListFragment.APP_SORT);
 
+
         TextView tv = (TextView) findViewById(R.id.description);
         String headertext;
         int count = cursor != null ? cursor.getCount() : 0;

src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java

@@ -3,6 +3,7 @@ package org.fdroid.fdroid.views.fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
@@ -20,6 +21,7 @@ import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListAdapter;
 import org.fdroid.fdroid.views.AvailableAppListAdapter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class AvailableAppsFragment extends AppListFragment implements
@@ -86,13 +88,22 @@ public class AvailableAppsFragment extends AppListFragment implements
 
         final List<String> categories = AppProvider.Helper.categories(getActivity());
 
+        // attempt to translate category names with fallback to default name
+        List<String> translatedCategories = new ArrayList<>(categories.size());
+        Resources res = getResources();
+        for (String category:categories)
+        {
+            int id = res.getIdentifier(category.replace(" & ", "_"), "string", getActivity().getPackageName());
+            translatedCategories.add(id == 0 ? category : getString(id));
+        }
+
         categorySpinner = new Spinner(getActivity());
         // Giving it an ID lets the default save/restore state
         // functionality do its stuff.
         categorySpinner.setId(R.id.categorySpinner);
 
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(
-            getActivity(), android.R.layout.simple_spinner_item, categories);
+            getActivity(), android.R.layout.simple_spinner_item, translatedCategories);
         adapter.setDropDownViewResource(
             android.R.layout.simple_spinner_dropdown_item);
         categorySpinner.setAdapter(adapter);