From 35d20475367452b5262fb2795a0ca1ff04379276 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 10 Jun 2020 23:47:52 +0200
Subject: [PATCH 1/6] only show donate icons for free software, otherwise show
plain URLs
fdroidserver!754
fdroid-website !557
---
.../views/AppDetailsRecyclerViewAdapter.java | 25 +++++++++++++------
.../res/drawable/donation_option_flattr.xml | 9 -------
app/src/main/res/layout/donate_flattr.xml | 12 ---------
app/src/main/res/layout/donate_generic.xml | 5 ++--
app/src/main/res/layout/donate_liberapay.xml | 1 -
app/src/main/res/values-af/strings.xml | 1 -
app/src/main/res/values-ar/strings.xml | 1 -
app/src/main/res/values-ast/strings.xml | 1 -
app/src/main/res/values-be/strings.xml | 1 -
app/src/main/res/values-bg/strings.xml | 1 -
app/src/main/res/values-bo/strings.xml | 1 -
app/src/main/res/values-ca/strings.xml | 1 -
app/src/main/res/values-cs/strings.xml | 1 -
app/src/main/res/values-cy/strings.xml | 1 -
app/src/main/res/values-da/strings.xml | 1 -
app/src/main/res/values-de/strings.xml | 1 -
app/src/main/res/values-el/strings.xml | 1 -
app/src/main/res/values-eo/strings.xml | 1 -
app/src/main/res/values-es-rAR/strings.xml | 1 -
app/src/main/res/values-es/strings.xml | 1 -
app/src/main/res/values-et/strings.xml | 1 -
app/src/main/res/values-eu/strings.xml | 1 -
app/src/main/res/values-fa/strings.xml | 1 -
app/src/main/res/values-fi/strings.xml | 1 -
app/src/main/res/values-fr/strings.xml | 1 -
app/src/main/res/values-gl/strings.xml | 1 -
app/src/main/res/values-he/strings.xml | 1 -
app/src/main/res/values-hi/strings.xml | 1 -
app/src/main/res/values-hr/strings.xml | 1 -
app/src/main/res/values-hu/strings.xml | 1 -
app/src/main/res/values-hy/strings.xml | 1 -
app/src/main/res/values-id/strings.xml | 1 -
app/src/main/res/values-is/strings.xml | 1 -
app/src/main/res/values-it/strings.xml | 1 -
app/src/main/res/values-ja/strings.xml | 1 -
app/src/main/res/values-kab/strings.xml | 1 -
app/src/main/res/values-kn/strings.xml | 1 -
app/src/main/res/values-ko/strings.xml | 1 -
app/src/main/res/values-lt/strings.xml | 1 -
app/src/main/res/values-lv/strings.xml | 1 -
app/src/main/res/values-ml/strings.xml | 1 -
app/src/main/res/values-my/strings.xml | 1 -
app/src/main/res/values-nb/strings.xml | 1 -
app/src/main/res/values-nl-rBE/strings.xml | 1 -
app/src/main/res/values-nl/strings.xml | 1 -
app/src/main/res/values-nn/strings.xml | 1 -
app/src/main/res/values-pl/strings.xml | 1 -
app/src/main/res/values-pt-rBR/strings.xml | 1 -
app/src/main/res/values-pt-rPT/strings.xml | 1 -
app/src/main/res/values-pt/strings.xml | 1 -
app/src/main/res/values-ro/strings.xml | 1 -
app/src/main/res/values-ru/strings.xml | 1 -
app/src/main/res/values-sc/strings.xml | 1 -
app/src/main/res/values-sk/strings.xml | 1 -
app/src/main/res/values-sl/strings.xml | 1 -
app/src/main/res/values-sn/strings.xml | 1 -
app/src/main/res/values-sq/strings.xml | 1 -
app/src/main/res/values-sr/strings.xml | 1 -
app/src/main/res/values-sv/strings.xml | 1 -
app/src/main/res/values-ta/strings.xml | 1 -
app/src/main/res/values-te/strings.xml | 1 -
app/src/main/res/values-th/strings.xml | 1 -
app/src/main/res/values-tr/strings.xml | 1 -
app/src/main/res/values-ug/strings.xml | 1 -
app/src/main/res/values-uk/strings.xml | 1 -
app/src/main/res/values-vi/strings.xml | 1 -
app/src/main/res/values-zh-rCN/strings.xml | 1 -
app/src/main/res/values-zh-rHK/strings.xml | 1 -
app/src/main/res/values-zh-rTW/strings.xml | 1 -
app/src/main/res/values/strings.xml | 1 -
70 files changed, 20 insertions(+), 97 deletions(-)
delete mode 100644 app/src/main/res/drawable/donation_option_flattr.xml
delete mode 100644 app/src/main/res/layout/donate_flattr.xml
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 e6287e50f..144035764 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -791,9 +791,9 @@ public class AppDetailsRecyclerViewAdapter
donationOptionsLayout.removeAllViews();
- // Donate button
- if (uriIsSetAndCanBeOpened(app.donate)) {
- addDonateOption(R.layout.donate_generic, app.donate);
+ // LiberaPay
+ if (uriIsSetAndCanBeOpened(app.getLiberapayUri())) {
+ addDonateOption(R.layout.donate_liberapay, app.getLiberapayUri());
}
// Bitcoin
@@ -808,17 +808,28 @@ public class AppDetailsRecyclerViewAdapter
// Flattr
if (uriIsSetAndCanBeOpened(app.getFlattrUri())) {
- addDonateOption(R.layout.donate_flattr, app.getFlattrUri());
+ addDonateOption(R.layout.donate_generic, app.getFlattrUri());
}
- // LiberaPay
- if (uriIsSetAndCanBeOpened(app.getLiberapayUri())) {
- addDonateOption(R.layout.donate_liberapay, app.getLiberapayUri());
+
+ // Donate button
+ if (uriIsSetAndCanBeOpened(app.donate)) {
+ addDonateOption(R.layout.donate_generic, app.donate);
}
}
+ /**
+ * Show the donate button, but only if it is an HTTPS URL. The
+ * {@code https://} is then stripped off when URLs are directly displayed.
+ */
private void addDonateOption(@LayoutRes int layout, final String uri) {
LayoutInflater inflater = LayoutInflater.from(context);
View option = inflater.inflate(layout, donationOptionsLayout, false);
+ if (layout == R.layout.donate_generic) {
+ if (!uri.toLowerCase(Locale.ENGLISH).startsWith("https://")) {
+ return;
+ }
+ ((TextView) option).setText(uri.substring(8));
+ }
option.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/donation_option_flattr.xml b/app/src/main/res/drawable/donation_option_flattr.xml
deleted file mode 100644
index 8fad0face..000000000
--- a/app/src/main/res/drawable/donation_option_flattr.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="100dp" android:viewportHeight="200.0"
- android:viewportWidth="850.0" android:width="425dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillAlpha="1" android:fillColor="#f6a422"
- android:pathData="m69.29,9.2c-43.04,0 -65.01,24.83 -65.01,71.19l0,0 0,32.38 0,64.87 42.16,-42.27 0,-49.4c0,-19.2 5.08,-31.43 22.13,-34.17l0,0c5.95,-1.17 18.35,-0.76 26.23,-0.76l0,0 0,29.33c0,0.27 0.04,0.75 0.1,0.99l0,0c0.33,1.19 1.4,2.06 2.67,2.06l0,0c0.72,0 1.39,-0.37 2.09,-1.06l0,0 73.06,-73.15 -49.04,-0.01 -54.39,0z" android:strokeColor="#00000000"/>
- <path android:fillAlpha="1" android:fillColor="#79b732"
- android:pathData="m143.22,64.42 l0,49.4c0,19.2 -5.08,31.43 -22.13,34.17l0,0c-5.95,1.16 -18.35,0.76 -26.23,0.76l0,0 0,-29.33c0,-0.27 -0.04,-0.75 -0.1,-0.99l0,0c-0.33,-1.19 -1.4,-2.06 -2.67,-2.06l0,0c-0.72,-0 -1.39,0.37 -2.09,1.06l0,0 -73.06,73.15 49.04,0.01 54.39,0c43.04,0 65.01,-24.83 65.01,-71.19l0,0 0,-32.38 0,-64.87 -42.16,42.27z" android:strokeColor="#00000000"/>
- <path android:fillAlpha="1" android:fillColor="#120b11"
- android:pathData="m583.85,141.07c-0.09,13.75 0.69,19.42 3.07,26.43 1.86,5.13 4.53,9.46 8.28,12.99 6.97,7.05 16.65,10.08 31.74,10.17l17.94,0.11c0.74,0 2.38,-0.09 3.04,-0.29 2.31,-0.68 4.13,-2.47 4.87,-4.76 0.22,-0.69 0.34,-2.33 0.34,-3.09l0.07,-11.64c0,-0.73 -0.09,-2.37 -0.29,-3.04 -0.68,-2.31 -2.47,-4.13 -4.76,-4.86 -0.68,-0.22 -2.33,-0.34 -3.09,-0.35l-6.1,-0.03c-7.55,-0.05 -13.2,-2.24 -16.13,-6.57 -2.41,-3.52 -2.92,-7.57 -2.84,-21.05l0.24,-39.51c0.01,-0.76 0.13,-2.4 0.35,-3.09 0.73,-2.29 2.56,-4.08 4.86,-4.76 0.67,-0.2 2.31,-0.3 3.04,-0.29l-0.01,-0.01 17.03,0.11c0.73,0 2.37,-0.09 3.04,-0.29 2.3,-0.68 4.13,-2.48 4.86,-4.76 0.21,-0.69 0.34,-2.34 0.35,-3.09l0.07,-11.64c0,-0.73 -0.1,-2.37 -0.29,-3.04 -0.68,-2.3 -2.47,-4.13 -4.76,-4.86 -0.69,-0.22 -2.34,-0.34 -3.09,-0.35l-17.04,-0.11c-0.75,0 -2.4,-0.13 -3.09,-0.34 -2.29,-0.73 -4.08,-2.56 -4.76,-4.86 -0.2,-0.67 -0.29,-2.31 -0.29,-3.04l0.2,-32.11c0,-0.73 -0.1,-2.37 -0.3,-3.04 -0.68,-2.3 -2.47,-4.13 -4.75,-4.86 -0.69,-0.22 -2.34,-0.34 -3.09,-0.35L592.86,10.67C592.13,10.67 590.49,10.77 589.82,10.96 587.52,11.65 585.69,13.44 584.96,15.72 584.74,16.41 584.61,18.06 584.61,18.81L583.85,141.07zM845.64,66.93c-0,-0.76 -0.13,-2.4 -0.34,-3.09 -0.74,-2.28 -2.56,-4.07 -4.87,-4.76 -0.67,-0.2 -2.31,-0.3 -3.04,-0.29l-23.72,0.11c-15.09,0.1 -24.77,3.12 -31.74,10.17 -3.75,3.53 -6.42,7.86 -8.28,12.99 -2.38,7.02 -3.15,12.68 -3.07,26.43l-0.45,73.93c-0,0.73 0.09,2.37 0.29,3.04 0.68,2.3 2.47,4.13 4.76,4.86 0.69,0.22 2.33,0.35 3.09,0.35l19.73,0.12c0.73,0.01 2.38,-0.09 3.04,-0.29 2.3,-0.68 4.13,-2.47 4.86,-4.75 0.22,-0.68 0.34,-2.34 0.35,-3.1l0.4,-63.28 0.08,-2.02c-0.08,-13.48 0.43,-17.53 2.83,-21.05 2.93,-4.33 10.03,-5.07 17.57,-5.12l10.43,-0.04c0.75,-0 2.4,-0.13 3.09,-0.35 2.28,-0.73 4.08,-2.56 4.76,-4.86 0.2,-0.67 0.3,-2.31 0.29,-3.04l-0.07,-15.98zM355.39,35.29c-0.03,0.83 -0.13,2.1 -0.32,2.69 -0.72,2.29 -2.53,4.09 -4.83,4.79 -0.67,0.2 -2.31,0.31 -3.04,0.31l-33.62,0c-8.35,0 -19.67,0.81 -26.69,2.16 -15.36,2.43 -23.18,12.67 -23.18,29.65l0,1.5c0,0.73 0.11,10.59 0.31,11.26 0.69,2.3 2.5,4.11 4.79,4.83 0.69,0.22 2.34,0.33 3.09,0.33l75.29,0c0.76,0 2.41,0.12 3.09,0.33 2.29,0.72 4.09,2.54 4.79,4.84 0.2,0.67 0.31,2.31 0.31,3.04l0,15.41c0,0.76 -0.11,2.4 -0.33,3.09 -0.71,2.29 -2.53,4.1 -4.83,4.79 -0.67,0.2 -2.31,0.31 -3.05,0.31l-75.27,0c-0.73,0 -2.37,0.11 -3.04,0.31 -2.3,0.69 -4.12,2.5 -4.83,4.79 -0.22,0.68 -0.33,2.33 -0.33,3.09l0,49.79c0,0.75 -0.12,2.4 -0.33,3.09 -0.72,2.29 -2.53,4.09 -4.83,4.79 -0.67,0.2 -2.31,0.31 -3.04,0.31l-21.62,0 0.01,0.01c-0.11,0 -0.26,-0.01 -0.39,-0.01 -0.84,-0.03 -2.11,-0.13 -2.7,-0.32 -2.29,-0.72 -4.09,-2.53 -4.79,-4.83 -0.2,-0.67 -0.31,-2.3 -0.31,-3.04l0,-85.61 0,-10.24c1.08,-32.35 5.66,-45.55 19.95,-58.76 8.89,-8.09 20.48,-13.21 36.11,-15.36 8.37,-1.35 11.06,-1.62 26.96,-1.62l38.48,0c0.75,0 2.4,0.12 3.09,0.33 2.29,0.72 4.09,2.54 4.79,4.83 0.19,0.62 0.29,2.04 0.3,2.83 0,0.06 0.01,0.15 0.01,0.21l-0.01,-0.01 0,15.7 0.02,-0.01c0,0.11 -0.01,0.26 -0.02,0.4M677.93,141.09c-0.09,13.75 0.69,19.42 3.07,26.43 1.85,5.13 4.53,9.46 8.28,12.99 6.97,7.05 16.65,10.08 31.74,10.17l17.94,0.11c0.74,0.01 2.38,-0.09 3.05,-0.29 2.31,-0.68 4.13,-2.47 4.87,-4.75 0.22,-0.69 0.34,-2.33 0.34,-3.09l0.07,-11.64c0,-0.73 -0.09,-2.37 -0.29,-3.04 -0.68,-2.31 -2.47,-4.13 -4.76,-4.86 -0.68,-0.22 -2.33,-0.34 -3.09,-0.35l-6.1,-0.03c-7.55,-0.05 -13.2,-2.24 -16.13,-6.57 -2.41,-3.52 -2.92,-7.57 -2.84,-21.05l0.24,-39.51c0.01,-0.76 0.13,-2.4 0.35,-3.09 0.73,-2.29 2.56,-4.08 4.86,-4.76 0.67,-0.2 2.31,-0.3 3.04,-0.29l-0.01,-0.01 17.02,0.11c0.73,0 2.37,-0.09 3.04,-0.29 2.3,-0.68 4.13,-2.48 4.86,-4.76 0.21,-0.69 0.34,-2.34 0.35,-3.09l0.07,-11.64c0,-0.73 -0.1,-2.37 -0.29,-3.04 -0.68,-2.3 -2.47,-4.13 -4.76,-4.86 -0.69,-0.22 -2.33,-0.34 -3.09,-0.35l-17.04,-0.11c-0.76,0 -2.4,-0.13 -3.09,-0.34 -2.29,-0.73 -4.07,-2.56 -4.76,-4.86 -0.19,-0.67 -0.29,-2.31 -0.28,-3.04l0.2,-32.11c0,-0.73 -0.1,-2.37 -0.3,-3.04 -0.68,-2.3 -2.47,-4.13 -4.75,-4.86 -0.69,-0.22 -2.34,-0.34 -3.09,-0.35l-19.74,-0.12c-0.73,-0 -2.37,0.09 -3.04,0.29 -2.31,0.68 -4.13,2.48 -4.86,4.76 -0.22,0.68 -0.35,2.33 -0.35,3.09l-0.76,122.26zM416.54,182.59c0,0.76 -0.12,2.41 -0.33,3.09 -0.72,2.29 -2.53,4.09 -4.83,4.79 -0.67,0.2 -2.31,0.31 -3.04,0.31l-19.74,0 0.01,0.01c-0.1,0 -0.26,-0.01 -0.4,-0.01 -0.83,-0.03 -2.1,-0.14 -2.69,-0.32 -2.3,-0.71 -4.1,-2.53 -4.79,-4.83 -0.2,-0.67 -0.31,-2.31 -0.31,-3.04l0,-163.41c0,-0.75 0.11,-2.4 0.33,-3.09 0.72,-2.29 2.53,-4.09 4.83,-4.79 0.62,-0.19 2.04,-0.29 2.83,-0.31l0.2,0 19.73,0c0.75,0 2.4,0.12 3.09,0.33 2.29,0.72 4.09,2.54 4.79,4.83 0.2,0.67 0.31,2.31 0.31,3.04l0,163.39zM525.12,154.58c0,0.75 -0.12,2.4 -0.33,3.09 -0.72,2.29 -2.54,4.09 -4.83,4.79 -0.67,0.2 -2.31,0.31 -3.04,0.31l-22.03,0c-14.29,0 -19.41,-2.96 -19.41,-11.59 0,-7.55 5.12,-12.13 13.48,-12.13l5.92,0 22.04,0c0.75,0 2.4,0.12 3.09,0.33 2.29,0.72 4.09,2.54 4.79,4.83 0.2,0.67 0.31,2.31 0.31,3.04l0,7.33zM558.27,90.26c-1.89,-6.2 -5.12,-11.59 -8.89,-16.17 -8.62,-9.7 -19.41,-14.02 -36.93,-14.29 -3.77,0 -8.62,-0.27 -14.82,-0.27l-41.16,0c-0.73,0 -2.37,0.11 -3.04,0.31 -2.3,0.69 -4.12,2.5 -4.84,4.78 -0.21,0.68 -0.32,2.34 -0.32,3.1l0,11.63c0,0.73 0.11,2.38 0.31,3.04 0.7,2.3 2.5,4.12 4.79,4.83 0.68,0.21 2.34,0.33 3.09,0.33l41.17,0c17.93,0 25.39,3.84 27.09,15.32 -0,0.77 -0.12,2.36 -0.33,3.03 -0.71,2.29 -2.53,4.09 -4.83,4.79 -0.67,0.2 -2.3,0.31 -3.04,0.31l-24.05,0c-20.76,0 -31.26,2.16 -38.28,7.27 -9.69,7.01 -15.63,19.95 -15.63,33.7 0,17.78 10.52,32.88 25.35,36.65 7.27,1.89 12.67,2.16 32.88,2.16l56.25,0c0.74,0 2.38,-0.11 3.04,-0.31 2.3,-0.69 4.11,-2.5 4.83,-4.79 0.21,-0.69 0.33,-2.34 0.33,-3.09l0,-65.67c0,-14.29 -0.53,-18.87 -2.96,-26.68" android:strokeColor="#00000000"/>
-</vector>
diff --git a/app/src/main/res/layout/donate_flattr.xml b/app/src/main/res/layout/donate_flattr.xml
deleted file mode 100644
index 113c1774a..000000000
--- a/app/src/main/res/layout/donate_flattr.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="80dp"
- android:layout_height="30dp"
- android:padding="6dp"
- android:layout_marginStart="4dp"
- android:layout_marginLeft="4dp"
- android:layout_marginEnd="4dp"
- android:layout_marginRight="4dp"
- android:src="@drawable/donation_option_flattr"
- android:contentDescription="@string/menu_flattr" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_generic.xml b/app/src/main/res/layout/donate_generic.xml
index 25ef78208..b68c4d556 100644
--- a/app/src/main/res/layout/donate_generic.xml
+++ b/app/src/main/res/layout/donate_generic.xml
@@ -2,7 +2,7 @@
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="30dp"
+ android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_donate"
android:drawableStart="@drawable/ic_donate"
android:drawablePadding="4dp"
@@ -10,5 +10,4 @@
android:layout_marginLeft="4dp"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
- android:gravity="center_vertical"
- android:text="@string/menu_donate" />
\ No newline at end of file
+ android:gravity="center_vertical" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_liberapay.xml b/app/src/main/res/layout/donate_liberapay.xml
index 7d483844b..f08246385 100644
--- a/app/src/main/res/layout/donate_liberapay.xml
+++ b/app/src/main/res/layout/donate_liberapay.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="80dp"
android:layout_height="28dp"
android:layout_marginEnd="12dp"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 26f5c640c..98c946006 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -84,7 +84,6 @@
<string name="menu_changelog">Veranderingslys</string>
<string name="menu_source">Bronkode</string>
<string name="menu_upgrade">Opgradering</string>
- <string name="menu_donate">Skenk</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bb998551d..706c8d49c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -31,7 +31,6 @@
<string name="menu_ignore_all">تجاهل كل التحديثات</string>
<string name="menu_ignore_this">تجاهل هذا التحديث</string>
<string name="menu_source">الشفرة المصدرية</string>
- <string name="menu_donate">التبرع</string>
<string name="local_repo">المستودع المحلي</string>
<string name="deleting_repo">يتم حذف المستودع الحالي…</string>
<string name="next">التالي</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 9aa13d941..3bb210e0d 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Problemes</string>
<string name="menu_source">Códigu fonte</string>
<string name="menu_upgrade">Anovar</string>
- <string name="menu_donate">Donar</string>
<string name="details_notinstalled">Nun s\'instaló</string>
<string name="antiadslist">Esta aplicación contién anuncios</string>
<string name="antitracklist">Esta aplicación rastrexa ya informa de la to actividá</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 632fbe773..501534292 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -84,7 +84,6 @@
<string name="menu_changelog">Спіс змен</string>
<string name="menu_source">Зыходны код</string>
<string name="menu_upgrade">Абнавіць</string>
- <string name="menu_donate">Ахвяраваць</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 8e21d59e7..3db2828ae 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -55,7 +55,6 @@
<string name="menu_website">Уебсайт</string>
<string name="menu_issues">Проблеми</string>
<string name="menu_source">Изходен код</string>
- <string name="menu_donate">Направете дарение</string>
<string name="details_notinstalled">Не е инсталирано</string>
<string name="antiadslist">Приложението съдържа реклами</string>
<string name="antitracklist">Приложението следи и докладва активността ви</string>
diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml
index 216d07d8a..3a98cfaa4 100644
--- a/app/src/main/res/values-bo/strings.xml
+++ b/app/src/main/res/values-bo/strings.xml
@@ -165,7 +165,6 @@
<string name="menu_video">བརྙན་འཕྲིན།</string>
<string name="menu_license">ཆོག་མཆན་ལག་ཁྱེར་:%s</string>
<string name="menu_source">འབྱུང་ཁུངས་་ཨང་རྟགས།</string>
- <string name="menu_donate">ཞལ་འདེབས།</string>
<string name="latest__empty_state__no_recent_apps">ཉེ་བའི་ཆར་གྱི་མཉེན་ཆས་རྙེད་མ་སོང་།</string>
<string name="latest__empty_state__never_updated">ཁྱེད་རང་གིས་མཉེས་ཆས་ཀྱི་ཐོ་གཞུང་གསར་བསྒྱུར་བྱས་ཚར་ན། མཉེན་ཆས་ཐོན་གསར་ཤོས་རྣམས་འདིར་སྟོན་གྱི་རེད།</string>
<string name="latest__empty_state__no_enabled_repos">ཁྱེད་རང་གིས་མཛོད་ཁང་སྒོ་ཕྱེས་ནས་གསར་བསྒྱུར་བྱེད་འགོ་བཙུགས་མ་ཐག མཉེན་ཆས་ཐོན་གསར་ཤོས་རྣམས་འདིར་སྟོན་གྱི་རེད།</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5afe78f13..c1816454b 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -51,7 +51,6 @@
<string name="menu_issues">Problemes</string>
<string name="menu_source">Codi font</string>
<string name="menu_upgrade">Actualitza</string>
- <string name="menu_donate">Feu una donació</string>
<string name="details_notinstalled">No està instal·lat</string>
<string name="antiadslist">Aquesta aplicació conté publicitat</string>
<string name="antitracklist">Aquesta aplicació segueix i informa sobre la vostra activitat</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c698d7c8d..6836fb7bd 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -47,7 +47,6 @@
<string name="menu_issues">Problémy</string>
<string name="menu_source">Zdrojový kód</string>
<string name="menu_upgrade">Aktualizovat</string>
- <string name="menu_donate">Přispět</string>
<string name="details_notinstalled">Nenainstalováno</string>
<string name="antiadslist">Tato aplikace obsahuje reklamu</string>
<string name="antitracklist">Tato aplikace zaznamenává a hlásí vaše aktivity</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 05d87d0ea..edc07a5fd 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -154,7 +154,6 @@
<string name="menu_license">Trwydded: %s</string>
<string name="menu_source">Cod Gwreiddiol</string>
<string name="menu_downgrade">Israddio</string>
- <string name="menu_donate">Cyfrannu</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 9405c4657..61585bd5b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -72,7 +72,6 @@
<string name="menu_changelog">Ændringslog</string>
<string name="menu_source">Kildekode</string>
<string name="menu_upgrade">Opdater</string>
- <string name="menu_donate">Doner</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 28548fcd1..c85597b76 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Probleme</string>
<string name="menu_source">Quelltext</string>
<string name="menu_upgrade">Aktualisieren</string>
- <string name="menu_donate">Spenden</string>
<string name="details_notinstalled">Nicht installiert</string>
<string name="antiadslist">Diese App enthält Werbung</string>
<string name="antitracklist">Diese App verfolgt und versendet Ihre Aktivitäten</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index bfa6acb63..f47cbfdb3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -46,7 +46,6 @@
<string name="menu_issues">Προβλήματα</string>
<string name="menu_source">Πηγαίος κώδικας</string>
<string name="menu_upgrade">Ενημέρωση</string>
- <string name="menu_donate">Δωρεά</string>
<string name="details_notinstalled">Μη εγκατεστημένο</string>
<string name="antiadslist">Αυτή η εφαρμογή περιέχει διαφημίσεις</string>
<string name="antitracklist">Αυτή η εφαρμογή παρακολουθεί και αναφέρει την δραστηριότητα σας</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 95b67326a..de9e93ebc 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -37,7 +37,6 @@
<string name="menu_issues">Eraroj</string>
<string name="menu_source">Fontkodo</string>
<string name="menu_upgrade">Ĝisdatigi</string>
- <string name="menu_donate">Donaci</string>
<string name="details_notinstalled">Neinstalita</string>
<string name="antiadslist">Tiu ĉi aplikaĵo enhavas reklamojn</string>
<string name="antitracklist">Tiu ĉi aplikaĵo spuras kaj raportas vian agadon</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 4d7c633f6..a733604f3 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -159,7 +159,6 @@
<string name="menu_source">Código fuente</string>
<string name="menu_translation">Traducción</string>
<string name="menu_upgrade">Actualizar</string>
- <string name="menu_donate">Donar</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f4b4d48fd..1f3fa2bf8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -55,7 +55,6 @@
<string name="menu_issues">Incidencias</string>
<string name="menu_source">Código fuente</string>
<string name="menu_upgrade">Actualizar</string>
- <string name="menu_donate">Donar</string>
<string name="details_notinstalled">No instalado</string>
<string name="antiadslist">Esta aplicación tiene publicidad</string>
<string name="antitracklist">Esta aplicación rastrea e informa de tu actividad</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index bfe434a72..24429865e 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -116,7 +116,6 @@
<string name="install_confirm_update_no_perms">Kas soovite paigaldada värskenduse sellele rakendusele\? Teie andmed ei lähe kaduma. Erijuurdepääs ei ole vajalik.</string>
<string name="install_confirm_update_system_no_perms">Kas soovite paigaldada värskenduse sisseehitatud rakendusele\? Olemasolevad andmed ei lähe kaduma. Erijuurdepääs ei ole vajalik.</string>
<string name="menu_upgrade">Värskenda</string>
- <string name="menu_donate">Toeta</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9bda8cee4..504e2f0ab 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -42,7 +42,6 @@
<string name="menu_issues">Arazoak</string>
<string name="menu_source">Iturburu-kodea</string>
<string name="menu_upgrade">Eguneratu</string>
- <string name="menu_donate">Egin dohaintza</string>
<string name="details_notinstalled">Instalatu gabe</string>
<string name="antiadslist">Aplikazio honek iragarkiak ditu</string>
<string name="display">Bistaratu</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a5407a070..c6baf68ce 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -32,7 +32,6 @@
<string name="menu_uninstall">حذف نصب</string>
<string name="menu_issues">اشکالها</string>
<string name="menu_source">کد مبدأ</string>
- <string name="menu_donate">کمک مالی</string>
<string name="details_notinstalled">نصب نشده</string>
<string name="antiadslist">این کاره دارای تبلیغات است</string>
<string name="antitracklist">این کاره، فعّالیتهایتان را ردیابی و گزارش میکند</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 34083e39b..453933c66 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Ongelmat</string>
<string name="menu_source">Lähdekoodi</string>
<string name="menu_upgrade">Päivitä</string>
- <string name="menu_donate">Lahjoita</string>
<string name="details_notinstalled">Ei asennettu</string>
<string name="antiadslist">Tämä sovellus sisältää mainoksia</string>
<string name="antitracklist">Tämä sovellus tarkkailee ja raportoi toimintaasi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d219d8063..cf7f2619f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -57,7 +57,6 @@
<string name="menu_issues">Problèmes</string>
<string name="menu_source">Code source</string>
<string name="menu_upgrade">Mettre à jour</string>
- <string name="menu_donate">Faire un don</string>
<string name="details_notinstalled">Non installée</string>
<string name="antiadslist">Cette appli contient des publicités</string>
<string name="antitracklist">Cette appli suit et transmet votre activité</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index ecbd622b0..41cd0e947 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -35,7 +35,6 @@
<string name="menu_issues">Incidencias</string>
<string name="menu_source">Código fonte</string>
<string name="menu_upgrade">Actualizar</string>
- <string name="menu_donate">Doar</string>
<string name="details_notinstalled">Non instalada</string>
<string name="antiadslist">Esta aplicación contén publicidade</string>
<string name="antitracklist">Esta aplicación rexistra e informa da túa actividade</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index b77baf491..f489bdd5a 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -57,7 +57,6 @@
<string name="menu_changelog">יומן שינויים</string>
<string name="menu_source">קוד מקור</string>
<string name="menu_upgrade">עדכון</string>
- <string name="menu_donate">תרומות</string>
<string name="details_notinstalled">לא מותקן</string>
<string name="antiadslist">יישומון זה מכיל פרסום</string>
<string name="antitracklist">יישומון זה עוקב ומדווח על פעילותך</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 33ff5a147..ba3dc3925 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -200,7 +200,6 @@
<string name="menu_issues">मुद्दे</string>
<string name="menu_changelog">मुद्दे</string>
<string name="menu_source">सोर्स कोड</string>
- <string name="menu_donate">दान करना</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 3b259c82d..f7ca6bb22 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -78,7 +78,6 @@
<string name="menu_changelog">Zapis o promjenama</string>
<string name="menu_source">Izvorni kod</string>
<string name="menu_upgrade">Ažuriraj</string>
- <string name="menu_donate">Doniraj</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 9b5ca6d8f..2a8624f64 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -41,7 +41,6 @@
<string name="menu_issues">Problémák</string>
<string name="menu_source">Forráskód</string>
<string name="menu_upgrade">Frissítés</string>
- <string name="menu_donate">Adományozás</string>
<string name="details_notinstalled">Nincs telepítve</string>
<string name="antiadslist">Az alkalmazás reklámot tartalmaz</string>
<string name="antitracklist">Az alkalmazás nyomon követi és jelenti a tevékenységeit</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index d60a46f48..d9ce389e0 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -44,7 +44,6 @@
<string name="menu_install">Տեղադրել</string>
<string name="menu_uninstall">Ապատեղադրել</string>
<string name="menu_website">Կայք</string>
- <string name="menu_donate">Նվիրաբերել</string>
<string name="preference_category__my_apps">Իմ ափփերը</string>
<string name="next">Հաջորդը</string>
<string name="skip">Բաց թողնել</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index f62feda68..88c2d0b83 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -63,7 +63,6 @@
<string name="menu_changelog">Catatan Perubahan</string>
<string name="menu_source">Kode Sumber</string>
<string name="menu_upgrade">Perbarui</string>
- <string name="menu_donate">Donasi</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 2dbd15fbf..5948e6b76 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -70,7 +70,6 @@
<string name="menu_changelog">Breytingaskrá</string>
<string name="menu_source">Upprunakóði</string>
<string name="menu_upgrade">Uppfæra</string>
- <string name="menu_donate">Styrkja</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index edfd33af6..d36cc7fd0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -55,7 +55,6 @@
<string name="menu_issues">Problemi</string>
<string name="menu_source">Codice sorgente</string>
<string name="menu_upgrade">Aggiorna</string>
- <string name="menu_donate">Dona</string>
<string name="details_notinstalled">Non installato</string>
<string name="antiadslist">Questa app contiene pubblicità</string>
<string name="antitracklist">Questa app monitora e riferisce sulle tue attività</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c94cbf7ab..f78d776ae 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">課題</string>
<string name="menu_source">ソースコード</string>
<string name="menu_upgrade">アップデート</string>
- <string name="menu_donate">寄付する</string>
<string name="details_notinstalled">未インストール</string>
<string name="antiadslist">このアプリは広告を表示します</string>
<string name="antitracklist">このアプリはあなたの操作を記録し報告します</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 25bc15ea6..8c8c7813b 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -75,7 +75,6 @@
<string name="menu_video">Ividyuten</string>
<string name="menu_license">%s Turagt</string>
<string name="menu_source">Tangalt taγbalut</string>
- <string name="menu_donate">Tawsa</string>
<string name="antifeatures">Timahilin</string>
<string name="display">Askan</string>
<string name="search_hint">Nadi</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 80030b328..47b717050 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -39,7 +39,6 @@
<string name="details_new_in_version">%s ನೇ ಆವೃತ್ತಿಯಲ್ಲಿ ಹೊಸತು</string>
<string name="main_menu__swap_nearby">ಹತ್ತಿರವೇನಿದೆ</string>
<string name="main_menu__latest_apps">ಇತ್ತೀಚಿನ</string>
- <string name="menu_donate">ದೇಣಿಗೆ</string>
<string name="menu_website">ಜಾಲತಾಣ</string>
<string name="menu_email">ಲೇಖಕರಿಗೆ ಇಮೇಲ್ ಮಾಡಿ</string>
<string name="menu_share">ಹಂಚಿರಿ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 971b9b40e..02bbe0b2b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">이슈</string>
<string name="menu_source">소스 코드</string>
<string name="menu_upgrade">업데이트</string>
- <string name="menu_donate">기부</string>
<string name="details_notinstalled">설치되지 않음</string>
<string name="antiadslist">이 앱에는 광고를 포함합니다</string>
<string name="antitracklist">이 앱은 당신의 활동을 추적하여 보고합니다</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f17b41891..21c88b78d 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -35,7 +35,6 @@
<string name="menu_website">Svetainė</string>
<string name="menu_source">Išeities tekstai</string>
<string name="menu_upgrade">Atnaujinti</string>
- <string name="menu_donate">Paaukoti</string>
<string name="details_notinstalled">Neįdiegta</string>
<string name="display">Rodymas</string>
<string name="show_incompat_versions">Rodyti nesuderinamas versijas</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 3c663e1fe..e8f1fba21 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -49,7 +49,6 @@
<string name="menu_website">Mājaslapa</string>
<string name="menu_source">Pirmkods</string>
<string name="menu_upgrade">Atjaunināt</string>
- <string name="menu_donate">Ziedot</string>
<string name="details_notinstalled">Nav instalēts</string>
<string name="antiadslist">Programma satur reklāmu</string>
<string name="antitracklist">Šī programma seko jūsu aktivitātēm un ziņo par tām</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 573c890da..aaccef28e 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -151,7 +151,6 @@
<string name="menu_video">വീഡിയോ</string>
<string name="menu_license">അനുമതി: %s</string>
<string name="menu_source">സോഴ്സ് കോഡ്</string>
- <string name="menu_donate">സംഭാവനചെയ്യുക</string>
<string name="menu_bitcoin">ബിറ്റ്കോയിന്</string>
<string name="menu_litecoin">ലെെറ്റ്കോയിന്</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 235be782a..5dd7c09a9 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -93,7 +93,6 @@
<string name="menu_changelog">ေျပာင္းလဲမႈမွတ္တမ္း</string>
<string name="menu_source">ဆိုစ့္ကုဒ္</string>
<string name="menu_upgrade">အဆင့္ျမင့္တင္မည္</string>
- <string name="menu_donate">လွဴဒါန္းမည္</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="details_notinstalled">မသြင္းထားခဲ့ပါ</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 8de016dc1..0227a67a3 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Problemoversikt</string>
<string name="menu_source">Kildekode</string>
<string name="menu_upgrade">Oppdater</string>
- <string name="menu_donate">Doner</string>
<string name="details_notinstalled">Ikke installert</string>
<string name="antiadslist">Dette programmet inneholder reklame</string>
<string name="antitracklist">Dette programmet sporer og rapporterer din aktivitet</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 50432b820..3a33aa859 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -174,7 +174,6 @@
<string name="menu_video">Video</string>
<string name="menu_license">Licentie: %s</string>
<string name="menu_source">Broncode</string>
- <string name="menu_donate">Doneren</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 18a37dec9..ba91ce3fb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Problemen</string>
<string name="menu_source">Broncode</string>
<string name="menu_upgrade">Bijwerken</string>
- <string name="menu_donate">Doneer</string>
<string name="details_notinstalled">Niet geïnstalleerd</string>
<string name="antiadslist">Deze app bevat advertenties</string>
<string name="antitracklist">Deze app houdt je activiteiten bij en rapporteert ze</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 6d2010ae3..31c6e3a37 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -204,7 +204,6 @@
<string name="menu_source">Kjeldekode</string>
<string name="menu_translation">Omsetjing</string>
<string name="menu_downgrade">Nedgrader</string>
- <string name="menu_donate">Gje pengegåve</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e4e869fd9..c66a2289a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -129,7 +129,6 @@
<string name="menu_issues">Problemy</string>
<string name="menu_changelog">Lista zmian</string>
<string name="menu_source">Kod źródłowy</string>
- <string name="menu_donate">Dotacja</string>
<string name="antitracklist">Ta aplikacja śledzi i raportuje Twoją aktywność</string>
<string name="show_incompat_versions_on">Pokazuj aplikacje, które są niekompatybilne z tym urządzeniem</string>
<string name="status_download">Pobieranie\n%2$s / %3$s (%4$d%%) z\n%1$s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e7ffe74ff..b71c26753 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -56,7 +56,6 @@
<string name="menu_issues">Problemas</string>
<string name="menu_source">Código Fonte</string>
<string name="menu_upgrade">Atualizar</string>
- <string name="menu_donate">Fazer doação</string>
<string name="details_notinstalled">Não instalado</string>
<string name="antiadslist">Este aplicativo contém anúncios</string>
<string name="antitracklist">Este aplicativo rastreia e relata sua atividade</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 26ccffab9..7eec092c2 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -66,7 +66,6 @@
<string name="menu_changelog">Registo de alterações</string>
<string name="menu_source">Código-fonte</string>
<string name="menu_upgrade">Atualizar</string>
- <string name="menu_donate">Doar</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fc6ac18ae..0bdf65b23 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -204,7 +204,6 @@
<string name="menu_source">Código-fonte</string>
<string name="menu_translation">Tradução</string>
<string name="menu_downgrade">Desatualizar</string>
- <string name="menu_donate">Doar</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index d014fa0fc..1d052a1f5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -25,7 +25,6 @@
<string name="menu_uninstall">Dezinstalează</string>
<string name="menu_ignore_all">Ignoră toate actualizările</string>
<string name="menu_website">Site web</string>
- <string name="menu_donate">Donează</string>
<string name="details_notinstalled">Nu e instalată</string>
<string name="display">Interfață</string>
<string name="expert">Setări expert</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d4126f293..64d6e902f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Ошибки</string>
<string name="menu_source">Исходный код</string>
<string name="menu_upgrade">Обновить</string>
- <string name="menu_donate">Пожертвовать</string>
<string name="details_notinstalled">Не установлено</string>
<string name="antiadslist">Это приложение содержит рекламу</string>
<string name="antitracklist">Это приложение отслеживает и сообщает о вашей деятельности</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 2c34eca38..b49d0bc0c 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -54,7 +54,6 @@
<string name="menu_issues">Problemas</string>
<string name="menu_source">Còdighe mitza</string>
<string name="menu_upgrade">Agiorna</string>
- <string name="menu_donate">Dona</string>
<string name="details_notinstalled">Non installada</string>
<string name="antiadslist">Custa aplicatzione cuntènnidi publitzidade</string>
<string name="antitracklist">Custa aplicatzione compidat e riferit a àteros de sas atividades tuas</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a0552a0d4..62d5db682 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -56,7 +56,6 @@
<string name="menu_issues">Problémy</string>
<string name="menu_source">Zdrojový kód</string>
<string name="menu_upgrade">Aktualizovať</string>
- <string name="menu_donate">Darovať peniaze</string>
<string name="details_notinstalled">Nie je nainštalované</string>
<string name="antiadslist">Táto aplikácia obsahuje reklamy</string>
<string name="antitracklist">Táto aplikácia zaznamenáva a hlási vaše aktivity</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 34e9dd752..dad9c54e0 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -24,7 +24,6 @@
<string name="menu_website">Spletišče</string>
<string name="menu_issues">Težave</string>
<string name="menu_source">Izvorna koda</string>
- <string name="menu_donate">Donacija</string>
<string name="details_notinstalled">Ni nameščeno</string>
<string name="antiadslist">Ta aplikacija vsebuje oglaševanje</string>
<string name="expert">Napredno</string>
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index eeee17281..2c0d95c9e 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -94,7 +94,6 @@
<string name="menu_changelog">Shandura Rutarwa rwemakare</string>
<string name="menu_source">Nyuko yemurau</string>
<string name="menu_upgrade">Kwidziridza</string>
- <string name="menu_donate">Ipa</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index ec04074f6..1f9e8e91b 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -33,7 +33,6 @@
<string name="menu_uninstall">Çinstaloje</string>
<string name="menu_ignore_this">Shpërfille Këtë Përditësim</string>
<string name="menu_source">Kod Burim</string>
- <string name="menu_donate">Dhuroni</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 70a8f6add..129d771b7 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -52,7 +52,6 @@
<string name="menu_issues">Праћење недостатака</string>
<string name="menu_source">Изворни кôд</string>
<string name="menu_upgrade">Надгради</string>
- <string name="menu_donate">Приложите</string>
<string name="details_notinstalled">Није уграђен</string>
<string name="antiadslist">Овај програм садржи огласе</string>
<string name="antitracklist">Овај програм прати и пријављује Ваша дејства</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 481225f96..d7035f279 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Fel</string>
<string name="menu_source">Källkod</string>
<string name="menu_upgrade">Uppdatera</string>
- <string name="menu_donate">Donera</string>
<string name="details_notinstalled">Inte installerad</string>
<string name="antiadslist">Den här appen innehåller reklam</string>
<string name="antitracklist">Den här appen spårar och rapporterar om din aktivitet</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 59074e360..bf3f60c5e 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -59,7 +59,6 @@
<string name="menu_changelog">மாற்றக் குறிப்புகள்</string>
<string name="menu_source">மூல ஆதார நிரல்</string>
<string name="menu_upgrade">மேம்படுத்து</string>
- <string name="menu_donate">கொடை செய்க</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index a16791e5c..53dc40839 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -40,7 +40,6 @@
<string name="menu_changelog">మార్పులచిట్టా</string>
<string name="menu_video">వీడియో</string>
<string name="menu_license">లైసెన్సు: %s</string>
- <string name="menu_donate">విరాళమివ్వండి</string>
<string name="menu_bitcoin">బిట్కాయిన్</string>
<string name="menu_litecoin">లైట్కాయిన్</string>
<string name="menu_flattr">ఫ్లాట్ర్</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 6b238c90b..97d09e80f 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -59,7 +59,6 @@
<string name="menu_changelog">รายการความเปลี่ยนแปลง</string>
<string name="menu_source">ซอร์สโค้ด</string>
<string name="menu_upgrade">อัพเกรด</string>
- <string name="menu_donate">บริจาคสนับสนุน</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c292d1061..b7d32dc7e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -53,7 +53,6 @@
<string name="menu_issues">Sorunlar</string>
<string name="menu_source">Kaynak Kodu</string>
<string name="menu_upgrade">Güncelle</string>
- <string name="menu_donate">Bağış Yap</string>
<string name="details_notinstalled">Yüklü değil</string>
<string name="antiadslist">Bu uygulama reklam içeriyor</string>
<string name="antitracklist">Bu uygulama etkinliğinizi izler ve raporlar</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 94c05da48..27830016a 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -36,7 +36,6 @@
<string name="menu_issues">مەسىلىلەر</string>
<string name="menu_source">ئەسلى كود</string>
<string name="menu_upgrade">يۈكسەلت</string>
- <string name="menu_donate">ئىئانە</string>
<string name="details_notinstalled">ئورنىتىلمىدى</string>
<string name="antiadslist">بۇ ئەپتە ئېلان بار</string>
<string name="antitracklist">بۇ ئەپ پائالىيەتلىرىڭىزنى ئىزلاپ، دوكلات قىلىدۇ</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index dcfc570bb..fc7bea23d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -26,7 +26,6 @@
<string name="menu_website">Сайт</string>
<string name="menu_issues">Проблеми</string>
<string name="menu_source">Вихідний код</string>
- <string name="menu_donate">Пожертва</string>
<string name="details_notinstalled">Не встановлено</string>
<string name="expert">Експертний режим</string>
<string name="search_hint">Пошук застосунків</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index eac11a927..8ec065f1a 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -55,7 +55,6 @@
<string name="menu_issues">Vấn đề</string>
<string name="menu_source">Mã nguồn</string>
<string name="menu_upgrade">Cập nhật</string>
- <string name="menu_donate">Ủng hộ</string>
<string name="details_notinstalled">Chưa cài đặt</string>
<string name="antiadslist">Ứng dụng này có quảng cáo</string>
<string name="antitracklist">Ứng dụng này theo dõi và báo cáo hoạt động của bạn</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 30af54021..591491fa2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -47,7 +47,6 @@
<string name="menu_issues">报告错误</string>
<string name="menu_source">源代码</string>
<string name="menu_upgrade">更新</string>
- <string name="menu_donate">捐赠</string>
<string name="details_notinstalled">未安装</string>
<string name="antiadslist">该应用程序包含广告</string>
<string name="antitracklist">此应用会记录并报告您的行为</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c12ac925a..9eb9c5847 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -50,7 +50,6 @@
<string name="menu_issues">問題</string>
<string name="menu_source">原始碼</string>
<string name="menu_upgrade">升級</string>
- <string name="menu_donate">捐款</string>
<string name="details_notinstalled">沒有安裝</string>
<string name="antiadslist">此應用程式含有廣告</string>
<string name="antitracklist">此應用程式會跟蹤及彙報您的行為</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 03b4dab0a..e574e7266 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -66,7 +66,6 @@
<string name="menu_changelog">更新日誌</string>
<string name="menu_source">原始碼</string>
<string name="menu_upgrade">更新</string>
- <string name="menu_donate">捐助</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d83f025f..37ea6d9dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -228,7 +228,6 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="menu_translation">Translation</string>
<string name="menu_upgrade">Update</string>
<string name="menu_downgrade">Downgrade</string>
- <string name="menu_donate">Donate</string>
<string name="menu_bitcoin">Bitcoin</string>
<string name="menu_litecoin">Litecoin</string>
<!-- This is a brand name, it should only be translated if the company does so -->
From 1061929fb4c6eec6511a5fcbc486d75de15f4d11 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 10 Jun 2020 23:53:16 +0200
Subject: [PATCH 2/6] support OpenCollective as a donation option
---
.../main/java/org/fdroid/fdroid/data/App.java | 14 ++++++++
.../java/org/fdroid/fdroid/data/DBHelper.java | 17 +++++++++-
.../java/org/fdroid/fdroid/data/Schema.java | 5 +--
.../views/AppDetailsRecyclerViewAdapter.java | 5 +++
.../donation_option_opencollective.xml | 34 +++++++++++++++++++
.../main/res/layout/donate_opencollective.xml | 10 ++++++
app/src/main/res/values/strings.xml | 2 ++
.../fdroid/updater/IndexV1UpdaterTest.java | 1 +
.../resources/guardianproject_index-v1.json | 1 +
9 files changed, 86 insertions(+), 3 deletions(-)
create mode 100644 app/src/main/res/drawable/donation_option_opencollective.xml
create mode 100644 app/src/main/res/layout/donate_opencollective.xml
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 77bf4560b..e8a7bc5ea 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -165,6 +165,8 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
public String liberapayID;
+ public String openCollective;
+
/**
* This matches {@code CurrentVersion} in build metadata files.
*
@@ -312,6 +314,9 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
case Cols.LIBERAPAY_ID:
liberapayID = cursor.getString(i);
break;
+ case Cols.OPEN_COLLECTIVE:
+ openCollective = cursor.getString(i);
+ break;
case Cols.AutoInstallApk.VERSION_NAME:
autoInstallVersionName = cursor.getString(i);
break;
@@ -991,6 +996,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
values.put(Cols.LITECOIN, litecoin);
values.put(Cols.FLATTR_ID, flattrID);
values.put(Cols.LIBERAPAY_ID, liberapayID);
+ values.put(Cols.OPEN_COLLECTIVE, openCollective);
values.put(Cols.ADDED, Utils.formatDate(added, ""));
values.put(Cols.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
values.put(Cols.PREFERRED_SIGNER, preferredSigner);
@@ -1104,6 +1110,12 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
return TextUtils.isEmpty(bitcoin) ? null : "litecoin:" + bitcoin;
}
+ @Nullable
+ public String getOpenCollectiveUri() {
+ return TextUtils.isEmpty(openCollective) ? null : "https://opencollective.com/"
+ + openCollective + "/donate/";
+ }
+
@Nullable
public String getFlattrUri() {
return TextUtils.isEmpty(flattrID) ? null : "https://flattr.com/thing/" + flattrID;
@@ -1220,6 +1232,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
dest.writeString(this.litecoin);
dest.writeString(this.flattrID);
dest.writeString(this.liberapayID);
+ dest.writeString(this.openCollective);
dest.writeString(this.preferredSigner);
dest.writeString(this.suggestedVersionName);
dest.writeInt(this.suggestedVersionCode);
@@ -1271,6 +1284,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
this.litecoin = in.readString();
this.flattrID = in.readString();
this.liberapayID = in.readString();
+ this.openCollective = in.readString();
this.preferredSigner = in.readString();
this.suggestedVersionName = in.readString();
this.suggestedVersionCode = in.readInt();
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index ec3cf3563..6c27dfd73 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -157,6 +157,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ AppMetadataTable.Cols.LITECOIN + " string,"
+ AppMetadataTable.Cols.FLATTR_ID + " string,"
+ AppMetadataTable.Cols.LIBERAPAY_ID + " string,"
+ + AppMetadataTable.Cols.OPEN_COLLECTIVE + " string,"
+ AppMetadataTable.Cols.REQUIREMENTS + " string,"
+ AppMetadataTable.Cols.ADDED + " string,"
+ AppMetadataTable.Cols.LAST_UPDATED + " string,"
@@ -227,7 +228,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ "primary key(" + ApkAntiFeatureJoinTable.Cols.APK_ID + ", " + ApkAntiFeatureJoinTable.Cols.ANTI_FEATURE_ID + ") "
+ " );";
- protected static final int DB_VERSION = 84;
+ protected static final int DB_VERSION = 85;
private final Context context;
@@ -457,6 +458,20 @@ public class DBHelper extends SQLiteOpenHelper {
addTranslation(db, oldVersion);
switchRepoArchivePriorities(db, oldVersion);
deleteOldIconUrls(db, oldVersion);
+ addOpenCollective(db, oldVersion);
+ }
+
+ private void addOpenCollective(SQLiteDatabase db, int oldVersion) {
+ if (oldVersion >= 85) {
+ return;
+ }
+
+ if (!columnExists(db, AppMetadataTable.NAME, AppMetadataTable.Cols.OPEN_COLLECTIVE)) {
+ Utils.debugLog(TAG, "Adding " + AppMetadataTable.Cols.OPEN_COLLECTIVE + " field to "
+ + AppMetadataTable.NAME + " table in db.");
+ db.execSQL("alter table " + AppMetadataTable.NAME + " add column "
+ + AppMetadataTable.Cols.OPEN_COLLECTIVE + " string;");
+ }
}
private void deleteOldIconUrls(SQLiteDatabase db, int oldVersion) {
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
index b11a4ff13..297cffed4 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
@@ -190,6 +190,7 @@ public interface Schema {
String LITECOIN = "litecoinAddr";
String FLATTR_ID = "flattrID";
String LIBERAPAY_ID = "liberapayID";
+ String OPEN_COLLECTIVE = "openCollective";
String PREFERRED_SIGNER = "preferredSigner";
String AUTO_INSTALL_VERSION_CODE = "suggestedVercode"; // name mismatch from issue #1063
String SUGGESTED_VERSION_NAME = "upstreamVersion"; // name mismatch from issue #1063
@@ -244,7 +245,7 @@ public interface Schema {
ROW_ID, PACKAGE_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
- SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
+ OPEN_COLLECTIVE, SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS,
@@ -261,7 +262,7 @@ public interface Schema {
_ID, ROW_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
- SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
+ OPEN_COLLECTIVE, SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS,
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 144035764..4cbf162b0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -796,6 +796,11 @@ public class AppDetailsRecyclerViewAdapter
addDonateOption(R.layout.donate_liberapay, app.getLiberapayUri());
}
+ // OpenCollective
+ if (uriIsSetAndCanBeOpened(app.getOpenCollectiveUri())) {
+ addDonateOption(R.layout.donate_opencollective, app.getOpenCollectiveUri());
+ }
+
// Bitcoin
if (uriIsSetAndCanBeOpened(app.getBitcoinUri())) {
addDonateOption(R.layout.donate_bitcoin, app.getBitcoinUri());
diff --git a/app/src/main/res/drawable/donation_option_opencollective.xml b/app/src/main/res/drawable/donation_option_opencollective.xml
new file mode 100644
index 000000000..78253aef3
--- /dev/null
+++ b/app/src/main/res/drawable/donation_option_opencollective.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="300dp"
+ android:height="50dp"
+ android:viewportWidth="300"
+ android:viewportHeight="50">
+ <path
+ android:pathData="M25.806,0.226L275.806,0.226A24,24 0,0 1,299.806 24.226L299.806,24.226A24,24 0,0 1,275.806 48.226L25.806,48.226A24,24 0,0 1,1.806 24.226L1.806,24.226A24,24 0,0 1,25.806 0.226z"
+ android:fillType="evenOdd">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="2.1030872"
+ android:startX="150.80646"
+ android:endY="48.225807"
+ android:endX="150.80646"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF7ACFFF"/>
+ <item android:offset="1" android:color="#FF4CBEFF"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M275.806,24.226m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
+ android:fillColor="#ffffff"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627zM283.78,12.717 L280.153,16.345C278.863,15.631 277.383,15.226 275.806,15.226c-4.97,0 -9,4.03 -9,9 0,4.97 4.03,9 9,9 1.577,0 3.058,-0.405 4.347,-1.118l3.627,3.627C281.516,37.306 278.77,38.226 275.806,38.226 268.074,38.226 261.806,31.958 261.806,24.226 261.806,16.494 268.074,10.226 275.806,10.226c2.963,0 5.71,0.92 7.974,2.49z"
+ android:fillColor="#3faff0"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M287.316,16.252C288.886,18.516 289.806,21.262 289.806,24.226c0,2.963 -0.92,5.71 -2.49,7.974L283.688,28.573C284.401,27.283 284.806,25.803 284.806,24.226 284.806,22.649 284.401,21.168 283.688,19.879l3.627,-3.627z"
+ android:fillColor="#b8d5e6"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/donate_opencollective.xml b/app/src/main/res/layout/donate_opencollective.xml
new file mode 100644
index 000000000..65f519f8f
--- /dev/null
+++ b/app/src/main/res/layout/donate_opencollective.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="80dp"
+ android:layout_height="28dp"
+ android:layout_marginEnd="12dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginStart="12dp"
+ android:contentDescription="@string/menu_opencollective"
+ android:src="@drawable/donation_option_opencollective" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37ea6d9dd..183ac612c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,6 +234,8 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="menu_flattr">Flattr</string>
<!-- This is a brand name, it should only be translated if the company does so -->
<string name="menu_liberapay">Liberapay</string>
+ <!-- This is a brand name, it should only be translated if the company does so -->
+ <string name="menu_opencollective">OpenCollective</string>
<!-- The bottom bar button label -->
<string name="main_menu__latest_apps">Latest</string>
<!-- The bottom bar button label -->
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
index b8b95133e..1c9a469c0 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
@@ -329,6 +329,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
"license",
"litecoin",
"name",
+ "openCollective",
"packageName",
"phoneScreenshots",
"promoGraphic",
diff --git a/app/src/test/resources/guardianproject_index-v1.json b/app/src/test/resources/guardianproject_index-v1.json
index ee3884dfa..42a42d5f3 100644
--- a/app/src/test/resources/guardianproject_index-v1.json
+++ b/app/src/test/resources/guardianproject_index-v1.json
@@ -49,6 +49,7 @@
"issueTracker": "https://dev.guardianproject.info/projects/informacam/issues",
"license": "GPLv3",
"name": "CameraV",
+ "openCollective": "GuardianProject",
"sourceCode": "https://github.com/guardianproject/CameraV",
"summary": "An InformaCam app to generate verifiable media",
"webSite": "https://guardianproject.info/apps/camerav/",
From 23bd3b81dd1d809cd48143d744f8dfe144acf783 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 16 Jun 2020 10:12:24 +0200
Subject: [PATCH 3/6] support new Liberapay: field, with migration support for
LiberapayID:
Liberapay was originally included using a numeric ID, since they had not yet
finalized the public URLs. Now it is a username. So this logic prefers
the username in Liberapay: field, and uses the old LiberapayID: as a
fallback. LiberapayID: will not override Liberapay: if it is already set.
This reuses the old database key since it is stored and processed as a
String anyway.
---
.../main/java/org/fdroid/fdroid/data/App.java | 37 ++++++++++++++-----
.../java/org/fdroid/fdroid/data/DBHelper.java | 8 ++--
.../fdroid/fdroid/data/RepoXMLHandler.java | 2 +-
.../java/org/fdroid/fdroid/data/Schema.java | 6 +--
.../fdroid/updater/IndexV1UpdaterTest.java | 15 +++++++-
.../resources/guardianproject_index-v1.json | 3 ++
6 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index e8a7bc5ea..ee0d0d5a7 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -163,7 +163,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
public String flattrID;
- public String liberapayID;
+ public String liberapay;
public String openCollective;
@@ -311,8 +311,8 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
case Cols.FLATTR_ID:
flattrID = cursor.getString(i);
break;
- case Cols.LIBERAPAY_ID:
- liberapayID = cursor.getString(i);
+ case Cols.LIBERAPAY:
+ liberapay = cursor.getString(i);
break;
case Cols.OPEN_COLLECTIVE:
openCollective = cursor.getString(i);
@@ -450,6 +450,25 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
}
}
+ /**
+ * {@link #liberapay} was originally included using a numeric ID, now it is a
+ * username. This should not override {@link #liberapay} if that is already set.
+ */
+ @JsonProperty("liberapayID")
+ void setLiberapayID(String liberapayId) { // NOPMD
+ if (TextUtils.isEmpty(liberapayId) || !TextUtils.isEmpty(liberapay)) {
+ return;
+ }
+ try {
+ int id = Integer.parseInt(liberapayId);
+ if (id > 0) {
+ liberapay = "~" + liberapayId;
+ }
+ } catch (NumberFormatException e) {
+ // ignored
+ }
+ }
+
/**
* Parses the {@code localized} block in the incoming index metadata,
* choosing the best match in terms of locale/language while filling as
@@ -672,10 +691,10 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
public String getIconUrl(Context context) {
Repo repo = RepoProvider.Helper.findById(context, repoId);
if (TextUtils.isEmpty(iconUrl)) {
- if (TextUtils.isEmpty(iconFromApk)){
+ if (TextUtils.isEmpty(iconFromApk)) {
return null;
}
- if (iconFromApk.endsWith(".xml")){
+ if (iconFromApk.endsWith(".xml")) {
// We cannot use xml ressources as icons. F-Droid server should not include them
// https://gitlab.com/fdroid/fdroidserver/issues/344
return null;
@@ -995,7 +1014,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
values.put(Cols.BITCOIN, bitcoin);
values.put(Cols.LITECOIN, litecoin);
values.put(Cols.FLATTR_ID, flattrID);
- values.put(Cols.LIBERAPAY_ID, liberapayID);
+ values.put(Cols.LIBERAPAY, liberapay);
values.put(Cols.OPEN_COLLECTIVE, openCollective);
values.put(Cols.ADDED, Utils.formatDate(added, ""));
values.put(Cols.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
@@ -1123,7 +1142,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
@Nullable
public String getLiberapayUri() {
- return TextUtils.isEmpty(liberapayID) ? null : "https://liberapay.com/~" + liberapayID;
+ return TextUtils.isEmpty(liberapay) ? null : "https://liberapay.com/" + liberapay;
}
@@ -1231,7 +1250,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
dest.writeString(this.bitcoin);
dest.writeString(this.litecoin);
dest.writeString(this.flattrID);
- dest.writeString(this.liberapayID);
+ dest.writeString(this.liberapay);
dest.writeString(this.openCollective);
dest.writeString(this.preferredSigner);
dest.writeString(this.suggestedVersionName);
@@ -1283,7 +1302,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
this.bitcoin = in.readString();
this.litecoin = in.readString();
this.flattrID = in.readString();
- this.liberapayID = in.readString();
+ this.liberapay = in.readString();
this.openCollective = in.readString();
this.preferredSigner = in.readString();
this.suggestedVersionName = in.readString();
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index 6c27dfd73..c5c4dce03 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -156,7 +156,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ AppMetadataTable.Cols.BITCOIN + " string,"
+ AppMetadataTable.Cols.LITECOIN + " string,"
+ AppMetadataTable.Cols.FLATTR_ID + " string,"
- + AppMetadataTable.Cols.LIBERAPAY_ID + " string,"
+ + AppMetadataTable.Cols.LIBERAPAY + " string,"
+ AppMetadataTable.Cols.OPEN_COLLECTIVE + " string,"
+ AppMetadataTable.Cols.REQUIREMENTS + " string,"
+ AppMetadataTable.Cols.ADDED + " string,"
@@ -573,11 +573,11 @@ public class DBHelper extends SQLiteOpenHelper {
return;
}
- if (!columnExists(db, AppMetadataTable.NAME, AppMetadataTable.Cols.LIBERAPAY_ID)) {
- Utils.debugLog(TAG, "Adding " + AppMetadataTable.Cols.LIBERAPAY_ID + " field to "
+ if (!columnExists(db, AppMetadataTable.NAME, AppMetadataTable.Cols.LIBERAPAY)) {
+ Utils.debugLog(TAG, "Adding " + AppMetadataTable.Cols.LIBERAPAY + " field to "
+ AppMetadataTable.NAME + " table in db.");
db.execSQL("alter table " + AppMetadataTable.NAME + " add column "
- + AppMetadataTable.Cols.LIBERAPAY_ID + " string;");
+ + AppMetadataTable.Cols.LIBERAPAY + " string;");
}
}
diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
index 1110a2412..1a04961f9 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
@@ -257,7 +257,7 @@ public class RepoXMLHandler extends DefaultHandler {
curapp.flattrID = str;
break;
case "liberapay":
- curapp.liberapayID = str;
+ curapp.liberapay = str;
break;
case "web":
curapp.webSite = str;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
index 297cffed4..e3a6d3e0b 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
@@ -189,7 +189,7 @@ public interface Schema {
String BITCOIN = "bitcoinAddr";
String LITECOIN = "litecoinAddr";
String FLATTR_ID = "flattrID";
- String LIBERAPAY_ID = "liberapayID";
+ String LIBERAPAY = "liberapayID";
String OPEN_COLLECTIVE = "openCollective";
String PREFERRED_SIGNER = "preferredSigner";
String AUTO_INSTALL_VERSION_CODE = "suggestedVercode"; // name mismatch from issue #1063
@@ -244,7 +244,7 @@ public interface Schema {
String[] ALL_COLS = {
ROW_ID, PACKAGE_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
- TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
+ TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY,
OPEN_COLLECTIVE, SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
@@ -261,7 +261,7 @@ public interface Schema {
String[] ALL = {
_ID, ROW_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
- TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
+ TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY,
OPEN_COLLECTIVE, SUGGESTED_VERSION_NAME, SUGGESTED_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
index 1c9a469c0..b7a29f4c2 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
@@ -151,7 +151,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
Schema.AppMetadataTable.Cols.REPO_ID,
Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME});
assertEquals("localized icon takes precedence", TESTY_CANONICAL_URL + "/"
- + app.packageName + "/en-US/icon.png", app.getIconUrl(context));
+ + app.packageName + "/en-US/icon.png", app.getIconUrl(context));
}
@Test(expected = IndexUpdater.SigningException.class)
@@ -266,6 +266,17 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
}
parser.close(); // ensure resources get cleaned up timely and properly
+ // test LiberapayID: -> Liberapay: migration
+ for (App app : apps) {
+ if ("org.witness.informacam.app".equals(app.packageName)) {
+ assertEquals("GuardianProject", app.liberapay);
+ } else if ("info.guardianproject.cacert".equals(app.packageName)) {
+ assertEquals("~1337", app.liberapay);
+ } else {
+ assertNull(app.liberapay);
+ }
+ }
+
RepoDetails indexV0Details = getFromFile("guardianproject_index.xml",
Repo.PUSH_REQUEST_ACCEPT_ALWAYS);
indexV0Details.apps.size();
@@ -325,7 +336,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
"iconUrl",
"issueTracker",
"lastUpdated",
- "liberapayID",
+ "liberapay",
"license",
"litecoin",
"name",
diff --git a/app/src/test/resources/guardianproject_index-v1.json b/app/src/test/resources/guardianproject_index-v1.json
index 42a42d5f3..d3b92825e 100644
--- a/app/src/test/resources/guardianproject_index-v1.json
+++ b/app/src/test/resources/guardianproject_index-v1.json
@@ -28,6 +28,7 @@
"suggestedVersionCode": "999999999",
"description": "<p>Android 4+ allows you to disable certificates from the system Settings and root isn't required, so try that first if you want to manually mess with the certificates. The app won't work with Android 4+ anyway.</p><p>An app to manage security certificates on your phone also containing a version of the Android CACert keystore derived from Mozilla. If a certificate has recently become untrusted you can either install an update to this app or you can backup and remove certificates by yourself.</p><p>Requires root: Yes, it writes to the system partition. You will need a device that has the \u2018grep\u2019 command on it (via busybox: present on most custom ROMs). If the \u2018save\u2019 doesn\u2019t work, then you will need to make your /system partition read-write by using a file explorer like <a href=\"fdroid.app:com.ghostsq.commander\">Ghost Commander</a> or via a command in <a href=\"fdroid.app:jackpal.androidterm\">Terminal Emulator</a>.</p>",
"issueTracker": "https://github.com/guardianproject/cacert/issues",
+ "liberapayID": "1337",
"license": "GPLv3",
"name": "CACertMan",
"sourceCode": "https://github.com/guardianproject/cacert",
@@ -47,6 +48,8 @@
"suggestedVersionCode": "9999999",
"description": "<p>An InformaCam app to generate verifiable media.</p>",
"issueTracker": "https://dev.guardianproject.info/projects/informacam/issues",
+ "liberapay": "GuardianProject",
+ "liberapayID": "27859",
"license": "GPLv3",
"name": "CameraV",
"openCollective": "GuardianProject",
From c9178d1a08ad3d384474bb4de511fa0a3607ba72 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 16 Jun 2020 10:59:34 +0200
Subject: [PATCH 4/6] switch donate layout grid from 3 to 2 columns to handle
longer URLs
---
app/src/main/res/layout/app_details2_donate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/app_details2_donate.xml b/app/src/main/res/layout/app_details2_donate.xml
index 2472fc32f..8acab7409 100644
--- a/app/src/main/res/layout/app_details2_donate.xml
+++ b/app/src/main/res/layout/app_details2_donate.xml
@@ -29,7 +29,7 @@
android:id="@+id/donation_options"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:columnCount="3" />
+ app:columnCount="2" />
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
From 770d80340b81148e7e11325a44c01c4745c4786c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 25 Jun 2020 08:58:32 +0200
Subject: [PATCH 5/6] run Ctrl-Alt-L code formatter on DBHelper
---
.../main/java/org/fdroid/fdroid/data/DBHelper.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index c5c4dce03..ca30208d2 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -30,7 +30,6 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.text.TextUtils;
import android.util.Log;
-
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
@@ -479,7 +478,7 @@ public class DBHelper extends SQLiteOpenHelper {
return;
}
Utils.debugLog(TAG, "Clearing iconUrl field to enable localized icons on next update");
- db.execSQL("UPDATE " + AppMetadataTable.NAME + " SET " + AppMetadataTable.Cols.ICON_URL + "= NULL");
+ db.execSQL("UPDATE " + AppMetadataTable.NAME + " SET " + AppMetadataTable.Cols.ICON_URL + "= NULL");
}
private void switchRepoArchivePriorities(SQLiteDatabase db, int oldVersion) {
@@ -490,9 +489,9 @@ public class DBHelper extends SQLiteOpenHelper {
db.execSQL("UPDATE " + RepoTable.NAME + " SET " + RepoTable.Cols.PRIORITY
+ "= ( SELECT SUM(" + RepoTable.Cols.PRIORITY + ")" + " FROM " + RepoTable.NAME
- + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://f-droid.org/repo', 'https://f-droid.org/archive')"
+ + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://f-droid.org/repo', 'https://f-droid.org/archive')"
+ ") - " + RepoTable.Cols.PRIORITY
- + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://f-droid.org/repo', 'https://f-droid.org/archive')"
+ + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://f-droid.org/repo', 'https://f-droid.org/archive')"
+ " AND 'TRUE' IN (SELECT CASE WHEN a." + RepoTable.Cols.PRIORITY + " = b."
+ RepoTable.Cols.PRIORITY + "-1" + " THEN 'TRUE' ELSE 'FASLE' END"
+ " FROM " + RepoTable.NAME + " AS a INNER JOIN " + RepoTable.NAME
@@ -503,9 +502,9 @@ public class DBHelper extends SQLiteOpenHelper {
db.execSQL("UPDATE " + RepoTable.NAME + " SET " + RepoTable.Cols.PRIORITY
+ "= ( SELECT SUM(" + RepoTable.Cols.PRIORITY + ")" + " FROM " + RepoTable.NAME
- + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://guardianproject.info/fdroid/repo', 'https://guardianproject.info/fdroid/archive')"
+ + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://guardianproject.info/fdroid/repo', 'https://guardianproject.info/fdroid/archive')"
+ ") - " + RepoTable.Cols.PRIORITY
- + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://guardianproject.info/fdroid/repo', 'https://guardianproject.info/fdroid/archive')"
+ + " WHERE " + RepoTable.Cols.ADDRESS + " IN ( 'https://guardianproject.info/fdroid/repo', 'https://guardianproject.info/fdroid/archive')"
+ " AND 'TRUE' IN (SELECT CASE WHEN a." + RepoTable.Cols.PRIORITY + " = b."
+ RepoTable.Cols.PRIORITY + "-1" + " THEN 'TRUE' ELSE 'FASLE' END"
+ " FROM " + RepoTable.NAME + " AS a INNER JOIN " + RepoTable.NAME + " AS b ON a."
From 5c0ffea1ef16d817b1627da6047bf883ddad46e0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 25 Jun 2020 10:20:12 +0200
Subject: [PATCH 6/6] fix checkstyle from !817 !818
---
app/src/main/java/org/fdroid/fdroid/Utils.java | 3 ++-
.../fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java | 1 -
.../org/fdroid/fdroid/views/apps/AppListItemController.java | 4 ----
.../fdroid/fdroid/views/categories/AppCardController.java | 1 -
.../test/java/org/fdroid/fdroid/updater/AppIconsTest.java | 6 +++---
.../java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java | 3 ++-
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 431ae7a13..359f9556e 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -505,7 +505,8 @@ public final class Utils {
: null);
}
} else {
- ImageLoader.getInstance().displayImage(app.getIconUrl(iv.getContext()), iv, Utils.getRepoAppDisplayImageOptions());
+ ImageLoader.getInstance().displayImage(
+ app.getIconUrl(iv.getContext()), iv, Utils.getRepoAppDisplayImageOptions());
}
}
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 4cbf162b0..70aa50289 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -40,7 +40,6 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import com.nostra13.universalimageloader.core.ImageLoader;
import org.apache.commons.io.FilenameUtils;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
index ac7b62a25..87123287a 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
@@ -7,7 +7,6 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.graphics.Outline;
import android.net.Uri;
import android.os.Build;
@@ -28,11 +27,8 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
import org.fdroid.fdroid.AppUpdateStatusManager;
import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus;
-import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
index 00639e6fd..4a99c238d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
@@ -13,7 +13,6 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
-import com.nostra13.universalimageloader.core.ImageLoader;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.App;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
index ccf850ecf..aa6e776ce 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
@@ -1,7 +1,6 @@
package org.fdroid.fdroid.updater;
import android.content.ContentValues;
-
import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.IndexUpdater;
import org.fdroid.fdroid.data.App;
@@ -16,7 +15,7 @@ import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThat;
/**
* Check whether app icons are loaded from the correct repository. The repository with the
@@ -71,7 +70,8 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
"org.adaway", new String[]{
Schema.AppMetadataTable.Cols.ICON_URL,
Schema.AppMetadataTable.Cols.ICON,
- Schema.AppMetadataTable.Cols.REPO_ID});
+ Schema.AppMetadataTable.Cols.REPO_ID,
+ });
assertThat(app.getIconUrl(context), MatchesPattern.matchesPattern(expectedUrl));
}
}
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
index b7a29f4c2..9a04510aa 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
@@ -149,7 +149,8 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
Schema.AppMetadataTable.Cols.ICON_URL,
Schema.AppMetadataTable.Cols.ICON,
Schema.AppMetadataTable.Cols.REPO_ID,
- Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME});
+ Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME,
+ });
assertEquals("localized icon takes precedence", TESTY_CANONICAL_URL + "/"
+ app.packageName + "/en-US/icon.png", app.getIconUrl(context));
}