From af1040443edf189b7a0de83b88cfef0330977d55 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 17 Apr 2019 12:30:06 +0200
Subject: [PATCH 1/7] ignore Errors and Exceptions in background services

Throwable includes Errors and Exceptions.  Fixes stacktraces like these:

java.lang.RuntimeException: An error occurred while executing doInBackground()
	at android.os.AsyncTask$3.done(AsyncTask.java:325)
	at java.util.concurrent.FutureTask.finishCompletion(FutureTask.java:354)
	at java.util.concurrent.FutureTask.setException(FutureTask.java:223)
	at java.util.concurrent.FutureTask.run(FutureTask.java:242)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1133)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:607)
	at java.lang.Thread.run(Thread.java:761)
Caused by: java.lang.NoSuchMethodError: No virtual method toPath()Ljava/nio/file/Path; in class Ljava/io/File; or its super classes (declaration of 'java.io.File' appears in /system/framework/core-oj.jar)
	at org.apache.commons.io.FileUtils.isSymlink(FileUtils.java:3107)
	at org.apache.commons.io.FileUtils.deleteDirectory(FileUtils.java:1616)
	at org.fdroid.fdroid.DeleteCacheService.onHandleWork(DeleteCacheService.java:32)
	at android.support.v4.app.JobIntentService$CommandProcessor.doInBackground(JobIntentService.java:391)
	at android.support.v4.app.JobIntentService$CommandProcessor.doInBackground(JobIntentService.java:382)
	at android.os.AsyncTask$2.call(AsyncTask.java:305)
	at java.util.concurrent.FutureTask.run(FutureTask.java:237)
	... 3 more
java.lang.NoSuchMethodError: No virtual method toPath()Ljava/nio/file/Path; in class Ljava/io/File; or its super classes (declaration of 'java.io.File' appears in /system/framework/core-oj.jar)
	at org.apache.commons.io.FileUtils.isSymlink(FileUtils.java:3107)
	at org.apache.commons.io.FileUtils.deleteDirectory(FileUtils.java:1616)
	at org.fdroid.fdroid.DeleteCacheService.onHandleWork(DeleteCacheService.java:32)
	at android.support.v4.app.JobIntentService$CommandProcessor.doInBackground(JobIntentService.java:391)
	at android.support.v4.app.JobIntentService$CommandProcessor.doInBackground(JobIntentService.java:382)
	at android.os.AsyncTask$2.call(AsyncTask.java:305)
	at java.util.concurrent.FutureTask.run(FutureTask.java:237)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1133)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:607)
	at java.lang.Thread.run(Thread.java:761)
---
 app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java | 6 ++----
 app/src/main/java/org/fdroid/fdroid/UpdateService.java      | 2 +-
 app/src/main/java/org/fdroid/fdroid/Utils.java              | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
index 9e05f5d89..eec11f260 100644
--- a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
+++ b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
@@ -28,13 +28,11 @@ public class DeleteCacheService extends JobIntentService {
         Log.w(TAG, "Deleting all cached contents!");
         try {
             File cacheDir = getCacheDir();
-            if (cacheDir != null) {
-                FileUtils.deleteDirectory(cacheDir);
-            }
+            FileUtils.deleteDirectory(cacheDir);
             for (File dir : ContextCompat.getExternalCacheDirs(this)) {
                 FileUtils.deleteDirectory(dir);
             }
-        } catch (Exception e) {
+        } catch (Throwable e) { // NOPMD
             // ignored
         }
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 980dc8dc8..dfbfcac9a 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -236,7 +236,7 @@ public class UpdateService extends JobIntentService {
                     Utils.debugLog(TAG, "scheduling update because there is good internet");
                     schedule(context);
                 }
-            } catch (Exception e) {
+            } catch (Throwable e) { // NOPMD
                 Utils.debugLog(TAG, e.getMessage());
             }
             isScheduleIfStillOnWifiRunning = false;
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 34bbc664c..479d53e49 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -384,7 +384,7 @@ public final class Utils {
             }
             ret = formatter.toString();
             formatter.close();
-        } catch (Exception e) {
+        } catch (Throwable e) { // NOPMD
             Log.w(TAG, "Unable to get certificate fingerprint", e);
         }
         return ret;

From 67af661640dca991c44a63253126f672829b18a0 Mon Sep 17 00:00:00 2001
From: ioTY <wxckncl@gmail.com>
Date: Sat, 23 Mar 2019 22:17:22 +0100
Subject: [PATCH 2/7] Check whether fdroidPrivileged enabled

---
 .../java/org/fdroid/fdroid/installer/PrivilegedInstaller.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
