From 735ac0eb3da77ac229d70130897d69aa3536eb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 18 Sep 2015 19:09:40 -0700
Subject: [PATCH] Remove Dogecoin donation support

Analogous to the server commit that removes it on its side. If an index
includes it, we will fail silently since unrecognised tags are ignored.

SQLite doesn't allow deleting columns, so don't do a DB version bump to try to
remove it. It will be gone on new installs, and it doesn't keep current
installs from working. Tested both cases.
---
 F-Droid/src/org/fdroid/fdroid/AppDetails.java       | 10 ----------
 F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java   |  3 ---
 F-Droid/src/org/fdroid/fdroid/data/App.java         |  6 ------
 F-Droid/src/org/fdroid/fdroid/data/AppProvider.java |  3 +--
 F-Droid/src/org/fdroid/fdroid/data/DBHelper.java    |  1 -
 5 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 53150b259..6bcc0eca8 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -1209,13 +1209,6 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
             else
                 tv.setVisibility(View.GONE);
 
-            // Dogecoin
-            tv = (TextView) view.findViewById(R.id.dogecoin);
-            if (!TextUtils.isEmpty(getApp().dogecoinAddr))
-                tv.setOnClickListener(mOnClickListener);
-            else
-                tv.setVisibility(View.GONE);
-
             // Flattr
             tv = (TextView) view.findViewById(R.id.flattr);
             if (!TextUtils.isEmpty(getApp().flattrID))
@@ -1306,9 +1299,6 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                     case R.id.litecoin:
                         url = "litecoin:" + getApp().litecoinAddr;
                         break;
-                    case R.id.dogecoin:
-                        url = "dogecoin:" + getApp().dogecoinAddr;
-                        break;
                     case R.id.flattr:
                         url = "https://flattr.com/thing/" + getApp().flattrID;
                         break;
diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
index 35b81db2d..88798a5b4 100644
--- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -196,9 +196,6 @@ public class RepoXMLHandler extends DefaultHandler {
             case "litecoin":
                 curapp.litecoinAddr = str;
                 break;
-            case "dogecoin":
-                curapp.dogecoinAddr = str;
-                break;
             case "flattr":
                 curapp.flattrID = str;
                 break;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index dd85d9443..d97d42fdc 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -54,8 +54,6 @@ public class App extends ValueObject implements Comparable<App> {
 
     public String litecoinAddr;
 
-    public String dogecoinAddr;
-
     public String flattrID;
 
     public String upstreamVersion;
@@ -163,9 +161,6 @@ public class App extends ValueObject implements Comparable<App> {
             case AppProvider.DataColumns.LITECOIN_ADDR:
                 litecoinAddr = cursor.getString(i);
                 break;
-            case AppProvider.DataColumns.DOGECOIN_ADDR:
-                dogecoinAddr = cursor.getString(i);
-                break;
             case AppProvider.DataColumns.FLATTR_ID:
                 flattrID = cursor.getString(i);
                 break;
@@ -384,7 +379,6 @@ public class App extends ValueObject implements Comparable<App> {
         values.put(AppProvider.DataColumns.DONATE_URL, donateURL);
         values.put(AppProvider.DataColumns.BITCOIN_ADDR, bitcoinAddr);
         values.put(AppProvider.DataColumns.LITECOIN_ADDR, litecoinAddr);
-        values.put(AppProvider.DataColumns.DOGECOIN_ADDR, dogecoinAddr);
         values.put(AppProvider.DataColumns.FLATTR_ID, flattrID);
         values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, ""));
         values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index c87e832ec..51be88859 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -188,7 +188,6 @@ public class AppProvider extends FDroidProvider {
         String DONATE_URL = "donateURL";
         String BITCOIN_ADDR = "bitcoinAddr";
         String LITECOIN_ADDR = "litecoinAddr";
-        String DOGECOIN_ADDR = "dogecoinAddr";
         String FLATTR_ID = "flattrID";
         String SUGGESTED_VERSION_CODE = "suggestedVercode";
         String UPSTREAM_VERSION = "upstreamVersion";
@@ -215,7 +214,7 @@ public class AppProvider extends FDroidProvider {
         String[] ALL = {
                 _ID, IS_COMPATIBLE, APP_ID, NAME, SUMMARY, ICON, DESCRIPTION,
                 LICENSE, WEB_URL, TRACKER_URL, SOURCE_URL, CHANGELOG_URL, DONATE_URL,
-                BITCOIN_ADDR, LITECOIN_ADDR, DOGECOIN_ADDR, FLATTR_ID,
+                BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID,
                 UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
                 CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES,
                 IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE,
diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
index ca0b66550..473f70f09 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
@@ -79,7 +79,6 @@ public class DBHelper extends SQLiteOpenHelper {
             + "donateURL string,"
             + "bitcoinAddr string,"
             + "litecoinAddr string,"
-            + "dogecoinAddr string,"
             + "flattrID string,"
             + "requirements string,"
             + "categories string,"