Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Dogecoin donation support

Browse Source 
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.
This commit is contained in:
Daniel Martí 2015-09-18 19:09:40 -07:00
parent f65dcdd66f
commit 735ac0eb3d
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -1209,13 +1209,6 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
else else
tv.setVisibility(View.GONE); 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 // Flattr
tv = (TextView) view.findViewById(R.id.flattr); tv = (TextView) view.findViewById(R.id.flattr);
if (!TextUtils.isEmpty(getApp().flattrID)) if (!TextUtils.isEmpty(getApp().flattrID))
@ -1306,9 +1299,6 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
case R.id.litecoin: case R.id.litecoin:
url = "litecoin:" + getApp().litecoinAddr; url = "litecoin:" + getApp().litecoinAddr;
break; break;
case R.id.dogecoin:
url = "dogecoin:" + getApp().dogecoinAddr;
break;
case R.id.flattr: case R.id.flattr:
url = "https://flattr.com/thing/" + getApp().flattrID; url = "https://flattr.com/thing/" + getApp().flattrID;
break; break;

3
F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -196,9 +196,6 @@ public class RepoXMLHandler extends DefaultHandler {
case "litecoin": case "litecoin":
curapp.litecoinAddr = str; curapp.litecoinAddr = str;
break; break;
case "dogecoin":
curapp.dogecoinAddr = str;
break;
case "flattr": case "flattr":
curapp.flattrID = str; curapp.flattrID = str;
break; break;

6
F-Droid/src/org/fdroid/fdroid/data/App.java
View File

@ -54,8 +54,6 @@ public class App extends ValueObject implements Comparable<App> {
public String litecoinAddr; public String litecoinAddr;
public String dogecoinAddr;
public String flattrID; public String flattrID;
public String upstreamVersion; public String upstreamVersion;
@ -163,9 +161,6 @@ public class App extends ValueObject implements Comparable<App> {
case AppProvider.DataColumns.LITECOIN_ADDR: case AppProvider.DataColumns.LITECOIN_ADDR:
litecoinAddr = cursor.getString(i); litecoinAddr = cursor.getString(i);
break; break;
case AppProvider.DataColumns.DOGECOIN_ADDR:
dogecoinAddr = cursor.getString(i);
break;
case AppProvider.DataColumns.FLATTR_ID: case AppProvider.DataColumns.FLATTR_ID:
flattrID = cursor.getString(i); flattrID = cursor.getString(i);
break; break;
@ -384,7 +379,6 @@ public class App extends ValueObject implements Comparable<App> {
values.put(AppProvider.DataColumns.DONATE_URL, donateURL); values.put(AppProvider.DataColumns.DONATE_URL, donateURL);
values.put(AppProvider.DataColumns.BITCOIN_ADDR, bitcoinAddr); values.put(AppProvider.DataColumns.BITCOIN_ADDR, bitcoinAddr);
values.put(AppProvider.DataColumns.LITECOIN_ADDR, litecoinAddr); 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.FLATTR_ID, flattrID);
values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, "")); values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, ""));
values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, "")); values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));

3
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -188,7 +188,6 @@ public class AppProvider extends FDroidProvider {
String DONATE_URL = "donateURL"; String DONATE_URL = "donateURL";
String BITCOIN_ADDR = "bitcoinAddr"; String BITCOIN_ADDR = "bitcoinAddr";
String LITECOIN_ADDR = "litecoinAddr"; String LITECOIN_ADDR = "litecoinAddr";
String DOGECOIN_ADDR = "dogecoinAddr";
String FLATTR_ID = "flattrID"; String FLATTR_ID = "flattrID";
String SUGGESTED_VERSION_CODE = "suggestedVercode"; String SUGGESTED_VERSION_CODE = "suggestedVercode";
String UPSTREAM_VERSION = "upstreamVersion"; String UPSTREAM_VERSION = "upstreamVersion";
@ -215,7 +214,7 @@ public class AppProvider extends FDroidProvider {
String[] ALL = { String[] ALL = {
_ID, IS_COMPATIBLE, APP_ID, NAME, SUMMARY, ICON, DESCRIPTION, _ID, IS_COMPATIBLE, APP_ID, NAME, SUMMARY, ICON, DESCRIPTION,
LICENSE, WEB_URL, TRACKER_URL, SOURCE_URL, CHANGELOG_URL, DONATE_URL, 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, UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES, CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES,
IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE, IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE,

1
F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
View File

@ -79,7 +79,6 @@ public class DBHelper extends SQLiteOpenHelper {
+ "donateURL string," + "donateURL string,"
+ "bitcoinAddr string," + "bitcoinAddr string,"
+ "litecoinAddr string," + "litecoinAddr string,"
+ "dogecoinAddr string,"
+ "flattrID string," + "flattrID string,"
+ "requirements string," + "requirements string,"
+ "categories string," + "categories string,"