From 823ddcaca8fe98a0254a224a8aefdb30c42e305b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Jan 2019 21:21:06 +0100
Subject: [PATCH 1/2] use separate titles for Updates pref and Updates tab

https://gitlab.com/fdroid/fdroidclient/merge_requests/773#note_127475129
---
 .../java/org/fdroid/fdroid/MainActivityEspressoTest.java    | 6 +++---
 .../java/org/fdroid/fdroid/views/main/MainActivity.java     | 3 ++-
 app/src/main/res/values-de/strings.xml                      | 5 ++---
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
index 346a65e78..984e2869a 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
@@ -132,7 +132,7 @@ public class MainActivityEspressoTest {
 
     @Test
     public void bottomNavFlavorCheck() {
-        onView(withText(R.string.updates)).check(matches(isDisplayed()));
+        onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed()));
         onView(withText(R.string.menu_settings)).check(matches(isDisplayed()));
         onView(withText("THIS SHOULD NOT SHOW UP ANYWHERE!!!")).check(doesNotExist());
 
@@ -170,9 +170,9 @@ public class MainActivityEspressoTest {
 
     @Test
     public void showUpdates() {
-        ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.updates), isDisplayed()));
+        ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.main_menu__updates), isDisplayed()));
         updatesBottonNavButton.perform(click());
-        onView(withText(R.string.updates)).check(matches(isDisplayed()));
+        onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed()));
     }
 
     @Test
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 26b506e99..d108c85e4 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -138,7 +138,8 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
                 .setInActiveColor(R.color.bottom_nav_items)
                 .setActiveColor(android.R.color.white)
                 .setMode(BottomNavigationBar.MODE_FIXED)
-                .addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.updates).setBadgeItem(updatesBadge))
+                .addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.main_menu__updates)
+                        .setBadgeItem(updatesBadge))
                 .addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.menu_settings))
                 .setAnimationDuration(0)
                 .initialise();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 65fe4f2f3..2385773f9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Löschen</string>
     <string name="enable_nfc_send">NFC-Transfer aktivieren …</string>
     <string name="cache_downloaded">Zwischengespeicherte Apps behalten</string>
-    <string name="updates">Aufgaben</string>
+    <string name="updates">Aktualisierungen</string>
     <string name="other">Andere</string>
     <string name="update_interval">Automatisches Aktualisierungsintervall</string>
     <string name="notify">Aktualisierungsbenachrichtigung</string>
@@ -345,8 +345,7 @@
 
     <string name="main_menu__latest_apps">Neueste</string>
     <string name="main_menu__categories">Kategorien</string>
-
-
+    <string name="main_menu__updates">Aufgaben</string>
     <string name="main_menu__swap_nearby">Tausch</string>
     <string name="app_recommended_version_installed">Version %1$s (Empfohlen)</string>
     <string name="app_new">Neu</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f85b4273a..9a7869280 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -205,6 +205,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="main_menu__latest_apps">Latest</string>
     <string name="main_menu__categories">Categories</string>
     <string name="main_menu__swap_nearby">Nearby</string>
+    <string name="main_menu__updates">Updates</string>
 
     <string name="latest__empty_state__no_recent_apps">No recent apps found</string>
     <string name="latest__empty_state__never_updated">Once your list of apps has been updated, the latest apps should

From a4e80383f9eccbf1c8fd67d95a3f5ea3ff8f9b08 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Jan 2019 21:56:15 +0100
Subject: [PATCH 2/2] when index updates fail, try to get localized exception
 message

---
 app/src/main/java/org/fdroid/fdroid/UpdateService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 82a74fade..63f5da89b 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -507,7 +507,7 @@ public class UpdateService extends JobIntentService {
                     }
                 } catch (IndexUpdater.UpdateException e) {
                     errorRepos++;
-                    repoErrors.add(e.getMessage());
+                    repoErrors.add(e.getLocalizedMessage());
                     Log.e(TAG, "Error updating repository " + repo.address);
                     e.printStackTrace();
                 }