index 51e5ee8f4..46d6f7c7f 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
@@ -265,7 +265,7 @@ public class PrivilegedInstaller extends Installer {
         PackageManager pm = context.getPackageManager();
         try {
             pm.getPackageInfo(PRIVILEGED_EXTENSION_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
-            return true;
+            return pm.getApplicationInfo(PRIVILEGED_EXTENSION_PACKAGE_NAME, 0).enabled;
         } catch (PackageManager.NameNotFoundException e) {
             return false;
         }

From a71489a102eec81742878220a6e927cbfcdd245c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 3 May 2019 15:44:40 +0200
Subject: [PATCH 3/7] set max width on places where the translations get too
 long

closes #1678
---
 app/src/full/res/layout/main_tab_swap.xml     |  2 +
 .../full/res/layout/swap_app_list_item.xml    |  3 ++
 .../res/layout/app_details2_version_item.xml  |  3 ++
 app/src/main/res/layout/updates_header.xml    |  3 ++
 tools/check-string-maxlength.py               | 48 +++++++++++++++++++
 5 files changed, 59 insertions(+)
 create mode 100755 tools/check-string-maxlength.py

diff --git a/app/src/full/res/layout/main_tab_swap.xml b/app/src/full/res/layout/main_tab_swap.xml
index 03c35548e..3db7d5eee 100644
--- a/app/src/full/res/layout/main_tab_swap.xml
+++ b/app/src/full/res/layout/main_tab_swap.xml
@@ -42,6 +42,7 @@
             android:id="@+id/find_people_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxEms="16"
             android:text="@string/nearby_splash__find_people_button"
             style="@style/DetailsSecondaryButtonStyle"
             app:layout_constraintTop_toBottomOf="@+id/title"
@@ -85,6 +86,7 @@
             android:id="@+id/request_read_external_storage_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxEms="16"
             android:text="@string/nearby_splash__request_permission"
             style="@style/DetailsSecondaryButtonStyle"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/full/res/layout/swap_app_list_item.xml b/app/src/full/res/layout/swap_app_list_item.xml
index f4d1b069d..84aedf51c 100644
--- a/app/src/full/res/layout/swap_app_list_item.xml
+++ b/app/src/full/res/layout/swap_app_list_item.xml
@@ -37,6 +37,9 @@
             android:layout_height="wrap_content"
             android:backgroundTint="@color/swap_light_blue"
             android:textColor="@android:color/white"
+            android:maxEms="10"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="@string/menu_install"
             tools:ignore="UnusedAttribute" />
 
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 935c03b35..194a08489 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -143,6 +143,9 @@
                 android:layout_marginTop="5dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginEnd="4dp"
+                android:maxEms="10"
+                android:ellipsize="end"
+                android:singleLine="true"
                 tools:text="@string/menu_install"/>
 
             <Button
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 58b655ffa..c3c2e9c12 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -42,6 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
+        android:maxEms="10"
         android:text="@string/update_all"
         style="@style/DetailsPrimaryButtonStyle"
         app:layout_constraintEnd_toEndOf="parent"
@@ -54,6 +55,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
+        android:ellipsize="middle"
+        android:singleLine="true"
         tools:text="Show apps"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/tools/check-string-maxlength.py b/tools/check-string-maxlength.py
new file mode 100755
index 000000000..8be69cc0a
--- /dev/null
+++ b/tools/check-string-maxlength.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+# Remove extra translations
+
+import glob
+import os
+import sys
+import re
+from xml.etree import ElementTree
+
+maxlengths = {
+    "menu_install": 20,
+    "menu_uninstall": 20,
+    "nearby_splash__find_people_button": 30,
+    "nearby_splash__request_permission": 30,
+    "update_all": 20,
+    "updates__hide_updateable_apps": 35,
+    "updates__show_updateable_apps": 35,
+}
+
+
+resdir = os.path.join(os.path.dirname(__file__), '..', 'app', 'src', 'main', 'res')
+
+count = 0
+
+for d in sorted(glob.glob(os.path.join(resdir, 'values-*'))):
+    locale = d.split('/')[-1][7:]
+
+    str_path = os.path.join(d, 'strings.xml')
+    if not os.path.exists(str_path):
+        continue
+
+    with open(str_path, encoding='utf-8') as fp:
+        fulltext = fp.read()
+
+    tree = ElementTree.parse(str_path)
+    root = tree.getroot()
+
+    for e in root.findall('.//string'):
+
+        if maxlengths.get(e.attrib['name']) is not None \
+           and len(e.text) > maxlengths.get(e.attrib['name']):
+            print(e.attrib['name'], locale, str(len(e.text)) + ':\t\t"' + e.text + '"')
+
+if count > 0:
+    print("%d over-long strings found!" % count)
+    sys.exit(count)
+

From d62c0cf723e3257c25eb92907edc8fadfc47a1ab Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 23 Apr 2019 14:41:02 +0200
Subject: [PATCH 4/7] AppDetails: use inline OnClickListeners in Android style

no need to declare variables that are used in one place.  Also, reordered
related lines a bit for clarity.
---
 .../views/AppDetailsRecyclerViewAdapter.java  | 62 ++++++++-----------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index fc6800115..219be5e11 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -555,11 +555,16 @@ public class AppDetailsRecyclerViewAdapter
             }
 
             updateAntiFeaturesWarning();
-            buttonSecondaryView.setText(R.string.menu_uninstall);
-            buttonSecondaryView.setVisibility(app.isUninstallable(context) ? View.VISIBLE : View.INVISIBLE);
-            buttonSecondaryView.setOnClickListener(onUnInstallClickListener);
             buttonPrimaryView.setText(R.string.menu_install);
             buttonPrimaryView.setVisibility(versions.size() > 0 ? View.VISIBLE : View.GONE);
+            buttonSecondaryView.setText(R.string.menu_uninstall);
+            buttonSecondaryView.setVisibility(app.isUninstallable(context) ? View.VISIBLE : View.INVISIBLE);
+            buttonSecondaryView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    callbacks.uninstallApk();
+                }
+            });
             if (callbacks.isAppDownloading()) {
                 buttonPrimaryView.setText(R.string.downloading);
                 buttonPrimaryView.setEnabled(false);
@@ -568,22 +573,37 @@ public class AppDetailsRecyclerViewAdapter
             } else if (!app.isInstalled(context) && suggestedApk != null) {
                 // Check count > 0 due to incompatible apps resulting in an empty list.
                 callbacks.disableAndroidBeam();
+                progressLayout.setVisibility(View.GONE);
                 // Set Install button and hide second button
                 buttonPrimaryView.setText(R.string.menu_install);
-                buttonPrimaryView.setOnClickListener(onInstallClickListener);
                 buttonPrimaryView.setEnabled(true);
                 buttonLayout.setVisibility(View.VISIBLE);
-                progressLayout.setVisibility(View.GONE);
+                buttonPrimaryView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        callbacks.installApk();
+                    }
+                });
             } else if (app.isInstalled(context)) {
                 callbacks.enableAndroidBeam();
                 if (app.canAndWantToUpdate(context) && suggestedApk != null) {
                     buttonPrimaryView.setText(R.string.menu_upgrade);
-                    buttonPrimaryView.setOnClickListener(onUpgradeClickListener);
+                    buttonPrimaryView.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            callbacks.installApk();
+                        }
+                    });
                 } else {
                     Apk mediaApk = app.getMediaApkifInstalled(context);
                     if (context.getPackageManager().getLaunchIntentForPackage(app.packageName) != null) {
                         buttonPrimaryView.setText(R.string.menu_launch);
-                        buttonPrimaryView.setOnClickListener(onLaunchClickListener);
+                        buttonPrimaryView.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                callbacks.launchApk();
+                            }
+                        });
                     } else if (!app.isApk && mediaApk != null) {
                         final File installedFile = new File(mediaApk.getMediaInstallPath(context), mediaApk.apkName);
                         if (!installedFile.toString().startsWith(context.getApplicationInfo().dataDir)) {
@@ -1324,34 +1344,6 @@ public class AppDetailsRecyclerViewAdapter
         }
     }
 
