diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index b9dad3662..2bfb33635 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -1090,23 +1090,23 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
boolean finished = false;
switch (event.type) {
- case Downloader.EVENT_PROGRESS:
- updateProgressDialog(event.progress, event.total);
- break;
- case ApkDownloader.EVENT_ERROR:
- final String text;
- if (event.getData().getInt(ApkDownloader.EVENT_DATA_ERROR_TYPE) == ApkDownloader.ERROR_HASH_MISMATCH)
- text = getString(R.string.corrupt_download);
- else
- text = getString(R.string.details_notinstalled);
- // this must be on the main UI thread
- Toast.makeText(this, text, Toast.LENGTH_LONG).show();
- finished = true;
- break;
- case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
- downloadCompleteInstallApk();
- finished = true;
- break;
+ case Downloader.EVENT_PROGRESS:
+ updateProgressDialog(event.progress, event.total);
+ break;
+ case ApkDownloader.EVENT_ERROR:
+ final String text;
+ if (event.getData().getInt(ApkDownloader.EVENT_DATA_ERROR_TYPE) == ApkDownloader.ERROR_HASH_MISMATCH)
+ text = getString(R.string.corrupt_download);
+ else
+ text = getString(R.string.details_notinstalled);
+ // this must be on the main UI thread
+ Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+ finished = true;
+ break;
+ case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
+ downloadCompleteInstallApk();
+ finished = true;
+ break;
}
if (finished) {
@@ -1281,18 +1281,18 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
private String descAntiFeature(String af) {
switch (af) {
- case "Ads":
- return getString(R.string.antiadslist);
- case "Tracking":
- return getString(R.string.antitracklist);
- case "NonFreeNet":
- return getString(R.string.antinonfreenetlist);
- case "NonFreeAdd":
- return getString(R.string.antinonfreeadlist);
- case "NonFreeDep":
- return getString(R.string.antinonfreedeplist);
- case "UpstreamNonFree":
- return getString(R.string.antiupstreamnonfreelist);
+ case "Ads":
+ return getString(R.string.antiadslist);
+ case "Tracking":
+ return getString(R.string.antitracklist);
+ case "NonFreeNet":
+ return getString(R.string.antinonfreenetlist);
+ case "NonFreeAdd":
+ return getString(R.string.antinonfreeadlist);
+ case "NonFreeDep":
+ return getString(R.string.antinonfreedeplist);
+ case "UpstreamNonFree":
+ return getString(R.string.antiupstreamnonfreelist);
}
return null;
}
diff --git a/F-Droid/src/org/fdroid/fdroid/Preferences.java b/F-Droid/src/org/fdroid/fdroid/Preferences.java
index a1cb6407a..a1099113a 100644
--- a/F-Droid/src/org/fdroid/fdroid/Preferences.java
+++ b/F-Droid/src/org/fdroid/fdroid/Preferences.java
@@ -227,36 +227,36 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
uninitialize(key);
switch (key) {
- case PREF_COMPACT_LAYOUT:
- for (ChangeListener listener : compactLayoutListeners) {
- listener.onPreferenceChange();
- }
- break;
- case PREF_ROOTED:
- for (ChangeListener listener : filterAppsRequiringRootListeners) {
- listener.onPreferenceChange();
- }
- break;
- case PREF_UPD_HISTORY:
- for (ChangeListener listener : updateHistoryListeners) {
- listener.onPreferenceChange();
- }
- break;
- case PREF_LOCAL_REPO_BONJOUR:
- for (ChangeListener listener : localRepoBonjourListeners) {
- listener.onPreferenceChange();
- }
- break;
- case PREF_LOCAL_REPO_NAME:
- for (ChangeListener listener : localRepoNameListeners) {
- listener.onPreferenceChange();
- }
- break;
- case PREF_LOCAL_REPO_HTTPS:
- for (ChangeListener listener : localRepoHttpsListeners) {
- listener.onPreferenceChange();
- }
- break;
+ case PREF_COMPACT_LAYOUT:
+ for (ChangeListener listener : compactLayoutListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
+ case PREF_ROOTED:
+ for (ChangeListener listener : filterAppsRequiringRootListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
+ case PREF_UPD_HISTORY:
+ for (ChangeListener listener : updateHistoryListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
+ case PREF_LOCAL_REPO_BONJOUR:
+ for (ChangeListener listener : localRepoBonjourListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
+ case PREF_LOCAL_REPO_NAME:
+ for (ChangeListener listener : localRepoNameListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
+ case PREF_LOCAL_REPO_HTTPS:
+ for (ChangeListener listener : localRepoHttpsListeners) {
+ listener.onPreferenceChange();
+ }
+ break;
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
index c213fa7af..bb10632e7 100644
--- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -125,158 +125,158 @@ public class RepoXMLHandler extends DefaultHandler {
curapk = null;
} else if (curapk != null && str != null) {
switch (curel) {
- case "version":
- curapk.version = str;
- break;
- case "versioncode":
- try {
- curapk.vercode = Integer.parseInt(str);
- } catch (NumberFormatException ex) {
- curapk.vercode = -1;
- }
- break;
- case "size":
- try {
- curapk.size = Integer.parseInt(str);
- } catch (NumberFormatException ex) {
- curapk.size = 0;
- }
- break;
- case "hash":
- if (hashType == null || hashType.equals("md5")) {
- if (curapk.hash == null) {
- curapk.hash = str;
- curapk.hashType = "MD5";
- }
- } else if (hashType.equals("sha256")) {
+ case "version":
+ curapk.version = str;
+ break;
+ case "versioncode":
+ try {
+ curapk.vercode = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ curapk.vercode = -1;
+ }
+ break;
+ case "size":
+ try {
+ curapk.size = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ curapk.size = 0;
+ }
+ break;
+ case "hash":
+ if (hashType == null || hashType.equals("md5")) {
+ if (curapk.hash == null) {
curapk.hash = str;
- curapk.hashType = "SHA-256";
+ curapk.hashType = "MD5";
}
- break;
- case "sig":
- curapk.sig = str;
- break;
- case "srcname":
- curapk.srcname = str;
- break;
- case "apkname":
- curapk.apkName = str;
- break;
- case "sdkver":
- try {
- curapk.minSdkVersion = Integer.parseInt(str);
- } catch (NumberFormatException ex) {
- curapk.minSdkVersion = 0;
- }
- break;
- case "maxsdkver":
- try {
- curapk.maxSdkVersion = Integer.parseInt(str);
- } catch (NumberFormatException ex) {
- curapk.maxSdkVersion = 0;
- }
- break;
- case "added":
- try {
- curapk.added = str.length() == 0 ? null : Utils.DATE_FORMAT
- .parse(str);
- } catch (ParseException e) {
- curapk.added = null;
- }
- break;
- case "permissions":
- curapk.permissions = Utils.CommaSeparatedList.make(str);
- break;
- case "features":
- curapk.features = Utils.CommaSeparatedList.make(str);
- break;
- case "nativecode":
- curapk.nativecode = Utils.CommaSeparatedList.make(str);
- break;
+ } else if (hashType.equals("sha256")) {
+ curapk.hash = str;
+ curapk.hashType = "SHA-256";
+ }
+ break;
+ case "sig":
+ curapk.sig = str;
+ break;
+ case "srcname":
+ curapk.srcname = str;
+ break;
+ case "apkname":
+ curapk.apkName = str;
+ break;
+ case "sdkver":
+ try {
+ curapk.minSdkVersion = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ curapk.minSdkVersion = 0;
+ }
+ break;
+ case "maxsdkver":
+ try {
+ curapk.maxSdkVersion = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ curapk.maxSdkVersion = 0;
+ }
+ break;
+ case "added":
+ try {
+ curapk.added = str.length() == 0 ? null : Utils.DATE_FORMAT
+ .parse(str);
+ } catch (ParseException e) {
+ curapk.added = null;
+ }
+ break;
+ case "permissions":
+ curapk.permissions = Utils.CommaSeparatedList.make(str);
+ break;
+ case "features":
+ curapk.features = Utils.CommaSeparatedList.make(str);
+ break;
+ case "nativecode":
+ curapk.nativecode = Utils.CommaSeparatedList.make(str);
+ break;
}
} else if (curapp != null && str != null) {
switch (curel) {
- case "name":
- curapp.name = str;
- break;
- case "icon":
- curapp.icon = str;
- break;
- case "description":
- // This is the old-style description. We'll read it
- // if present, to support old repos, but in newer
- // repos it will get overwritten straight away!
- curapp.description = "" + str + "
";
- break;
- case "desc":
- // New-style description.
- curapp.description = str;
- break;
- case "summary":
- curapp.summary = str;
- break;
- case "license":
- curapp.license = str;
- break;
- case "source":
- curapp.sourceURL = str;
- break;
- case "donate":
- curapp.donateURL = str;
- break;
- case "bitcoin":
- curapp.bitcoinAddr = str;
- break;
- case "litecoin":
- curapp.litecoinAddr = str;
- break;
- case "dogecoin":
- curapp.dogecoinAddr = str;
- break;
- case "flattr":
- curapp.flattrID = str;
- break;
- case "web":
- curapp.webURL = str;
- break;
- case "tracker":
- curapp.trackerURL = str;
- break;
- case "added":
- try {
- curapp.added = str.length() == 0 ? null : Utils.DATE_FORMAT
- .parse(str);
- } catch (ParseException e) {
- curapp.added = null;
- }
- break;
- case "lastupdated":
- try {
- curapp.lastUpdated = str.length() == 0 ? null
- : Utils.DATE_FORMAT.parse(str);
- } catch (ParseException e) {
- curapp.lastUpdated = null;
- }
- break;
- case "marketversion":
- curapp.upstreamVersion = str;
- break;
- case "marketvercode":
- try {
- curapp.upstreamVercode = Integer.parseInt(str);
- } catch (NumberFormatException ex) {
- curapp.upstreamVercode = -1;
- }
- break;
- case "categories":
- curapp.categories = Utils.CommaSeparatedList.make(str);
- break;
- case "antifeatures":
- curapp.antiFeatures = Utils.CommaSeparatedList.make(str);
- break;
- case "requirements":
- curapp.requirements = Utils.CommaSeparatedList.make(str);
- break;
+ case "name":
+ curapp.name = str;
+ break;
+ case "icon":
+ curapp.icon = str;
+ break;
+ case "description":
+ // This is the old-style description. We'll read it
+ // if present, to support old repos, but in newer
+ // repos it will get overwritten straight away!
+ curapp.description = "" + str + "
";
+ break;
+ case "desc":
+ // New-style description.
+ curapp.description = str;
+ break;
+ case "summary":
+ curapp.summary = str;
+ break;
+ case "license":
+ curapp.license = str;
+ break;
+ case "source":
+ curapp.sourceURL = str;
+ break;
+ case "donate":
+ curapp.donateURL = str;
+ break;
+ case "bitcoin":
+ curapp.bitcoinAddr = str;
+ break;
+ case "litecoin":
+ curapp.litecoinAddr = str;
+ break;
+ case "dogecoin":
+ curapp.dogecoinAddr = str;
+ break;
+ case "flattr":
+ curapp.flattrID = str;
+ break;
+ case "web":
+ curapp.webURL = str;
+ break;
+ case "tracker":
+ curapp.trackerURL = str;
+ break;
+ case "added":
+ try {
+ curapp.added = str.length() == 0 ? null : Utils.DATE_FORMAT
+ .parse(str);
+ } catch (ParseException e) {
+ curapp.added = null;
+ }
+ break;
+ case "lastupdated":
+ try {
+ curapp.lastUpdated = str.length() == 0 ? null
+ : Utils.DATE_FORMAT.parse(str);
+ } catch (ParseException e) {
+ curapp.lastUpdated = null;
+ }
+ break;
+ case "marketversion":
+ curapp.upstreamVersion = str;
+ break;
+ case "marketvercode":
+ try {
+ curapp.upstreamVercode = Integer.parseInt(str);
+ } catch (NumberFormatException ex) {
+ curapp.upstreamVercode = -1;
+ }
+ break;
+ case "categories":
+ curapp.categories = Utils.CommaSeparatedList.make(str);
+ break;
+ case "antifeatures":
+ curapp.antiFeatures = Utils.CommaSeparatedList.make(str);
+ break;
+ case "requirements":
+ curapp.requirements = Utils.CommaSeparatedList.make(str);
+ break;
}
} else if (curel.equals("description")) {
description = cleanWhiteSpace(str);
diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index c4e01a9ab..4137eb96d 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -806,15 +806,15 @@ public class UpdateService extends IntentService implements ProgressListener {
// now much more general purpose then just repo downloading.
String repoAddress = event.getData().getString(RepoUpdater.PROGRESS_DATA_REPO_ADDRESS);
switch (event.type) {
- case Downloader.EVENT_PROGRESS:
- String downloadedSize = Utils.getFriendlySize(event.progress);
- String totalSize = Utils.getFriendlySize(event.total);
- int percent = (int)((double)event.progress/event.total * 100);
- message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent);
- break;
- case RepoUpdater.PROGRESS_TYPE_PROCESS_XML:
- message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total);
- break;
+ case Downloader.EVENT_PROGRESS:
+ String downloadedSize = Utils.getFriendlySize(event.progress);
+ String totalSize = Utils.getFriendlySize(event.total);
+ int percent = (int)((double)event.progress/event.total * 100);
+ message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent);
+ break;
+ case RepoUpdater.PROGRESS_TYPE_PROCESS_XML:
+ message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total);
+ break;
}
sendStatus(STATUS_INFO, message);
}
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index 08b6c5c57..cf84e90b4 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -478,30 +478,30 @@ public final class Utils {
public void handleTag(boolean opening, String tag, Editable output,
XMLReader reader) {
switch (tag) {
- case "ul":
- if (opening)
- listNum = -1;
- else
- output.append('\n');
- break;
- case "ol":
- if (opening)
- listNum = 1;
- else
- output.append('\n');
- break;
- case "li":
- if (opening) {
- if (listNum == -1) {
- output.append("\t• ");
- } else {
- output.append("\t").append(Integer.toString(listNum)).append(". ");
- listNum++;
- }
+ case "ul":
+ if (opening)
+ listNum = -1;
+ else
+ output.append('\n');
+ break;
+ case "ol":
+ if (opening)
+ listNum = 1;
+ else
+ output.append('\n');
+ break;
+ case "li":
+ if (opening) {
+ if (listNum == -1) {
+ output.append("\t• ");
} else {
- output.append('\n');
+ output.append("\t").append(Integer.toString(listNum)).append(". ");
+ listNum++;
}
- break;
+ } else {
+ output.append('\n');
+ }
+ break;
}
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
index 9bcc7f20e..965821063 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
@@ -64,66 +64,66 @@ public class Apk extends ValueObject implements Comparable {
for (int i = 0; i < cursor.getColumnCount(); i++) {
String column = cursor.getColumnName(i);
switch (cursor.getColumnName(i)) {
- case ApkProvider.DataColumns.HASH:
- hash = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.HASH_TYPE:
- hashType = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.ADDED_DATE:
- added = ValueObject.toDate(cursor.getString(i));
- break;
- case ApkProvider.DataColumns.FEATURES:
- features = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case ApkProvider.DataColumns.APK_ID:
- id = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.IS_COMPATIBLE:
- compatible = cursor.getInt(i) == 1;
- break;
- case ApkProvider.DataColumns.MIN_SDK_VERSION:
- minSdkVersion = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.MAX_SDK_VERSION:
- maxSdkVersion = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.NAME:
- apkName = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.PERMISSIONS:
- permissions = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case ApkProvider.DataColumns.NATIVE_CODE:
- nativecode = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case ApkProvider.DataColumns.INCOMPATIBLE_REASONS:
- incompatible_reasons = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case ApkProvider.DataColumns.REPO_ID:
- repo = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.SIGNATURE:
- sig = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.SIZE:
- size = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.SOURCE_NAME:
- srcname = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.VERSION:
- version = cursor.getString(i);
- break;
- case ApkProvider.DataColumns.VERSION_CODE:
- vercode = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.REPO_VERSION:
- repoVersion = cursor.getInt(i);
- break;
- case ApkProvider.DataColumns.REPO_ADDRESS:
- repoAddress = cursor.getString(i);
- break;
+ case ApkProvider.DataColumns.HASH:
+ hash = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.HASH_TYPE:
+ hashType = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.ADDED_DATE:
+ added = ValueObject.toDate(cursor.getString(i));
+ break;
+ case ApkProvider.DataColumns.FEATURES:
+ features = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case ApkProvider.DataColumns.APK_ID:
+ id = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.IS_COMPATIBLE:
+ compatible = cursor.getInt(i) == 1;
+ break;
+ case ApkProvider.DataColumns.MIN_SDK_VERSION:
+ minSdkVersion = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.MAX_SDK_VERSION:
+ maxSdkVersion = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.NAME:
+ apkName = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.PERMISSIONS:
+ permissions = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case ApkProvider.DataColumns.NATIVE_CODE:
+ nativecode = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case ApkProvider.DataColumns.INCOMPATIBLE_REASONS:
+ incompatible_reasons = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case ApkProvider.DataColumns.REPO_ID:
+ repo = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.SIGNATURE:
+ sig = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.SIZE:
+ size = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.SOURCE_NAME:
+ srcname = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.VERSION:
+ version = cursor.getString(i);
+ break;
+ case ApkProvider.DataColumns.VERSION_CODE:
+ vercode = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.REPO_VERSION:
+ repoVersion = cursor.getInt(i);
+ break;
+ case ApkProvider.DataColumns.REPO_ADDRESS:
+ repoAddress = cursor.getString(i);
+ break;
}
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java
index d3c12a165..2b888d855 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/App.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/App.java
@@ -113,93 +113,93 @@ public class App extends ValueObject implements Comparable {
for (int i = 0; i < cursor.getColumnCount(); i++) {
switch (cursor.getColumnName(i)) {
- case AppProvider.DataColumns.IS_COMPATIBLE:
- compatible = cursor.getInt(i) == 1;
- break;
- case AppProvider.DataColumns.APP_ID:
- id = cursor.getString(i);
- break;
- case AppProvider.DataColumns.NAME:
- name = cursor.getString(i);
- break;
- case AppProvider.DataColumns.SUMMARY:
- summary = cursor.getString(i);
- break;
- case AppProvider.DataColumns.ICON:
- icon = cursor.getString(i);
- break;
- case AppProvider.DataColumns.DESCRIPTION:
- description = cursor.getString(i);
- break;
- case AppProvider.DataColumns.LICENSE:
- license = cursor.getString(i);
- break;
- case AppProvider.DataColumns.WEB_URL:
- webURL = cursor.getString(i);
- break;
- case AppProvider.DataColumns.TRACKER_URL:
- trackerURL = cursor.getString(i);
- break;
- case AppProvider.DataColumns.SOURCE_URL:
- sourceURL = cursor.getString(i);
- break;
- case AppProvider.DataColumns.DONATE_URL:
- donateURL = cursor.getString(i);
- break;
- case AppProvider.DataColumns.BITCOIN_ADDR:
- bitcoinAddr = cursor.getString(i);
- break;
- 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;
- case AppProvider.DataColumns.SuggestedApk.VERSION:
- suggestedVersion = cursor.getString(i);
- break;
- case AppProvider.DataColumns.SUGGESTED_VERSION_CODE:
- suggestedVercode = cursor.getInt(i);
- break;
- case AppProvider.DataColumns.UPSTREAM_VERSION_CODE:
- upstreamVercode = cursor.getInt(i);
- break;
- case AppProvider.DataColumns.UPSTREAM_VERSION:
- upstreamVersion = cursor.getString(i);
- break;
- case AppProvider.DataColumns.ADDED:
- added = ValueObject.toDate(cursor.getString(i));
- break;
- case AppProvider.DataColumns.LAST_UPDATED:
- lastUpdated = ValueObject.toDate(cursor.getString(i));
- break;
- case AppProvider.DataColumns.CATEGORIES:
- categories = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case AppProvider.DataColumns.ANTI_FEATURES:
- antiFeatures = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case AppProvider.DataColumns.REQUIREMENTS:
- requirements = Utils.CommaSeparatedList.make(cursor.getString(i));
- break;
- case AppProvider.DataColumns.IGNORE_ALLUPDATES:
- ignoreAllUpdates = cursor.getInt(i) == 1;
- break;
- case AppProvider.DataColumns.IGNORE_THISUPDATE:
- ignoreThisUpdate = cursor.getInt(i);
- break;
- case AppProvider.DataColumns.ICON_URL:
- iconUrl = cursor.getString(i);
- break;
- case AppProvider.DataColumns.InstalledApp.VERSION_CODE:
- installedVersionCode = cursor.getInt(i);
- break;
- case AppProvider.DataColumns.InstalledApp.VERSION_NAME:
- installedVersionName = cursor.getString(i);
- break;
+ case AppProvider.DataColumns.IS_COMPATIBLE:
+ compatible = cursor.getInt(i) == 1;
+ break;
+ case AppProvider.DataColumns.APP_ID:
+ id = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.NAME:
+ name = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.SUMMARY:
+ summary = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.ICON:
+ icon = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.DESCRIPTION:
+ description = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.LICENSE:
+ license = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.WEB_URL:
+ webURL = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.TRACKER_URL:
+ trackerURL = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.SOURCE_URL:
+ sourceURL = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.DONATE_URL:
+ donateURL = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.BITCOIN_ADDR:
+ bitcoinAddr = cursor.getString(i);
+ break;
+ 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;
+ case AppProvider.DataColumns.SuggestedApk.VERSION:
+ suggestedVersion = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.SUGGESTED_VERSION_CODE:
+ suggestedVercode = cursor.getInt(i);
+ break;
+ case AppProvider.DataColumns.UPSTREAM_VERSION_CODE:
+ upstreamVercode = cursor.getInt(i);
+ break;
+ case AppProvider.DataColumns.UPSTREAM_VERSION:
+ upstreamVersion = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.ADDED:
+ added = ValueObject.toDate(cursor.getString(i));
+ break;
+ case AppProvider.DataColumns.LAST_UPDATED:
+ lastUpdated = ValueObject.toDate(cursor.getString(i));
+ break;
+ case AppProvider.DataColumns.CATEGORIES:
+ categories = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case AppProvider.DataColumns.ANTI_FEATURES:
+ antiFeatures = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case AppProvider.DataColumns.REQUIREMENTS:
+ requirements = Utils.CommaSeparatedList.make(cursor.getString(i));
+ break;
+ case AppProvider.DataColumns.IGNORE_ALLUPDATES:
+ ignoreAllUpdates = cursor.getInt(i) == 1;
+ break;
+ case AppProvider.DataColumns.IGNORE_THISUPDATE:
+ ignoreThisUpdate = cursor.getInt(i);
+ break;
+ case AppProvider.DataColumns.ICON_URL:
+ iconUrl = cursor.getString(i);
+ break;
+ case AppProvider.DataColumns.InstalledApp.VERSION_CODE:
+ installedVersionCode = cursor.getInt(i);
+ break;
+ case AppProvider.DataColumns.InstalledApp.VERSION_NAME:
+ installedVersionName = cursor.getString(i);
+ break;
}
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index d7d1b8977..771c6d611 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -315,24 +315,24 @@ public class AppProvider extends FDroidProvider {
@Override
public void addField(String field) {
switch (field) {
- case DataColumns.SuggestedApk.VERSION:
- addSuggestedApkVersionField();
- break;
- case DataColumns.InstalledApp.VERSION_NAME:
- addInstalledAppVersionName();
- break;
- case DataColumns.InstalledApp.VERSION_CODE:
- addInstalledAppVersionCode();
- break;
- case DataColumns._COUNT:
- appendCountField();
- break;
- default:
- if (field.equals(DataColumns.CATEGORIES)) {
- categoryFieldAdded = true;
- }
- appendField(field, "fdroid_app");
- break;
+ case DataColumns.SuggestedApk.VERSION:
+ addSuggestedApkVersionField();
+ break;
+ case DataColumns.InstalledApp.VERSION_NAME:
+ addInstalledAppVersionName();
+ break;
+ case DataColumns.InstalledApp.VERSION_CODE:
+ addInstalledAppVersionCode();
+ break;
+ case DataColumns._COUNT:
+ appendCountField();
+ break;
+ default:
+ if (field.equals(DataColumns.CATEGORIES)) {
+ categoryFieldAdded = true;
+ }
+ appendField(field, "fdroid_app");
+ break;
}
}
@@ -648,65 +648,65 @@ public class AppProvider extends FDroidProvider {
boolean includeSwap = true;
switch (matcher.match(uri)) {
- case CODE_LIST:
- includeSwap = false;
- break;
+ case CODE_LIST:
+ includeSwap = false;
+ break;
- case CODE_SINGLE:
- selection = selection.add(querySingle(uri.getLastPathSegment()));
- break;
+ case CODE_SINGLE:
+ selection = selection.add(querySingle(uri.getLastPathSegment()));
+ break;
- case CAN_UPDATE:
- selection = selection.add(queryCanUpdate());
- includeSwap = false;
- break;
+ case CAN_UPDATE:
+ selection = selection.add(queryCanUpdate());
+ includeSwap = false;
+ break;
- case REPO:
- selection = selection.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
- break;
+ case REPO:
+ selection = selection.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
+ break;
- case INSTALLED:
- selection = selection.add(queryInstalled());
- includeSwap = false;
- break;
+ case INSTALLED:
+ selection = selection.add(queryInstalled());
+ includeSwap = false;
+ break;
- case SEARCH:
- selection = selection.add(querySearch(uri.getLastPathSegment()));
- includeSwap = false;
- break;
+ case SEARCH:
+ selection = selection.add(querySearch(uri.getLastPathSegment()));
+ includeSwap = false;
+ break;
- case NO_APKS:
- selection = selection.add(queryNoApks());
- break;
+ case NO_APKS:
+ selection = selection.add(queryNoApks());
+ break;
- case APPS:
- selection = selection.add(queryApps(uri.getLastPathSegment()));
- break;
+ case APPS:
+ selection = selection.add(queryApps(uri.getLastPathSegment()));
+ break;
- case IGNORED:
- selection = selection.add(queryIgnored());
- break;
+ case IGNORED:
+ selection = selection.add(queryIgnored());
+ break;
- case CATEGORY:
- selection = selection.add(queryCategory(uri.getLastPathSegment()));
- includeSwap = false;
- break;
+ case CATEGORY:
+ selection = selection.add(queryCategory(uri.getLastPathSegment()));
+ includeSwap = false;
+ break;
- case RECENTLY_UPDATED:
- sortOrder = " fdroid_app.lastUpdated DESC";
- selection = selection.add(queryRecentlyUpdated());
- includeSwap = false;
- break;
+ case RECENTLY_UPDATED:
+ sortOrder = " fdroid_app.lastUpdated DESC";
+ selection = selection.add(queryRecentlyUpdated());
+ includeSwap = false;
+ break;
- case NEWLY_ADDED:
- sortOrder = " fdroid_app.added DESC";
- selection = selection.add(queryNewlyAdded());
- includeSwap = false;
- break;
+ case NEWLY_ADDED:
+ sortOrder = " fdroid_app.added DESC";
+ selection = selection.add(queryNewlyAdded());
+ includeSwap = false;
+ break;
- default:
- Log.e(TAG, "Invalid URI for app content provider: " + uri);
- throw new UnsupportedOperationException("Invalid URI for app content provider: " + uri);
+ default:
+ Log.e(TAG, "Invalid URI for app content provider: " + uri);
+ throw new UnsupportedOperationException("Invalid URI for app content provider: " + uri);
}
if (!includeSwap) {
@@ -732,12 +732,12 @@ public class AppProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) {
- case NO_APKS:
- query = query.add(queryNoApks());
- break;
+ case NO_APKS:
+ query = query.add(queryNoApks());
+ break;
- default:
- throw new UnsupportedOperationException("Delete not supported for " + uri + ".");
+ default:
+ throw new UnsupportedOperationException("Delete not supported for " + uri + ".");
}
@@ -760,16 +760,16 @@ public class AppProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) {
- case CALC_APP_DETAILS_FROM_INDEX:
- updateAppDetails();
- return 0;
+ case CALC_APP_DETAILS_FROM_INDEX:
+ updateAppDetails();
+ return 0;
- case CODE_SINGLE:
- query = query.add(querySingle(uri.getLastPathSegment()));
- break;
+ case CODE_SINGLE:
+ query = query.add(querySingle(uri.getLastPathSegment()));
+ break;
- default:
- throw new UnsupportedOperationException("Update not supported for " + uri + ".");
+ default:
+ throw new UnsupportedOperationException("Update not supported for " + uri + ".");
}
int count = write().update(getTableName(), values, query.getSelection(), query.getArgs());
diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
index ebe674d42..56663117a 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java
@@ -42,45 +42,45 @@ public class Repo extends ValueObject {
for (int i = 0; i < cursor.getColumnCount(); i++) {
switch (cursor.getColumnName(i)) {
- case RepoProvider.DataColumns._ID:
- id = cursor.getInt(i);
- break;
- case RepoProvider.DataColumns.LAST_ETAG:
- lastetag = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.ADDRESS:
- address = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.DESCRIPTION:
- description = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.FINGERPRINT:
- fingerprint = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.IN_USE:
- inuse = cursor.getInt(i) == 1;
- break;
- case RepoProvider.DataColumns.LAST_UPDATED:
- lastUpdated = toDate(cursor.getString(i));
- break;
- case RepoProvider.DataColumns.MAX_AGE:
- maxage = cursor.getInt(i);
- break;
- case RepoProvider.DataColumns.VERSION:
- version = cursor.getInt(i);
- break;
- case RepoProvider.DataColumns.NAME:
- name = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.PUBLIC_KEY:
- pubkey = cursor.getString(i);
- break;
- case RepoProvider.DataColumns.PRIORITY:
- priority = cursor.getInt(i);
- break;
- case RepoProvider.DataColumns.IS_SWAP:
- isSwap = cursor.getInt(i) == 1;
- break;
+ case RepoProvider.DataColumns._ID:
+ id = cursor.getInt(i);
+ break;
+ case RepoProvider.DataColumns.LAST_ETAG:
+ lastetag = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.ADDRESS:
+ address = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.DESCRIPTION:
+ description = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.FINGERPRINT:
+ fingerprint = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.IN_USE:
+ inuse = cursor.getInt(i) == 1;
+ break;
+ case RepoProvider.DataColumns.LAST_UPDATED:
+ lastUpdated = toDate(cursor.getString(i));
+ break;
+ case RepoProvider.DataColumns.MAX_AGE:
+ maxage = cursor.getInt(i);
+ break;
+ case RepoProvider.DataColumns.VERSION:
+ version = cursor.getInt(i);
+ break;
+ case RepoProvider.DataColumns.NAME:
+ name = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.PUBLIC_KEY:
+ pubkey = cursor.getString(i);
+ break;
+ case RepoProvider.DataColumns.PRIORITY:
+ priority = cursor.getInt(i);
+ break;
+ case RepoProvider.DataColumns.IS_SWAP:
+ isSwap = cursor.getInt(i) == 1;
+ break;
}
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
index 19bc4b5df..9d8284a68 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
@@ -201,12 +201,12 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener {
private void sendProgressEvent(Event event) {
switch (event.type) {
- case Downloader.EVENT_PROGRESS:
- // Keep a copy of these ourselves, so people can interrogate us for the
- // info (in addition to receiving events with the info).
- totalSize = event.total;
- progress = event.progress;
- break;
+ case Downloader.EVENT_PROGRESS:
+ // Keep a copy of these ourselves, so people can interrogate us for the
+ // info (in addition to receiving events with the info).
+ totalSize = event.total;
+ progress = event.progress;
+ break;
}
event.getData().putLong(EVENT_SOURCE_ID, id);
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index 145ef7313..fd9287f10 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -188,21 +188,21 @@ public class ManageReposActivity extends ActionBarActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case android.R.id.home:
- Intent destIntent = new Intent(this, FDroid.class);
- markChangedIfRequired(destIntent);
- setResult(RESULT_OK, destIntent);
- NavUtils.navigateUpTo(this, destIntent);
- return true;
- case R.id.action_add_repo:
- showAddRepo();
- return true;
- case R.id.action_update_repo:
- updateRepos();
- return true;
- case R.id.action_find_local_repos:
- scanForRepos();
- return true;
+ case android.R.id.home:
+ Intent destIntent = new Intent(this, FDroid.class);
+ markChangedIfRequired(destIntent);
+ setResult(RESULT_OK, destIntent);
+ NavUtils.navigateUpTo(this, destIntent);
+ return true;
+ case R.id.action_add_repo:
+ showAddRepo();
+ return true;
+ case R.id.action_update_repo:
+ updateRepos();
+ return true;
+ case R.id.action_find_local_repos:
+ scanForRepos();
+ return true;
}
return super.onOptionsItemSelected(item);
}
@@ -213,15 +213,15 @@ public class ManageReposActivity extends ActionBarActivity {
@Override
public void onProgress(Event event) {
switch (event.type) {
- case UpdateService.EVENT_COMPLETE_AND_SAME:
- case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
- // No need to prompt to update any more, we just
- // did it!
- changed = false;
- break;
- case UpdateService.EVENT_FINISHED:
- updateHandler = null;
- break;
+ case UpdateService.EVENT_COMPLETE_AND_SAME:
+ case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
+ // No need to prompt to update any more, we just
+ // did it!
+ changed = false;
+ break;
+ case UpdateService.EVENT_FINISHED:
+ updateHandler = null;
+ break;
}
}
});
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
index 63329ca67..40499e4ab 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
@@ -68,110 +68,110 @@ public class PreferenceFragment
int result = 0;
switch (key) {
- case Preferences.PREF_UPD_INTERVAL:
- ListPreference listPref = (ListPreference)findPreference(
- Preferences.PREF_UPD_INTERVAL);
- int interval = Integer.parseInt(listPref.getValue());
- Preference onlyOnWifi = findPreference(
- Preferences.PREF_UPD_WIFI_ONLY);
- onlyOnWifi.setEnabled(interval > 0);
- if (interval == 0) {
- listPref.setSummary(R.string.update_interval_zero);
- } else {
- listPref.setSummary(listPref.getEntry());
- }
- break;
+ case Preferences.PREF_UPD_INTERVAL:
+ ListPreference listPref = (ListPreference)findPreference(
+ Preferences.PREF_UPD_INTERVAL);
+ int interval = Integer.parseInt(listPref.getValue());
+ Preference onlyOnWifi = findPreference(
+ Preferences.PREF_UPD_WIFI_ONLY);
+ onlyOnWifi.setEnabled(interval > 0);
+ if (interval == 0) {
+ listPref.setSummary(R.string.update_interval_zero);
+ } else {
+ listPref.setSummary(listPref.getEntry());
+ }
+ break;
- case Preferences.PREF_UPD_WIFI_ONLY:
- checkSummary(key, R.string.automatic_scan_wifi_on);
- break;
+ case Preferences.PREF_UPD_WIFI_ONLY:
+ checkSummary(key, R.string.automatic_scan_wifi_on);
+ break;
- case Preferences.PREF_UPD_NOTIFY:
- checkSummary(key, R.string.notify_on);
- break;
+ case Preferences.PREF_UPD_NOTIFY:
+ checkSummary(key, R.string.notify_on);
+ break;
- case Preferences.PREF_UPD_HISTORY:
- textSummary(key, R.string.update_history_summ);
- break;
+ case Preferences.PREF_UPD_HISTORY:
+ textSummary(key, R.string.update_history_summ);
+ break;
- case Preferences.PREF_PERMISSIONS:
- checkSummary(key, R.string.showPermissions_on);
- break;
+ case Preferences.PREF_PERMISSIONS:
+ checkSummary(key, R.string.showPermissions_on);
+ break;
- case Preferences.PREF_COMPACT_LAYOUT:
- checkSummary(key, R.string.compactlayout_on);
- break;
+ case Preferences.PREF_COMPACT_LAYOUT:
+ checkSummary(key, R.string.compactlayout_on);
+ break;
- case Preferences.PREF_THEME:
- entrySummary(key);
- if (changing) {
- result |= PreferencesActivity.RESULT_RESTART;
- getActivity().setResult(result);
- }
- break;
+ case Preferences.PREF_THEME:
+ entrySummary(key);
+ if (changing) {
+ result |= PreferencesActivity.RESULT_RESTART;
+ getActivity().setResult(result);
+ }
+ break;
- case Preferences.PREF_INCOMP_VER:
- checkSummary(key, R.string.show_incompat_versions_on);
- break;
+ case Preferences.PREF_INCOMP_VER:
+ checkSummary(key, R.string.show_incompat_versions_on);
+ break;
- case Preferences.PREF_ROOTED:
- checkSummary(key, R.string.rooted_on);
- break;
+ case Preferences.PREF_ROOTED:
+ checkSummary(key, R.string.rooted_on);
+ break;
- case Preferences.PREF_IGN_TOUCH:
- checkSummary(key, R.string.ignoreTouch_on);
- break;
+ case Preferences.PREF_IGN_TOUCH:
+ checkSummary(key, R.string.ignoreTouch_on);
+ break;
- case Preferences.PREF_LOCAL_REPO_BONJOUR:
- checkSummary(key, R.string.local_repo_bonjour_on);
- break;
+ case Preferences.PREF_LOCAL_REPO_BONJOUR:
+ checkSummary(key, R.string.local_repo_bonjour_on);
+ break;
- case Preferences.PREF_LOCAL_REPO_NAME:
- textSummary(key, R.string.local_repo_name_summary);
- break;
+ case Preferences.PREF_LOCAL_REPO_NAME:
+ textSummary(key, R.string.local_repo_name_summary);
+ break;
- case Preferences.PREF_LOCAL_REPO_HTTPS:
- checkSummary(key, R.string.local_repo_https_on);
- break;
+ case Preferences.PREF_LOCAL_REPO_HTTPS:
+ checkSummary(key, R.string.local_repo_https_on);
+ break;
- case Preferences.PREF_CACHE_APK:
- checkSummary(key, R.string.cache_downloaded_on);
- break;
+ case Preferences.PREF_CACHE_APK:
+ checkSummary(key, R.string.cache_downloaded_on);
+ break;
- case Preferences.PREF_EXPERT:
- checkSummary(key, R.string.expert_on);
- break;
+ case Preferences.PREF_EXPERT:
+ checkSummary(key, R.string.expert_on);
+ break;
- case Preferences.PREF_ROOT_INSTALLER:
- checkSummary(key, R.string.root_installer_on);
- break;
+ case Preferences.PREF_ROOT_INSTALLER:
+ checkSummary(key, R.string.root_installer_on);
+ break;
- case Preferences.PREF_SYSTEM_INSTALLER:
- checkSummary(key, R.string.system_installer_on);
- break;
+ case Preferences.PREF_SYSTEM_INSTALLER:
+ checkSummary(key, R.string.system_installer_on);
+ break;
- case Preferences.PREF_ENABLE_PROXY:
- CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key);
- checkPref.setSummary(R.string.enable_proxy_summary);
- break;
+ case Preferences.PREF_ENABLE_PROXY:
+ CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key);
+ checkPref.setSummary(R.string.enable_proxy_summary);
+ break;
- case Preferences.PREF_PROXY_HOST:
- EditTextPreference textPref = (EditTextPreference) findPreference(key);
- String text = Preferences.get().getProxyHost();
- if (TextUtils.isEmpty(text) || text.equals(Preferences.DEFAULT_PROXY_HOST))
- textPref.setSummary(R.string.proxy_host_summary);
- else
- textPref.setSummary(text);
- break;
+ case Preferences.PREF_PROXY_HOST:
+ EditTextPreference textPref = (EditTextPreference) findPreference(key);
+ String text = Preferences.get().getProxyHost();
+ if (TextUtils.isEmpty(text) || text.equals(Preferences.DEFAULT_PROXY_HOST))
+ textPref.setSummary(R.string.proxy_host_summary);
+ else
+ textPref.setSummary(text);
+ break;
- case Preferences.PREF_PROXY_PORT:
- EditTextPreference textPref2 = (EditTextPreference) findPreference(key);
- int port = Preferences.get().getProxyPort();
- if (port == Preferences.DEFAULT_PROXY_PORT)
- textPref2.setSummary(R.string.proxy_port_summary);
- else
- textPref2.setSummary(String.valueOf(port));
- break;
+ case Preferences.PREF_PROXY_PORT:
+ EditTextPreference textPref2 = (EditTextPreference) findPreference(key);
+ int port = Preferences.get().getProxyPort();
+ if (port == Preferences.DEFAULT_PROXY_PORT)
+ textPref2.setSummary(R.string.proxy_port_summary);
+ else
+ textPref2.setSummary(String.valueOf(port));
+ break;
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
index cfd3ec079..5f1d2c80b 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
@@ -230,13 +230,13 @@ public class RepoDetailsFragment extends Fragment {
@Override
public void onProgress(Event event) {
switch (event.type) {
- case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
- repo = loadRepoDetails();
- updateView((ViewGroup)getView());
- break;
- case UpdateService.EVENT_FINISHED:
- updateHandler = null;
- break;
+ case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
+ repo = loadRepoDetails();
+ updateView((ViewGroup)getView());
+ break;
+ case UpdateService.EVENT_FINISHED:
+ updateHandler = null;
+ break;
}
}
});
@@ -321,16 +321,16 @@ public class RepoDetailsFragment extends Fragment {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case DELETE:
- promptForDelete();
- return true;
- case UPDATE:
- performUpdate();
- return true;
- case ENABLE_NFC:
- Intent intent = new Intent(getActivity(), NfcNotEnabledActivity.class);
- startActivity(intent);
- return true;
+ case DELETE:
+ promptForDelete();
+ return true;
+ case UPDATE:
+ performUpdate();
+ return true;
+ case ENABLE_NFC:
+ Intent intent = new Intent(getActivity(), NfcNotEnabledActivity.class);
+ startActivity(intent);
+ return true;
}
return false;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
index 5370d2372..e6e21cd30 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
@@ -107,19 +107,19 @@ public class ConfirmReceiveSwapFragment extends Fragment implements ProgressList
// know what we are up to.
switch (event.type) {
- case UpdateService.EVENT_COMPLETE_AND_SAME:
- case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
- ((ConnectSwapActivity)getActivity()).onRepoUpdated(repo);
- /*Intent intent = new Intent();
- intent.putExtra("category", newRepoConfig.getHost()); // TODO: Load repo from database to get proper name. This is what the category we want to select will be called.
- getActivity().setResult(Activity.RESULT_OK, intent);
- finish();*/
- break;
- case UpdateService.EVENT_ERROR:
- // TODO: Show message on this screen (with a big "okay" button that goes back to F-Droid activity)
- // rather than finishing directly.
- finish();
- break;
- }
+ case UpdateService.EVENT_COMPLETE_AND_SAME:
+ case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
+ ((ConnectSwapActivity)getActivity()).onRepoUpdated(repo);
+ /*Intent intent = new Intent();
+ intent.putExtra("category", newRepoConfig.getHost()); // TODO: Load repo from database to get proper name. This is what the category we want to select will be called.
+ getActivity().setResult(Activity.RESULT_OK, intent);
+ finish();*/
+ break;
+ case UpdateService.EVENT_ERROR:
+ // TODO: Show message on this screen (with a big "okay" button that goes back to F-Droid activity)
+ // rather than finishing directly.
+ finish();
+ break;
+ }
}
}
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
index 7f3470ffb..c8516e0cc 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
@@ -38,12 +38,12 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
@Override
public void onBackPressed() {
switch (currentState()) {
- case STATE_START_SWAP:
- finish();
- break;
- default:
- super.onBackPressed();
- break;
+ case STATE_START_SWAP:
+ finish();
+ break;
+ default:
+ super.onBackPressed();
+ break;
}
}
@@ -54,23 +54,23 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
public void nextStep() {
switch (currentState()) {
- case STATE_START_SWAP:
- showSelectApps();
- break;
- case STATE_SELECT_APPS:
- prepareLocalRepo();
- break;
- case STATE_JOIN_WIFI:
- ensureLocalRepoRunning();
- if (!attemptToShowNfc()) {
- showWifiQr();
- }
- break;
- case STATE_NFC:
+ case STATE_START_SWAP:
+ showSelectApps();
+ break;
+ case STATE_SELECT_APPS:
+ prepareLocalRepo();
+ break;
+ case STATE_JOIN_WIFI:
+ ensureLocalRepoRunning();
+ if (!attemptToShowNfc()) {
showWifiQr();
- break;
- case STATE_WIFI_QR:
- break;
+ }
+ break;
+ case STATE_NFC:
+ showWifiQr();
+ break;
+ case STATE_WIFI_QR:
+ break;
}
supportInvalidateOptionsMenu();
}