-    private final View.OnClickListener onInstallClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            callbacks.installApk();
-        }
-    };
-
-    private final View.OnClickListener onUnInstallClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            callbacks.uninstallApk();
-        }
-    };
-
-    private final View.OnClickListener onUpgradeClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            callbacks.installApk();
-        }
-    };
-
-    private final View.OnClickListener onLaunchClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            callbacks.launchApk();
-        }
-    };
-
     private boolean uriIsSetAndCanBeOpened(String s) {
         if (TextUtils.isEmpty(s)) {
             return false;

From c0c5721f6a5c31f57fc308a25ac74576c1756e20 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 7 May 2019 12:38:45 +0200
Subject: [PATCH 5/7] Normalize Repo.lastUpdated values to contain the date and
 time

This also converts old Repo.lastUpdated values rather than just failing.
index.xml handling used to store the Repo "Last Updated" date used to store
the value as just an ISO date (2019-04-29), then the time was added.  So if
date/time parsing fails, this falls back to trying to parse just the date.
null is returned when parsing fails, and the Latest Tab shows nothing if
the Last Updated is null.

Some related tests were also tweaked.

Hopefully:
closes fdroid/fdroidclient#1757
---
 app/src/main/java/org/fdroid/fdroid/IndexUpdater.java        | 2 +-
 app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java      | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/Repo.java           | 5 +++--
 app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java   | 4 ++--
 .../test/java/org/fdroid/fdroid/data/RepoProviderTest.java   | 2 +-
 .../test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java | 4 ++++
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
index 3a267144a..dabb03a1c 100644
--- a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
+++ b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java
@@ -414,7 +414,7 @@ public class IndexUpdater {
 
         Utils.debugLog(TAG, "Saving new signing certificate in the database for " + repo.address);
         ContentValues values = new ContentValues(2);
-        values.put(RepoTable.Cols.LAST_UPDATED, Utils.formatDate(new Date(), ""));
+        values.put(RepoTable.Cols.LAST_UPDATED, Utils.formatTime(new Date(), ""));
         values.put(RepoTable.Cols.SIGNING_CERT, Hasher.hex(rawCertFromJar));
         RepoProvider.Helper.update(context, repo, values);
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
index 5f6d3273a..fcc9eeac1 100644
--- a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
+++ b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
@@ -470,7 +470,7 @@ public class IndexV1Updater extends IndexUpdater {
             }
             Utils.debugLog(TAG, "Saving new signing certificate to database for " + repo.address);
             ContentValues values = new ContentValues(2);
-            values.put(Schema.RepoTable.Cols.LAST_UPDATED, Utils.formatDate(new Date(), ""));
+            values.put(Schema.RepoTable.Cols.LAST_UPDATED, Utils.formatTime(new Date(), ""));
             values.put(Schema.RepoTable.Cols.SIGNING_CERT, Hasher.hex(rawCertFromJar));
             RepoProvider.Helper.update(context, repo, values);
             repo.signingCertificate = certFromJar;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Repo.java b/app/src/main/java/org/fdroid/fdroid/data/Repo.java
index fa92350ca..73faf88ad 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Repo.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Repo.java
@@ -165,7 +165,8 @@ public class Repo extends ValueObject {
                     inuse = cursor.getInt(i) == 1;
                     break;
                 case Cols.LAST_UPDATED:
-                    lastUpdated = Utils.parseTime(cursor.getString(i), null);
+                    String dateString = cursor.getString(i);
+                    lastUpdated = Utils.parseTime(dateString, Utils.parseDate(dateString, null));
                     break;
                 case Cols.MAX_AGE:
                     maxage = cursor.getInt(i);
@@ -296,7 +297,7 @@ public class Repo extends ValueObject {
 
         if (values.containsKey(Cols.LAST_UPDATED)) {
             final String dateString = values.getAsString(Cols.LAST_UPDATED);
-            lastUpdated = Utils.parseTime(dateString, null);
+            lastUpdated = Utils.parseTime(dateString, Utils.parseDate(dateString, null));
         }
 
         if (values.containsKey(Cols.MAX_AGE)) {
diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
index dac4da741..9e769d4e8 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
@@ -11,7 +11,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
-
 import org.fdroid.fdroid.AppUpdateStatusManager;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.RepoTable;
@@ -278,7 +277,8 @@ public class RepoProvider extends FDroidProvider {
             if (cursor != null) {
                 if (cursor.getCount() > 0) {
                     cursor.moveToFirst();
-                    lastUpdate = Utils.parseDate(cursor.getString(0), null);
+                    String dateString = cursor.getString(0);
+                    lastUpdate = Utils.parseTime(dateString, Utils.parseDate(dateString, null));
                 }
                 cursor.close();
             }
diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
index e2a726abc..8ddefdfaa 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
@@ -95,7 +95,7 @@ public class RepoProviderTest extends FDroidProviderTest {
 
     private Repo setLastUpdate(Repo repo, Date date) {
         ContentValues values = new ContentValues(1);
-        values.put(RepoTable.Cols.LAST_UPDATED, Utils.formatDate(date, null));
+        values.put(RepoTable.Cols.LAST_UPDATED, Utils.formatTime(date, null));
         RepoProvider.Helper.update(context, repo, values);
         return RepoProvider.Helper.findByAddress(context, repo.address);
     }
diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
index e77b53bfd..1dda8e339 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
@@ -897,6 +897,10 @@ public class RepoXMLHandlerTest {
         List<App> apps = actualDetails.apps;
         assertNotNull(apps);
         assertEquals(apps.size(), appCount);
+        for (App app: apps) {
+            assertTrue("Added should have been set", app.added.getTime() > 0);
+            assertTrue("Last Updated should have been set", app.lastUpdated.getTime() > 0);
+        }
 
         List<Apk> apks = actualDetails.apks;
         assertNotNull(apks);

From 1d359f82ced8157d2f8c270282998903b6f4adb1 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 May 2019 12:00:20 +0200
Subject: [PATCH 6/7] actually use index added/lastUpdated dates in UTC

The date/time written to index.xml and index-v1.json should always be in
UTC format.  These formats are often in the form of just a date, e.g.
2019-04-28.  Those are then converted to UNIX seconds, which includes the
time.  In the date only case, the time is assumed to be 00:00, which will
be different per time zone.

index-v1.json is better since it mostly uses Java-style UNIX time in millis
but the dates/times are parsed then stored in the local database in the old
format yyyy-MM-dd_HH:mm:ss which will result in different UNIX times when
the device is in different time zones.

fdroid/fdroidclient#1757
---
 .../main/java/org/fdroid/fdroid/Utils.java    | 17 ++++++++++
 .../java/org/fdroid/fdroid/UtilsTest.java     | 29 +++++++++++++++--
 .../fdroid/fdroid/data/ApkProviderTest.java   | 32 +++++++++++++------
 .../fdroid/fdroid/data/AppProviderTest.java   |  9 ++++++
 .../fdroid/fdroid/data/RepoProviderTest.java  | 12 +++++++
 .../fdroid/data/RepoXMLHandlerTest.java       | 20 +++++++++++-
 app/src/test/resources/smallRepo.xml          |  2 +-
 7 files changed, 106 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 479d53e49..b6121dd08 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -79,6 +79,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
@@ -96,6 +97,8 @@ public final class Utils {
     private static final SimpleDateFormat TIME_FORMAT =
             new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.ENGLISH);
 
+    private static final TimeZone UTC = TimeZone.getTimeZone("Etc/GMT");
+
     private static final String[] FRIENDLY_SIZE_FORMAT = {
             "%.0f B", "%.0f KiB", "%.1f MiB", "%.2f GiB",
     };
@@ -583,6 +586,7 @@ public final class Utils {
         }
         Date result;
         try {
+            format.setTimeZone(UTC);
             result = format.parse(str);
         } catch (ArrayIndexOutOfBoundsException | NumberFormatException | ParseException e) {
             e.printStackTrace();
@@ -595,21 +599,34 @@ public final class Utils {
         if (date == null) {
             return fallback;
         }
+        format.setTimeZone(UTC);
         return format.format(date);
     }
 
+    /**
+     * Parses a date string into UTC time
+     */
     public static Date parseDate(String str, Date fallback) {
         return parseDateFormat(DATE_FORMAT, str, fallback);
     }
 
+    /**
+     * Formats UTC time into a date string
+     */
     public static String formatDate(Date date, String fallback) {
         return formatDateFormat(DATE_FORMAT, date, fallback);
     }
 
+    /**
+     * Parses a date/time string into UTC time
+     */
     public static Date parseTime(String str, Date fallback) {
         return parseDateFormat(TIME_FORMAT, str, fallback);
     }
 
+    /**
+     * Formats UTC time into a date/time string
+     */
     public static String formatTime(Date date, String fallback) {
         return formatDateFormat(TIME_FORMAT, date, fallback);
     }
diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
index 18ac2d62d..32edd6e47 100644
--- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
@@ -10,6 +10,8 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.io.File;
+import java.util.Date;
+import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -77,9 +79,9 @@ public class UtilsTest {
         assertEquals("three", tripleValue[2]);
 
         assertNull(Utils.serializeCommaSeparatedString(null));
-        assertNull(Utils.serializeCommaSeparatedString(new String[] {}));
-        assertEquals("Single", Utils.serializeCommaSeparatedString(new String[] {"Single"}));
-        assertEquals("One,TWO,three", Utils.serializeCommaSeparatedString(new String[] {"One", "TWO", "three"}));
+        assertNull(Utils.serializeCommaSeparatedString(new String[]{}));
+        assertEquals("Single", Utils.serializeCommaSeparatedString(new String[]{"Single"}));
+        assertEquals("One,TWO,three", Utils.serializeCommaSeparatedString(new String[]{"One", "TWO", "three"}));
     }
 
     @Test
@@ -192,4 +194,25 @@ public class UtilsTest {
     }
     // TODO write tests that work with a Certificate
 
+    @Test
+    public void testIndexDatesWithTimeZones() {
+        for (int h = 0; h < 12; h++) {
+            for (int m = 0; m < 60; m = m + 15) {
+                TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT+%d%02d", h, m)));
+
+                String timeString = "2017-11-27_20:13:24";
+                Date time = Utils.parseTime(timeString, null);
+                assertEquals("The String representation must match", timeString, Utils.formatTime(time, null));
+                assertEquals(timeString + " failed to parse", 1511813604000L, time.getTime());
+                assertEquals("time zones should match", -((h * 60) + m), time.getTimezoneOffset());
+
+                TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT+%d%02d", h, m)));
+                String dateString = "2017-11-27";
+                Date date = Utils.parseDate(dateString, null);
+                assertEquals("The String representation must match", dateString, Utils.formatDate(date, null));
+                assertEquals(dateString + " failed to parse", 1511740800000L, date.getTime());
+                assertEquals("time zones should match", -((h * 60) + m), date.getTimezoneOffset());
+            }
+        }
+    }
 }
diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
index e012cc079..e063e409b 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
@@ -7,10 +7,12 @@ import android.net.Uri;
 import org.fdroid.fdroid.Assert;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.TestUtils;
+import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
 import org.fdroid.fdroid.data.Schema.RepoTable;
 import org.fdroid.fdroid.mock.MockApk;
 import org.fdroid.fdroid.mock.MockRepo;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -18,6 +20,7 @@ import org.robolectric.annotation.Config;
 
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import static org.fdroid.fdroid.Assert.assertCantDelete;
 import static org.fdroid.fdroid.Assert.assertResultCount;
@@ -34,6 +37,13 @@ public class ApkProviderTest extends FDroidProviderTest {
 
     private static final String[] PROJ = Cols.ALL;
 
+    @BeforeClass
+    public static void setRandomTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT-%d:%02d",
+                System.currentTimeMillis() % 12, System.currentTimeMillis() % 60)));
+        System.out.println("TIME ZONE for this test: " + TimeZone.getDefault());
+    }
+
     @Test
     public void testAppApks() {
         App fdroidApp = insertApp(context, "org.fdroid.fdroid", "F-Droid");
@@ -153,7 +163,7 @@ public class ApkProviderTest extends FDroidProviderTest {
 
     @Test
     public void testCount() {
-        String[] projectionCount = new String[] {Cols._COUNT};
+        String[] projectionCount = new String[]{Cols._COUNT};
 
         for (int i = 0; i < 13; i++) {
             Assert.insertApk(context, "com.example", i);
@@ -315,12 +325,13 @@ public class ApkProviderTest extends FDroidProviderTest {
         assertNull(apk.added);
         assertNull(apk.hashType);
 
-        apk.antiFeatures = new String[] {"KnownVuln", "Other anti feature"};
-        apk.features = new String[] {"one", "two", "three" };
-        long dateTimestamp = System.currentTimeMillis();
-        apk.added = new Date(dateTimestamp);
+        apk.antiFeatures = new String[]{"KnownVuln", "Other anti feature"};
+        apk.features = new String[]{"one", "two", "three"};
         apk.hashType = "i'm a hash type";
 
+        Date testTime = Utils.parseDate(Utils.formatTime(new Date(System.currentTimeMillis()), null), null);
+        apk.added = testTime;
+
         ApkProvider.Helper.update(context, apk);
 
         // Should not have inserted anything else, just updated the already existing apk.
@@ -340,9 +351,10 @@ public class ApkProviderTest extends FDroidProviderTest {
 
         assertArrayEquals(new String[]{"KnownVuln", "Other anti feature"}, updatedApk.antiFeatures);
         assertArrayEquals(new String[]{"one", "two", "three"}, updatedApk.features);
-        assertEquals(new Date(dateTimestamp).getYear(), updatedApk.added.getYear());
-        assertEquals(new Date(dateTimestamp).getMonth(), updatedApk.added.getMonth());
-        assertEquals(new Date(dateTimestamp).getDay(), updatedApk.added.getDay());
+        assertEquals(testTime.getYear(), updatedApk.added.getYear());
+        assertEquals(testTime.getYear(), updatedApk.added.getYear());
+        assertEquals(testTime.getMonth(), updatedApk.added.getMonth());
+        assertEquals(testTime.getDay(), updatedApk.added.getDay());
         assertEquals("i'm a hash type", updatedApk.hashType);
     }
 
@@ -381,8 +393,8 @@ public class ApkProviderTest extends FDroidProviderTest {
         assertEquals("a hash type", apk.hashType);
 
         String[] projection = {
-            Cols.Package.PACKAGE_NAME,
-            Cols.HASH,
+                Cols.Package.PACKAGE_NAME,
+                Cols.HASH,
         };
 
         Apk apkLessFields = ApkProvider.Helper.findApkFromAnyRepo(context, "com.example", 11, null, projection);
diff --git a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
index 113d27920..5c5495d7e 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
@@ -11,6 +11,7 @@ import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -19,6 +20,7 @@ import org.robolectric.shadows.ShadowContentResolver;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 import static org.fdroid.fdroid.Assert.assertContainsOnly;
 import static org.fdroid.fdroid.Assert.assertResultCount;
@@ -36,6 +38,13 @@ public class AppProviderTest extends FDroidProviderTest {
 
     private static final String[] PROJ = Cols.ALL;
 
+    @BeforeClass
+    public static void setRandomTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT-%d:%02d",
+                System.currentTimeMillis() % 12, System.currentTimeMillis() % 60)));
+        System.out.println("TIME ZONE for this test: " + TimeZone.getDefault());
+    }
+
     @Before
     public void setup() {
         TestUtils.registerContentProvider(AppProvider.getAuthority(), AppProvider.class);
diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
index 8ddefdfaa..de6326e4f 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
@@ -30,6 +30,7 @@ import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -37,6 +38,7 @@ import org.robolectric.annotation.Config;
 
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -48,6 +50,16 @@ public class RepoProviderTest extends FDroidProviderTest {
 
     private static final String[] COLS = RepoTable.Cols.ALL;
 
+    /**
+     * Set to random time zone to make sure that the dates are properly parsed.
+     */
+    @BeforeClass
+    public static void setRandomTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT-%d:%02d",
+                System.currentTimeMillis() % 12, System.currentTimeMillis() % 60)));
+        System.out.println("TIME ZONE for this test: " + TimeZone.getDefault());
+    }
+
     @Test
     public void countEnabledRepos() {
 
diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
index 1dda8e339..2754014d0 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
@@ -29,6 +29,7 @@ import org.apache.commons.io.FileUtils;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.mock.MockRepo;
 import org.fdroid.fdroid.mock.RepoDetails;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -48,6 +49,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -63,6 +65,16 @@ public class RepoXMLHandlerTest {
 
     private static final String FAKE_SIGNING_CERT = "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345"; // NOCHECKSTYLE LineLength
 
+    /**
+     * Set to random time zone to make sure that the dates are properly parsed.
+     */
+    @BeforeClass
+    public static void setRandomTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone(String.format("GMT-%d:%02d",
+                System.currentTimeMillis() % 12, System.currentTimeMillis() % 60)));
+        System.out.println("TIME ZONE for this test: " + TimeZone.getDefault());
+    }
+
     @Test
     public void testExtendedPerms() throws IOException {
         Repo expectedRepo = new Repo();
@@ -129,6 +141,12 @@ public class RepoXMLHandlerTest {
                 "org.gege.caldavsyncadapter",
                 "info.guardianproject.checkey",
         });
+        for (App app : actualDetails.apps) {
+            if ("org.mozilla.firefox".equals(app.packageName)) {
+                assertEquals(1411776000000L, app.added.getTime());
+                assertEquals(1411862400000L, app.lastUpdated.getTime());
+            }
+        }
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -897,7 +915,7 @@ public class RepoXMLHandlerTest {
         List<App> apps = actualDetails.apps;
         assertNotNull(apps);
         assertEquals(apps.size(), appCount);
-        for (App app: apps) {
+        for (App app : apps) {
             assertTrue("Added should have been set", app.added.getTime() > 0);
             assertTrue("Last Updated should have been set", app.lastUpdated.getTime() > 0);
         }
diff --git a/app/src/test/resources/smallRepo.xml b/app/src/test/resources/smallRepo.xml
index 431de6335..d8f7593bd 100644
--- a/app/src/test/resources/smallRepo.xml
+++ b/app/src/test/resources/smallRepo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><fdroid><repo icon="blah.png" maxage="14" name="Android-Nexus-7-20139453 on UNSET" pubkey="308202da308201c2a00302010202080eb08c796fec91aa300d06092a864886f70d0101050500302d3111300f060355040a0c084b6572706c61707031183016060355040b0c0f477561726469616e50726f6a656374301e170d3134313030333135303631325a170d3135313030333135303631325a302d3111300f060355040a0c084b6572706c61707031183016060355040b0c0f477561726469616e50726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a0282010100c7ab44b130be5c00eedcc3625462f6f6ac26e502641cd641f3e30cbb0ff1ba325158611e7fc2448a35b6a6df30dc6e23602cf6909448befcf11e2fe486b580f1e76fe5887d159050d00afd2c4079f6538896bb200627f4b3e874f011ce5df0fef5d150fcb0b377b531254e436eaf4083ea72fe3b8c3ef450789fa858f2be8f6c5335bb326aff3dda689fbc7b5ba98dea53651dbea7452c38d294985ac5dd8a9e491a695de92c706d682d6911411fcaef3b0a08a030fe8a84e47acaab0b7edcda9d190ce39e810b79b1d8732eca22b15f0d048c8d6f00503a7ee81ab6e08919ff465883432304d95238b95e95c5f74e0a421809e2a6a85825aed680e0d6939e8f0203010001300d06092a864886f70d010105050003820101006d17aad3271b8b2c299dbdb7b1182849b0d5ddb9f1016dcb3487ae0db02b6be503344c7d066e2050bcd01d411b5ee78c7ed450f0ff9da5ce228f774cbf41240361df53d9c6078159d16f4d34379ab7dedf6186489397c83b44b964251a2ebb42b7c4689a521271b1056d3b5a5fa8f28ba64fb8ce5e2226c33c45d27ba3f632dc266c12abf582b8438c2abcf3eae9de9f31152b4158ace0ef33435c20eb809f1b3988131db6e5a1442f2617c3491d9565fedb3e320e8df4236200d3bd265e47934aa578f84d0d1a5efeb49b39907e876452c46996d0feff9404b41aa5631b4482175d843d5512ded45e12a514690646492191e7add434afce63dbff8f0b03ec0c" timestamp="1412696461"><description>A local FDroid repo generated from apps installed on Android-Nexus-7-20139453</description></repo><application id="org.mozilla.firefox"><id>org.mozilla.firefox</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Firefox</name><summary>(installed by null)</summary><desc>&lt;p&gt;(installed by null, first installed on Sat Sep 27 23:47:05 EDT 2014, last updated on Sat Sep 27 23:47:05 EDT 2014)&lt;/p&gt;</desc><icon>org.mozilla.firefox_2014092317.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>32.0.3</marketversion><marketvercode>2014092317</marketvercode><package><version>32.0.3</version><versioncode>2014092317</versioncode><apkname>org.mozilla.firefox_2014092317.apk</apkname><hash type="sha256">4b4e642b71acfe217758bb12ae7dec7fe46027ee732f4a9775ef7a4107deb5fb</hash><sig>20e61aee1b748061ec3b0ab1bbe5bac4</sig><size>30831633</size><sdkver>9</sdkver><added>2014-09-27</added><features/><permissions>RECEIVE_BOOT_COMPLETED,org.mozilla.firefox.permission.PER_ANDROID_PACKAGE,GET_ACCOUNTS,ACCESS_NETWORK_STATE,MANAGE_ACCOUNTS,USE_CREDENTIALS,AUTHENTICATE_ACCOUNTS,WRITE_SYNC_SETTINGS,WRITE_SETTINGS,READ_SYNC_STATS,READ_SYNC_SETTINGS,org.mozilla.firefox_fxaccount.permission.PER_ACCOUNT_TYPE,org.mozilla.firefox_sync.permission.PER_ACCOUNT_TYPE,ACCESS_FINE_LOCATION,INTERNET,WRITE_EXTERNAL_STORAGE,com.android.launcher.permission.INSTALL_SHORTCUT,com.android.launcher.permission.UNINSTALL_SHORTCUT,com.android.browser.permission.READ_HISTORY_BOOKMARKS,WAKE_LOCK,VIBRATE,org.mozilla.firefox.permissions.PASSWORD_PROVIDER,org.mozilla.firefox.permissions.BROWSER_PROVIDER,org.mozilla.firefox.permissions.FORMHISTORY_PROVIDER,NFC,RECORD_AUDIO,CAMERA,READ_EXTERNAL_STORAGE</permissions></package></application><application id="com.koushikdutta.superuser"><id>com.koushikdutta.superuser</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Superuser</name><summary>(installed by null)</summary><desc>&lt;p&gt;(installed by null, first installed on Sat Sep 27 23:23:22 EDT 2014, last updated on Sat Sep 27 23:23:22 EDT 2014)&lt;/p&gt;</desc><icon>com.koushikdutta.superuser_1030.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>1.0.3.0</marketversion><marketvercode>1030</marketvercode><package><version>1.0.3.0</version><versioncode>1030</versioncode><apkname>com.koushikdutta.superuser_1030.apk</apkname><hash type="sha256">8bbe1c0aa307a0c689d0b97ea5123f6d74d42bb9f91cbeaac2583b23de3a77ab</hash><sig>9af2c721bb87900f7e386d7a3716a7a6</sig><size>2944602</size><sdkver>8</sdkver><added>2014-09-27</added><features/><permissions>ACCESS_SUPERUSER,RECEIVE_BOOT_COMPLETED</permissions></package></application><application id="info.guardianproject.courier"><id>info.guardianproject.courier</id><added>2014-10-03</added><lastupdated>2014-10-03</lastupdated><name>Courier</name><summary>Courier is a mobile RSS news reader with</summary><desc>&lt;p&gt;Courier is a mobile RSS news reader with enhanced security features, offline reading and sharing capability.
+<?xml version="1.0" encoding="UTF-8"?><fdroid><repo icon="blah.png" maxage="14" name="Android-Nexus-7-20139453 on UNSET" pubkey="308202da308201c2a00302010202080eb08c796fec91aa300d06092a864886f70d0101050500302d3111300f060355040a0c084b6572706c61707031183016060355040b0c0f477561726469616e50726f6a656374301e170d3134313030333135303631325a170d3135313030333135303631325a302d3111300f060355040a0c084b6572706c61707031183016060355040b0c0f477561726469616e50726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a0282010100c7ab44b130be5c00eedcc3625462f6f6ac26e502641cd641f3e30cbb0ff1ba325158611e7fc2448a35b6a6df30dc6e23602cf6909448befcf11e2fe486b580f1e76fe5887d159050d00afd2c4079f6538896bb200627f4b3e874f011ce5df0fef5d150fcb0b377b531254e436eaf4083ea72fe3b8c3ef450789fa858f2be8f6c5335bb326aff3dda689fbc7b5ba98dea53651dbea7452c38d294985ac5dd8a9e491a695de92c706d682d6911411fcaef3b0a08a030fe8a84e47acaab0b7edcda9d190ce39e810b79b1d8732eca22b15f0d048c8d6f00503a7ee81ab6e08919ff465883432304d95238b95e95c5f74e0a421809e2a6a85825aed680e0d6939e8f0203010001300d06092a864886f70d010105050003820101006d17aad3271b8b2c299dbdb7b1182849b0d5ddb9f1016dcb3487ae0db02b6be503344c7d066e2050bcd01d411b5ee78c7ed450f0ff9da5ce228f774cbf41240361df53d9c6078159d16f4d34379ab7dedf6186489397c83b44b964251a2ebb42b7c4689a521271b1056d3b5a5fa8f28ba64fb8ce5e2226c33c45d27ba3f632dc266c12abf582b8438c2abcf3eae9de9f31152b4158ace0ef33435c20eb809f1b3988131db6e5a1442f2617c3491d9565fedb3e320e8df4236200d3bd265e47934aa578f84d0d1a5efeb49b39907e876452c46996d0feff9404b41aa5631b4482175d843d5512ded45e12a514690646492191e7add434afce63dbff8f0b03ec0c" timestamp="1412696461"><description>A local FDroid repo generated from apps installed on Android-Nexus-7-20139453</description></repo><application id="org.mozilla.firefox"><id>org.mozilla.firefox</id><added>2014-09-27</added><lastupdated>2014-09-28</lastupdated><name>Firefox</name><summary>(installed by null)</summary><desc>&lt;p&gt;(installed by null, first installed on Sat Sep 27 23:47:05 EDT 2014, last updated on Sat Sep 27 23:47:05 EDT 2014)&lt;/p&gt;</desc><icon>org.mozilla.firefox_2014092317.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>32.0.3</marketversion><marketvercode>2014092317</marketvercode><package><version>32.0.3</version><versioncode>2014092317</versioncode><apkname>org.mozilla.firefox_2014092317.apk</apkname><hash type="sha256">4b4e642b71acfe217758bb12ae7dec7fe46027ee732f4a9775ef7a4107deb5fb</hash><sig>20e61aee1b748061ec3b0ab1bbe5bac4</sig><size>30831633</size><sdkver>9</sdkver><added>2014-09-27</added><features/><permissions>RECEIVE_BOOT_COMPLETED,org.mozilla.firefox.permission.PER_ANDROID_PACKAGE,GET_ACCOUNTS,ACCESS_NETWORK_STATE,MANAGE_ACCOUNTS,USE_CREDENTIALS,AUTHENTICATE_ACCOUNTS,WRITE_SYNC_SETTINGS,WRITE_SETTINGS,READ_SYNC_STATS,READ_SYNC_SETTINGS,org.mozilla.firefox_fxaccount.permission.PER_ACCOUNT_TYPE,org.mozilla.firefox_sync.permission.PER_ACCOUNT_TYPE,ACCESS_FINE_LOCATION,INTERNET,WRITE_EXTERNAL_STORAGE,com.android.launcher.permission.INSTALL_SHORTCUT,com.android.launcher.permission.UNINSTALL_SHORTCUT,com.android.browser.permission.READ_HISTORY_BOOKMARKS,WAKE_LOCK,VIBRATE,org.mozilla.firefox.permissions.PASSWORD_PROVIDER,org.mozilla.firefox.permissions.BROWSER_PROVIDER,org.mozilla.firefox.permissions.FORMHISTORY_PROVIDER,NFC,RECORD_AUDIO,CAMERA,READ_EXTERNAL_STORAGE</permissions></package></application><application id="com.koushikdutta.superuser"><id>com.koushikdutta.superuser</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Superuser</name><summary>(installed by null)</summary><desc>&lt;p&gt;(installed by null, first installed on Sat Sep 27 23:23:22 EDT 2014, last updated on Sat Sep 27 23:23:22 EDT 2014)&lt;/p&gt;</desc><icon>com.koushikdutta.superuser_1030.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>1.0.3.0</marketversion><marketvercode>1030</marketvercode><package><version>1.0.3.0</version><versioncode>1030</versioncode><apkname>com.koushikdutta.superuser_1030.apk</apkname><hash type="sha256">8bbe1c0aa307a0c689d0b97ea5123f6d74d42bb9f91cbeaac2583b23de3a77ab</hash><sig>9af2c721bb87900f7e386d7a3716a7a6</sig><size>2944602</size><sdkver>8</sdkver><added>2014-09-27</added><features/><permissions>ACCESS_SUPERUSER,RECEIVE_BOOT_COMPLETED</permissions></package></application><application id="info.guardianproject.courier"><id>info.guardianproject.courier</id><added>2014-10-03</added><lastupdated>2014-10-03</lastupdated><name>Courier</name><summary>Courier is a mobile RSS news reader with</summary><desc>&lt;p&gt;Courier is a mobile RSS news reader with enhanced security features, offline reading and sharing capability.
 (installed by F-Droid, first installed on Fri Oct 03 09:12:04 EDT 2014, last updated on Fri Oct 03 09:12:04 EDT 2014)&lt;/p&gt;</desc><icon>info.guardianproject.courier_15.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>0.1.9</marketversion><marketvercode>15</marketvercode><package><version>0.1.9</version><versioncode>15</versioncode><apkname>info.guardianproject.courier_15.apk</apkname><hash type="sha256">bf6566da1f90831887f5bf5605f8d816b1f7f694969459dec599b8bc01a827d3</hash><sig>d70ac6a02b53ebdd1354ea7af7b9ceee</sig><size>16484753</size><sdkver>9</sdkver><added>2014-10-03</added><features/><permissions>INTERNET,ACCESS_NETWORK_STATE,WRITE_EXTERNAL_STORAGE,ACCESS_WIFI_STATE,BLUETOOTH,BLUETOOTH_ADMIN,VIBRATE,READ_EXTERNAL_STORAGE</permissions></package></application><application id="org.adaway"><id>org.adaway</id><added>2014-09-29</added><lastupdated>2014-09-29</lastupdated><name>AdAway</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Mon Sep 29 08:31:13 EDT 2014, last updated on Mon Sep 29 08:31:13 EDT 2014)&lt;/p&gt;</desc><icon>org.adaway_50.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>2.9.1</marketversion><marketvercode>50</marketvercode><package><version>2.9.1</version><versioncode>50</versioncode><apkname>org.adaway_50.apk</apkname><hash type="sha256">c9f4fcdca5e47abecfe8bc529ba6299f242fce1d5c87e50b8a36ace82d4fc259</hash><sig>5292cd7cf993d06d6f6741117b8400fc</sig><size>2816877</size><sdkver>7</sdkver><added>2014-09-29</added><features/><permissions>INTERNET,ACCESS_NETWORK_STATE,RECEIVE_BOOT_COMPLETED,WRITE_EXTERNAL_STORAGE,WAKE_LOCK,ACCESS_SUPERUSER,READ_EXTERNAL_STORAGE</permissions></package></application><application id="info.guardianproject.gilga"><id>info.guardianproject.gilga</id><added>2014-10-04</added><lastupdated>2014-10-07</lastupdated><name>Gilgamesh</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Sat Oct 04 14:59:10 EDT 2014, last updated on Tue Oct 07 09:49:14 EDT 2014)&lt;/p&gt;</desc><icon>info.guardianproject.gilga_2.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>0.0.2</marketversion><marketvercode>2</marketvercode><package><versioncode>2</versioncode><apkname>info.guardianproject.gilga_2.apk</apkname><hash type="sha256">1eac2e0043977dc8f31947f19852803207205887a5f01a1cbb8a5e477b3d82a9</hash><sig>6de574cd61a684bda38ba8e895dece7c</sig><size>30761</size><sdkver>14</sdkver><added>2014-10-04</added><features/><permissions>BLUETOOTH_ADMIN,BLUETOOTH,ACCESS_WIFI_STATE,CHANGE_WIFI_STATE,INTERNET</permissions></package></application><application id="com.google.zxing.client.android"><id>com.google.zxing.client.android</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Barcode Scanner</name><summary>(installed by null)</summary><desc>&lt;p&gt;(installed by null, first installed on Sat Sep 27 23:36:20 EDT 2014, last updated on Sat Sep 27 23:36:20 EDT 2014)&lt;/p&gt;</desc><icon>com.google.zxing.client.android_100.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>4.7.0</marketversion><marketvercode>100</marketvercode><package><version>4.7.0</version><versioncode>100</versioncode><apkname>com.google.zxing.client.android_100.apk</apkname><hash type="sha256">62dea7cf201d2e36725ad76b1525decb58b05dd9e4a032ed084c7a6c6d38da2c</hash><sig>c3bb49636af03e7c23a63724eb529ea9</sig><size>735678</size><sdkver>15</sdkver><added>2014-09-27</added><features/><permissions>CAMERA,INTERNET,VIBRATE,FLASHLIGHT,READ_CONTACTS,com.android.browser.permission.READ_HISTORY_BOOKMARKS,WRITE_EXTERNAL_STORAGE,CHANGE_WIFI_STATE,ACCESS_WIFI_STATE,READ_EXTERNAL_STORAGE</permissions></package></application><application id="info.guardianproject.lildebi"><id>info.guardianproject.lildebi</id><added>2014-09-28</added><lastupdated>2014-09-28</lastupdated><name>Lil' Debi</name><summary>Want an easy Debian chroot running that </summary><desc>&lt;p&gt;Want an easy Debian chroot running that you can trust? Install Lil’ Debi, and you can have a Debian install running with a single click of a button. It builds up a whole Debian chroot on your phone entirely using debootstrap. You choose the release, mirror, and size of the disk image, and away it goes. It could take up to an hour on a slow device, then its done. The entire package is built from source using publicly available, repeatable builds. It even validates every package using the official Debian repository keys, which are included in the app.
 (installed by null, first installed on Sun Sep 28 00:39:09 EDT 2014, last updated on Sun Sep 28 00:39:09 EDT 2014)&lt;/p&gt;</desc><icon>info.guardianproject.lildebi_5100.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>0.5.1</marketversion><marketvercode>5100</marketvercode><package><version>0.5.1</version><versioncode>5100</versioncode><apkname>info.guardianproject.lildebi_5100.apk</apkname><hash type="sha256">7af667881af6107f3fe60d6973712506dbaf83710d383eb1c312fc75dae2e46a</hash><sig>b4964fd759edaa54e65bb476d0276880</sig><size>1569480</size><sdkver>8</sdkver><added>2014-09-28</added><features/><permissions>INTERNET,ACCESS_NETWORK_STATE,ACCESS_SUPERUSER,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE,WAKE_LOCK,jackpal.androidterm.permission.RUN_SCRIPT</permissions></package></application><application id="de.danoeh.antennapod"><id>de.danoeh.antennapod</id><added>2014-10-03</added><lastupdated>2014-10-03</lastupdated><name>AntennaPod</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Fri Oct 03 09:08:31 EDT 2014, last updated on Fri Oct 03 09:08:31 EDT 2014)&lt;/p&gt;</desc><icon>de.danoeh.antennapod_40.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>0.9.9.3</marketversion><marketvercode>40</marketvercode><package><version>0.9.9.3</version><versioncode>40</versioncode><apkname>de.danoeh.antennapod_40.apk</apkname><hash type="sha256">ea83cb81c03bc8b6c1fb6e61e7d0915abef8ca175789a5ac5add45c12f633ebd</hash><sig>3870fa89bfb5e13509ce5888800bc643</sig><size>2815685</size><sdkver>10</sdkver><added>2014-10-03</added><features/><permissions>INTERNET,WRITE_EXTERNAL_STORAGE,WAKE_LOCK,ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,RECEIVE_BOOT_COMPLETED,READ_EXTERNAL_STORAGE</permissions></package></application><application id="info.guardianproject.otr.app.im"><id>info.guardianproject.otr.app.im</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>ChatSecure</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Sat Sep 27 23:42:00 EDT 2014, last updated on Sat Sep 27 23:42:00 EDT 2014)&lt;/p&gt;</desc><icon>info.guardianproject.otr.app.im_1403000.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>14.0.3</marketversion><marketvercode>1403000</marketvercode><package><version>14.0.3</version><versioncode>1403000</versioncode><apkname>info.guardianproject.otr.app.im_1403000.apk</apkname><hash type="sha256">46b0b26e2122a8bf937be259d6219ffe5bace7b2eda692b43a5f55fff2322e13</hash><sig>a0eeebb161f946e3516945fae8a92a3e</sig><size>11235852</size><sdkver>9</sdkver><added>2014-09-27</added><features/><permissions>info.guardianproject.otr.app.providers.imps.permission.READ_ONLY,info.guardianproject.otr.app.providers.imps.permission.WRITE_ONLY,WAKE_LOCK,VIBRATE,INTERNET,CHANGE_WIFI_MULTICAST_STATE,ACCESS_WIFI_STATE,ACCESS_NETWORK_STATE,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE,RECEIVE_BOOT_COMPLETED,info.guardianproject.otr.app.im.permission.IM_SERVICE,UPDATE_APP_OPS_STATS,GET_ACCOUNTS,MANAGE_ACCOUNTS,USE_CREDENTIALS,com.google.android.googleapps.permission.GOOGLE_AUTH</permissions></package></application><application id="org.torproject.android"><id>org.torproject.android</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Orbot</name><summary>Orbot is a free proxy app that empowers </summary><desc>&lt;p&gt;Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.
 (installed by null, first installed on Sat Sep 27 23:39:38 EDT 2014, last updated on Sat Sep 27 23:39:38 EDT 2014)&lt;/p&gt;</desc><icon>org.torproject.android_124.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>14.0.8.1</marketversion><marketvercode>124</marketvercode><package><version>14.0.8.1</version><versioncode>124</versioncode><apkname>org.torproject.android_124.apk</apkname><hash type="sha256">74daa523cd9e85722a9190dd95f3b839d69b7457ffcb9647ca6745824f6ef66d</hash><sig>8bd7e51b479aeba908ff46ada3305a29</sig><size>5548347</size><sdkver>9</sdkver><added>2014-09-27</added><features/><permissions>INTERNET,RECEIVE_BOOT_COMPLETED,ACCESS_NETWORK_STATE,ACCESS_SUPERUSER,org.torproject.android.MANAGE_TOR</permissions></package></application><application id="org.gege.caldavsyncadapter"><id>org.gege.caldavsyncadapter</id><added>2014-10-03</added><lastupdated>2014-10-03</lastupdated><name>CalDAV Sync Adapter</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Fri Oct 03 09:07:38 EDT 2014, last updated on Fri Oct 03 09:07:38 EDT 2014)&lt;/p&gt;</desc><icon>org.gege.caldavsyncadapter_18.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>1.8.1</marketversion><marketvercode>18</marketvercode><package><version>1.8.1</version><versioncode>18</versioncode><apkname>org.gege.caldavsyncadapter_18.apk</apkname><hash type="sha256">3fba34579260dd8f4290a0f68c7526e12385901d52d81267751336e81e2f654a</hash><sig>9767040018038872ff3f651a32969d77</sig><size>796278</size><sdkver>14</sdkver><added>2014-10-03</added><features/><permissions>AUTHENTICATE_ACCOUNTS,READ_CALENDAR,WRITE_CALENDAR,INTERNET</permissions></package></application><application id="info.guardianproject.checkey"><id>info.guardianproject.checkey</id><added>2014-09-27</added><lastupdated>2014-09-27</lastupdated><name>Checkey</name><summary>(installed by F-Droid)</summary><desc>&lt;p&gt;(installed by F-Droid, first installed on Sat Sep 27 23:44:13 EDT 2014, last updated on Sat Sep 27 23:44:21 EDT 2014)&lt;/p&gt;</desc><icon>info.guardianproject.checkey_1.png</icon><license>Unknown</license><categories>LocalRepo,Android-Nexus-7-20139453</categories><category>LocalRepo,Android-Nexus-7-20139453</category><web/><source/><tracker/><marketversion>0.1</marketversion><marketvercode>1</marketvercode><package><version>0.1</version><versioncode>1</versioncode><apkname>info.guardianproject.checkey_1.apk</apkname><hash type="sha256">a8e3c102d5279a3029d0eebdeda2ffdbe1f8a3493ea7dbdc31a11affc708ee57</hash><sig>d70ac6a02b53ebdd1354ea7af7b9ceee</sig><size>878679</size><sdkver>8</sdkver><added>2014-09-27</added><features/><permissions>INTERNET</permissions></package></application></fdroid>
\ No newline at end of file

From 826d70f2c91e7a56e07cc76ed61f2efda328734c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 May 2019 14:16:45 +0200
Subject: [PATCH 7/7] script to automatically cherry-pick complete translations
 from Weblate

This creates a branch 'merge_weblate' and cherry picks commits from Weblate
that contain 100% complete translations.
---
 tools/pick-complete-translations.py | 82 +++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100755 tools/pick-complete-translations.py

diff --git a/tools/pick-complete-translations.py b/tools/pick-complete-translations.py
new file mode 100755
index 000000000..c97664fda
--- /dev/null
+++ b/tools/pick-complete-translations.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python3
+#
+# cherry-pick complete translations from weblate
+
+import git
+import json
+import os
+import re
+import requests
+import sys
+
+
+def get_paths_tuple(locale):
+    return (
+        'metadata/%s/*.txt' % locale,
+        'metadata/%s/changelogs/*.txt' % locale,
+        'app/src/main/res/values-%s/strings.xml' % re.sub(r'-', r'-r', locale),
+    )
+
+projectbasedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+print(projectbasedir)
+
+repo = git.Repo(projectbasedir)
+weblate = repo.remotes.weblate
+weblate.fetch()
+upstream = repo.remotes.upstream
+upstream.fetch()
+
+url = 'https://hosted.weblate.org/exports/stats/f-droid/f-droid/?format=json'
+r = requests.get(url)
+r.raise_for_status()
+app = r.json()
+
+url = 'https://hosted.weblate.org/exports/stats/f-droid/f-droid-metadata/?format=json'
+r = requests.get(url)
+r.raise_for_status()
+metadata = r.json()
+
+
+#with open('f-droid-metadata.json') as fp:
+#    metadata = json.load(fp)
+
+app_locales = dict()
+metadata_locales = dict()
+
+merge_locales = []
+for locale in app:
+    app_locales[locale['code']] = locale
+for locale in metadata:
+    metadata_locales[locale['code']] = locale
+
+for locale in sorted(app_locales.keys(), reverse=True):
+    a = app_locales.get(locale)
+    m = metadata_locales.get(locale)
+    if a is not None and a['translated_percent'] == 100 and a['failing'] == 0 \
+       and m is not None and m['translated_percent'] == 100 and m['failing'] == 0:
+        print(locale)
+        merge_locales.append(locale)
+
+if not merge_locales:
+    sys.exit()
+
+if 'merge_weblate' in repo.heads:
+    merge_weblate = repo.heads['merge_weblate']
+    repo.create_tag('previous_merge_weblate', ref=merge_weblate,
+                    message=('Automatically created by %s' % __file__))
+else:
+    merge_weblate = repo.create_head('merge_weblate')
+merge_weblate.set_commit(upstream.refs.master)
+merge_weblate.checkout()
+
+email_pattern = re.compile(r'by (.*?) <(.*)>$')
+
+for locale in sorted(merge_locales):
+    commits = list(repo.iter_commits(
+        str(weblate.refs.master) + '...' + str(upstream.refs.master),
+        paths=get_paths_tuple(locale), max_count=10))
+    for commit in reversed(commits):
+        repo.git.cherry_pick(str(commit))
+        m = email_pattern.search(commit.summary)
+        if m:
+            email = m.group(1) + ' <' + m.group(2) + '>'