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

Outdent all switch cases

Browse Source
This commit is contained in:
Daniel Martí 2015-04-01 13:27:23 +02:00
parent 1295158de2
commit bdbb6ce03a
15 changed files with 669 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1090,23 +1090,23 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
boolean finished = false; boolean finished = false;
switch (event.type) { switch (event.type) {
case Downloader.EVENT_PROGRESS: case Downloader.EVENT_PROGRESS:
updateProgressDialog(event.progress, event.total); updateProgressDialog(event.progress, event.total);
break; break;
case ApkDownloader.EVENT_ERROR: case ApkDownloader.EVENT_ERROR:
final String text; final String text;
if (event.getData().getInt(ApkDownloader.EVENT_DATA_ERROR_TYPE) == ApkDownloader.ERROR_HASH_MISMATCH) if (event.getData().getInt(ApkDownloader.EVENT_DATA_ERROR_TYPE) == ApkDownloader.ERROR_HASH_MISMATCH)
text = getString(R.string.corrupt_download); text = getString(R.string.corrupt_download);
else else
text = getString(R.string.details_notinstalled); text = getString(R.string.details_notinstalled);
// this must be on the main UI thread // this must be on the main UI thread
Toast.makeText(this, text, Toast.LENGTH_LONG).show(); Toast.makeText(this, text, Toast.LENGTH_LONG).show();
finished = true; finished = true;
break; break;
case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE: case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
downloadCompleteInstallApk(); downloadCompleteInstallApk();
finished = true; finished = true;
break; break;
} }
if (finished) { if (finished) {
@ -1281,18 +1281,18 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
private String descAntiFeature(String af) { private String descAntiFeature(String af) {
switch (af) { switch (af) {
case "Ads": case "Ads":
return getString(R.string.antiadslist); return getString(R.string.antiadslist);
case "Tracking": case "Tracking":
return getString(R.string.antitracklist); return getString(R.string.antitracklist);
case "NonFreeNet": case "NonFreeNet":
return getString(R.string.antinonfreenetlist); return getString(R.string.antinonfreenetlist);
case "NonFreeAdd": case "NonFreeAdd":
return getString(R.string.antinonfreeadlist); return getString(R.string.antinonfreeadlist);
case "NonFreeDep": case "NonFreeDep":
return getString(R.string.antinonfreedeplist); return getString(R.string.antinonfreedeplist);
case "UpstreamNonFree": case "UpstreamNonFree":
return getString(R.string.antiupstreamnonfreelist); return getString(R.string.antiupstreamnonfreelist);
} }
return null; return null;
} }

60
F-Droid/src/org/fdroid/fdroid/Preferences.java
View File

@ -227,36 +227,36 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
uninitialize(key); uninitialize(key);
switch (key) { switch (key) {
case PREF_COMPACT_LAYOUT: case PREF_COMPACT_LAYOUT:
for (ChangeListener listener : compactLayoutListeners) { for (ChangeListener listener : compactLayoutListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
case PREF_ROOTED: case PREF_ROOTED:
for (ChangeListener listener : filterAppsRequiringRootListeners) { for (ChangeListener listener : filterAppsRequiringRootListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
case PREF_UPD_HISTORY: case PREF_UPD_HISTORY:
for (ChangeListener listener : updateHistoryListeners) { for (ChangeListener listener : updateHistoryListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
case PREF_LOCAL_REPO_BONJOUR: case PREF_LOCAL_REPO_BONJOUR:
for (ChangeListener listener : localRepoBonjourListeners) { for (ChangeListener listener : localRepoBonjourListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
case PREF_LOCAL_REPO_NAME: case PREF_LOCAL_REPO_NAME:
for (ChangeListener listener : localRepoNameListeners) { for (ChangeListener listener : localRepoNameListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
case PREF_LOCAL_REPO_HTTPS: case PREF_LOCAL_REPO_HTTPS:
for (ChangeListener listener : localRepoHttpsListeners) { for (ChangeListener listener : localRepoHttpsListeners) {
listener.onPreferenceChange(); listener.onPreferenceChange();
} }
break; break;
} }
} }

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

@ -125,158 +125,158 @@ public class RepoXMLHandler extends DefaultHandler {
curapk = null; curapk = null;
} else if (curapk != null && str != null) { } else if (curapk != null && str != null) {
switch (curel) { switch (curel) {
case "version": case "version":
curapk.version = str; curapk.version = str;
break; break;
case "versioncode": case "versioncode":
try { try {
curapk.vercode = Integer.parseInt(str); curapk.vercode = Integer.parseInt(str);
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
curapk.vercode = -1; curapk.vercode = -1;
} }
break; break;
case "size": case "size":
try { try {
curapk.size = Integer.parseInt(str); curapk.size = Integer.parseInt(str);
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
curapk.size = 0; curapk.size = 0;
} }
break; break;
case "hash": case "hash":
if (hashType == null || hashType.equals("md5")) { if (hashType == null || hashType.equals("md5")) {
if (curapk.hash == null) { if (curapk.hash == null) {
curapk.hash = str;
curapk.hashType = "MD5";
}
} else if (hashType.equals("sha256")) {
curapk.hash = str; curapk.hash = str;
curapk.hashType = "SHA-256"; curapk.hashType = "MD5";
} }
break; } else if (hashType.equals("sha256")) {
case "sig": curapk.hash = str;
curapk.sig = str; curapk.hashType = "SHA-256";
break; }
case "srcname": break;
curapk.srcname = str; case "sig":
break; curapk.sig = str;
case "apkname": break;
curapk.apkName = str; case "srcname":
break; curapk.srcname = str;
case "sdkver": break;
try { case "apkname":
curapk.minSdkVersion = Integer.parseInt(str); curapk.apkName = str;
} catch (NumberFormatException ex) { break;
curapk.minSdkVersion = 0; case "sdkver":
} try {
break; curapk.minSdkVersion = Integer.parseInt(str);
case "maxsdkver": } catch (NumberFormatException ex) {
try { curapk.minSdkVersion = 0;
curapk.maxSdkVersion = Integer.parseInt(str); }
} catch (NumberFormatException ex) { break;
curapk.maxSdkVersion = 0; case "maxsdkver":
} try {
break; curapk.maxSdkVersion = Integer.parseInt(str);
case "added": } catch (NumberFormatException ex) {
try { curapk.maxSdkVersion = 0;
curapk.added = str.length() == 0 ? null : Utils.DATE_FORMAT }
.parse(str); break;
} catch (ParseException e) { case "added":
curapk.added = null; try {
} curapk.added = str.length() == 0 ? null : Utils.DATE_FORMAT
break; .parse(str);
case "permissions": } catch (ParseException e) {
curapk.permissions = Utils.CommaSeparatedList.make(str); curapk.added = null;
break; }
case "features": break;
curapk.features = Utils.CommaSeparatedList.make(str); case "permissions":
break; curapk.permissions = Utils.CommaSeparatedList.make(str);
case "nativecode": break;
curapk.nativecode = Utils.CommaSeparatedList.make(str); case "features":
break; curapk.features = Utils.CommaSeparatedList.make(str);
break;
case "nativecode":
curapk.nativecode = Utils.CommaSeparatedList.make(str);
break;
} }
} else if (curapp != null && str != null) { } else if (curapp != null && str != null) {
switch (curel) { switch (curel) {
case "name": case "name":
curapp.name = str; curapp.name = str;
break; break;
case "icon": case "icon":
curapp.icon = str; curapp.icon = str;
break; break;
case "description": case "description":
// This is the old-style description. We'll read it // This is the old-style description. We'll read it
// if present, to support old repos, but in newer // if present, to support old repos, but in newer
// repos it will get overwritten straight away! // repos it will get overwritten straight away!
curapp.description = "<p>" + str + "</p>"; curapp.description = "<p>" + str + "</p>";
break; break;
case "desc": case "desc":
// New-style description. // New-style description.
curapp.description = str; curapp.description = str;
break; break;
case "summary": case "summary":
curapp.summary = str; curapp.summary = str;
break; break;
case "license": case "license":
curapp.license = str; curapp.license = str;
break; break;
case "source": case "source":
curapp.sourceURL = str; curapp.sourceURL = str;
break; break;
case "donate": case "donate":
curapp.donateURL = str; curapp.donateURL = str;
break; break;
case "bitcoin": case "bitcoin":
curapp.bitcoinAddr = str; curapp.bitcoinAddr = str;
break; break;
case "litecoin": case "litecoin":
curapp.litecoinAddr = str; curapp.litecoinAddr = str;
break; break;
case "dogecoin": case "dogecoin":
curapp.dogecoinAddr = str; curapp.dogecoinAddr = str;
break; break;
case "flattr": case "flattr":
curapp.flattrID = str; curapp.flattrID = str;
break; break;
case "web": case "web":
curapp.webURL = str; curapp.webURL = str;
break; break;
case "tracker": case "tracker":
curapp.trackerURL = str; curapp.trackerURL = str;
break; break;
case "added": case "added":
try { try {
curapp.added = str.length() == 0 ? null : Utils.DATE_FORMAT curapp.added = str.length() == 0 ? null : Utils.DATE_FORMAT
.parse(str); .parse(str);
} catch (ParseException e) { } catch (ParseException e) {
curapp.added = null; curapp.added = null;
} }
break; break;
case "lastupdated": case "lastupdated":
try { try {
curapp.lastUpdated = str.length() == 0 ? null curapp.lastUpdated = str.length() == 0 ? null
: Utils.DATE_FORMAT.parse(str); : Utils.DATE_FORMAT.parse(str);
} catch (ParseException e) { } catch (ParseException e) {
curapp.lastUpdated = null; curapp.lastUpdated = null;
} }
break; break;
case "marketversion": case "marketversion":
curapp.upstreamVersion = str; curapp.upstreamVersion = str;
break; break;
case "marketvercode": case "marketvercode":
try { try {
curapp.upstreamVercode = Integer.parseInt(str); curapp.upstreamVercode = Integer.parseInt(str);
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
curapp.upstreamVercode = -1; curapp.upstreamVercode = -1;
} }
break; break;
case "categories": case "categories":
curapp.categories = Utils.CommaSeparatedList.make(str); curapp.categories = Utils.CommaSeparatedList.make(str);
break; break;
case "antifeatures": case "antifeatures":
curapp.antiFeatures = Utils.CommaSeparatedList.make(str); curapp.antiFeatures = Utils.CommaSeparatedList.make(str);
break; break;
case "requirements": case "requirements":
curapp.requirements = Utils.CommaSeparatedList.make(str); curapp.requirements = Utils.CommaSeparatedList.make(str);
break; break;
} }
} else if (curel.equals("description")) { } else if (curel.equals("description")) {
description = cleanWhiteSpace(str); description = cleanWhiteSpace(str);

18
F-Droid/src/org/fdroid/fdroid/UpdateService.java
View File

@ -806,15 +806,15 @@ public class UpdateService extends IntentService implements ProgressListener {
// now much more general purpose then just repo downloading. // now much more general purpose then just repo downloading.
String repoAddress = event.getData().getString(RepoUpdater.PROGRESS_DATA_REPO_ADDRESS); String repoAddress = event.getData().getString(RepoUpdater.PROGRESS_DATA_REPO_ADDRESS);
switch (event.type) { switch (event.type) {
case Downloader.EVENT_PROGRESS: case Downloader.EVENT_PROGRESS:
String downloadedSize = Utils.getFriendlySize(event.progress); String downloadedSize = Utils.getFriendlySize(event.progress);
String totalSize = Utils.getFriendlySize(event.total); String totalSize = Utils.getFriendlySize(event.total);
int percent = (int)((double)event.progress/event.total * 100); int percent = (int)((double)event.progress/event.total * 100);
message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent); message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent);
break; break;
case RepoUpdater.PROGRESS_TYPE_PROCESS_XML: case RepoUpdater.PROGRESS_TYPE_PROCESS_XML:
message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total); message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total);
break; break;
} }
sendStatus(STATUS_INFO, message); sendStatus(STATUS_INFO, message);
} }

44
F-Droid/src/org/fdroid/fdroid/Utils.java
View File

@ -478,30 +478,30 @@ public final class Utils {
public void handleTag(boolean opening, String tag, Editable output, public void handleTag(boolean opening, String tag, Editable output,
XMLReader reader) { XMLReader reader) {
switch (tag) { switch (tag) {
case "ul": case "ul":
if (opening) if (opening)
listNum = -1; listNum = -1;
else else
output.append('\n'); output.append('\n');
break; break;
case "ol": case "ol":
if (opening) if (opening)
listNum = 1; listNum = 1;
else else
output.append('\n'); output.append('\n');
break; break;
case "li": case "li":
if (opening) { if (opening) {
if (listNum == -1) { if (listNum == -1) {
output.append("\t• "); output.append("\t• ");
} else {
output.append("\t").append(Integer.toString(listNum)).append(". ");
listNum++;
}
} else { } else {
output.append('\n'); output.append("\t").append(Integer.toString(listNum)).append(". ");
listNum++;
} }
break; } else {
output.append('\n');
}
break;
} }
} }
} }

120
F-Droid/src/org/fdroid/fdroid/data/Apk.java
View File

@ -64,66 +64,66 @@ public class Apk extends ValueObject implements Comparable<Apk> {
for (int i = 0; i < cursor.getColumnCount(); i++) { for (int i = 0; i < cursor.getColumnCount(); i++) {
String column = cursor.getColumnName(i); String column = cursor.getColumnName(i);
switch (cursor.getColumnName(i)) { switch (cursor.getColumnName(i)) {
case ApkProvider.DataColumns.HASH: case ApkProvider.DataColumns.HASH:
hash = cursor.getString(i); hash = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.HASH_TYPE: case ApkProvider.DataColumns.HASH_TYPE:
hashType = cursor.getString(i); hashType = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.ADDED_DATE: case ApkProvider.DataColumns.ADDED_DATE:
added = ValueObject.toDate(cursor.getString(i)); added = ValueObject.toDate(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.FEATURES: case ApkProvider.DataColumns.FEATURES:
features = Utils.CommaSeparatedList.make(cursor.getString(i)); features = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.APK_ID: case ApkProvider.DataColumns.APK_ID:
id = cursor.getString(i); id = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.IS_COMPATIBLE: case ApkProvider.DataColumns.IS_COMPATIBLE:
compatible = cursor.getInt(i) == 1; compatible = cursor.getInt(i) == 1;
break; break;
case ApkProvider.DataColumns.MIN_SDK_VERSION: case ApkProvider.DataColumns.MIN_SDK_VERSION:
minSdkVersion = cursor.getInt(i); minSdkVersion = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.MAX_SDK_VERSION: case ApkProvider.DataColumns.MAX_SDK_VERSION:
maxSdkVersion = cursor.getInt(i); maxSdkVersion = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.NAME: case ApkProvider.DataColumns.NAME:
apkName = cursor.getString(i); apkName = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.PERMISSIONS: case ApkProvider.DataColumns.PERMISSIONS:
permissions = Utils.CommaSeparatedList.make(cursor.getString(i)); permissions = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.NATIVE_CODE: case ApkProvider.DataColumns.NATIVE_CODE:
nativecode = Utils.CommaSeparatedList.make(cursor.getString(i)); nativecode = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.INCOMPATIBLE_REASONS: case ApkProvider.DataColumns.INCOMPATIBLE_REASONS:
incompatible_reasons = Utils.CommaSeparatedList.make(cursor.getString(i)); incompatible_reasons = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.REPO_ID: case ApkProvider.DataColumns.REPO_ID:
repo = cursor.getInt(i); repo = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.SIGNATURE: case ApkProvider.DataColumns.SIGNATURE:
sig = cursor.getString(i); sig = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.SIZE: case ApkProvider.DataColumns.SIZE:
size = cursor.getInt(i); size = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.SOURCE_NAME: case ApkProvider.DataColumns.SOURCE_NAME:
srcname = cursor.getString(i); srcname = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.VERSION: case ApkProvider.DataColumns.VERSION:
version = cursor.getString(i); version = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.VERSION_CODE: case ApkProvider.DataColumns.VERSION_CODE:
vercode = cursor.getInt(i); vercode = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.REPO_VERSION: case ApkProvider.DataColumns.REPO_VERSION:
repoVersion = cursor.getInt(i); repoVersion = cursor.getInt(i);
break; break;
case ApkProvider.DataColumns.REPO_ADDRESS: case ApkProvider.DataColumns.REPO_ADDRESS:
repoAddress = cursor.getString(i); repoAddress = cursor.getString(i);
break; break;
} }
} }
} }

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

@ -113,93 +113,93 @@ public class App extends ValueObject implements Comparable<App> {
for (int i = 0; i < cursor.getColumnCount(); i++) { for (int i = 0; i < cursor.getColumnCount(); i++) {
switch (cursor.getColumnName(i)) { switch (cursor.getColumnName(i)) {
case AppProvider.DataColumns.IS_COMPATIBLE: case AppProvider.DataColumns.IS_COMPATIBLE:
compatible = cursor.getInt(i) == 1; compatible = cursor.getInt(i) == 1;
break; break;
case AppProvider.DataColumns.APP_ID: case AppProvider.DataColumns.APP_ID:
id = cursor.getString(i); id = cursor.getString(i);
break; break;
case AppProvider.DataColumns.NAME: case AppProvider.DataColumns.NAME:
name = cursor.getString(i); name = cursor.getString(i);
break; break;
case AppProvider.DataColumns.SUMMARY: case AppProvider.DataColumns.SUMMARY:
summary = cursor.getString(i); summary = cursor.getString(i);
break; break;
case AppProvider.DataColumns.ICON: case AppProvider.DataColumns.ICON:
icon = cursor.getString(i); icon = cursor.getString(i);
break; break;
case AppProvider.DataColumns.DESCRIPTION: case AppProvider.DataColumns.DESCRIPTION:
description = cursor.getString(i); description = cursor.getString(i);
break; break;
case AppProvider.DataColumns.LICENSE: case AppProvider.DataColumns.LICENSE:
license = cursor.getString(i); license = cursor.getString(i);
break; break;
case AppProvider.DataColumns.WEB_URL: case AppProvider.DataColumns.WEB_URL:
webURL = cursor.getString(i); webURL = cursor.getString(i);
break; break;
case AppProvider.DataColumns.TRACKER_URL: case AppProvider.DataColumns.TRACKER_URL:
trackerURL = cursor.getString(i); trackerURL = cursor.getString(i);
break; break;
case AppProvider.DataColumns.SOURCE_URL: case AppProvider.DataColumns.SOURCE_URL:
sourceURL = cursor.getString(i); sourceURL = cursor.getString(i);
break; break;
case AppProvider.DataColumns.DONATE_URL: case AppProvider.DataColumns.DONATE_URL:
donateURL = cursor.getString(i); donateURL = cursor.getString(i);
break; break;
case AppProvider.DataColumns.BITCOIN_ADDR: case AppProvider.DataColumns.BITCOIN_ADDR:
bitcoinAddr = cursor.getString(i); bitcoinAddr = cursor.getString(i);
break; break;
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: case AppProvider.DataColumns.DOGECOIN_ADDR:
dogecoinAddr = cursor.getString(i); dogecoinAddr = cursor.getString(i);
break; break;
case AppProvider.DataColumns.FLATTR_ID: case AppProvider.DataColumns.FLATTR_ID:
flattrID = cursor.getString(i); flattrID = cursor.getString(i);
break; break;
case AppProvider.DataColumns.SuggestedApk.VERSION: case AppProvider.DataColumns.SuggestedApk.VERSION:
suggestedVersion = cursor.getString(i); suggestedVersion = cursor.getString(i);
break; break;
case AppProvider.DataColumns.SUGGESTED_VERSION_CODE: case AppProvider.DataColumns.SUGGESTED_VERSION_CODE:
suggestedVercode = cursor.getInt(i); suggestedVercode = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.UPSTREAM_VERSION_CODE: case AppProvider.DataColumns.UPSTREAM_VERSION_CODE:
upstreamVercode = cursor.getInt(i); upstreamVercode = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.UPSTREAM_VERSION: case AppProvider.DataColumns.UPSTREAM_VERSION:
upstreamVersion = cursor.getString(i); upstreamVersion = cursor.getString(i);
break; break;
case AppProvider.DataColumns.ADDED: case AppProvider.DataColumns.ADDED:
added = ValueObject.toDate(cursor.getString(i)); added = ValueObject.toDate(cursor.getString(i));
break; break;
case AppProvider.DataColumns.LAST_UPDATED: case AppProvider.DataColumns.LAST_UPDATED:
lastUpdated = ValueObject.toDate(cursor.getString(i)); lastUpdated = ValueObject.toDate(cursor.getString(i));
break; break;
case AppProvider.DataColumns.CATEGORIES: case AppProvider.DataColumns.CATEGORIES:
categories = Utils.CommaSeparatedList.make(cursor.getString(i)); categories = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case AppProvider.DataColumns.ANTI_FEATURES: case AppProvider.DataColumns.ANTI_FEATURES:
antiFeatures = Utils.CommaSeparatedList.make(cursor.getString(i)); antiFeatures = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case AppProvider.DataColumns.REQUIREMENTS: case AppProvider.DataColumns.REQUIREMENTS:
requirements = Utils.CommaSeparatedList.make(cursor.getString(i)); requirements = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case AppProvider.DataColumns.IGNORE_ALLUPDATES: case AppProvider.DataColumns.IGNORE_ALLUPDATES:
ignoreAllUpdates = cursor.getInt(i) == 1; ignoreAllUpdates = cursor.getInt(i) == 1;
break; break;
case AppProvider.DataColumns.IGNORE_THISUPDATE: case AppProvider.DataColumns.IGNORE_THISUPDATE:
ignoreThisUpdate = cursor.getInt(i); ignoreThisUpdate = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.ICON_URL: case AppProvider.DataColumns.ICON_URL:
iconUrl = cursor.getString(i); iconUrl = cursor.getString(i);
break; break;
case AppProvider.DataColumns.InstalledApp.VERSION_CODE: case AppProvider.DataColumns.InstalledApp.VERSION_CODE:
installedVersionCode = cursor.getInt(i); installedVersionCode = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.InstalledApp.VERSION_NAME: case AppProvider.DataColumns.InstalledApp.VERSION_NAME:
installedVersionName = cursor.getString(i); installedVersionName = cursor.getString(i);
break; break;
} }
} }
} }

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

@ -315,24 +315,24 @@ public class AppProvider extends FDroidProvider {
@Override @Override
public void addField(String field) { public void addField(String field) {
switch (field) { switch (field) {
case DataColumns.SuggestedApk.VERSION: case DataColumns.SuggestedApk.VERSION:
addSuggestedApkVersionField(); addSuggestedApkVersionField();
break; break;
case DataColumns.InstalledApp.VERSION_NAME: case DataColumns.InstalledApp.VERSION_NAME:
addInstalledAppVersionName(); addInstalledAppVersionName();
break; break;
case DataColumns.InstalledApp.VERSION_CODE: case DataColumns.InstalledApp.VERSION_CODE:
addInstalledAppVersionCode(); addInstalledAppVersionCode();
break; break;
case DataColumns._COUNT: case DataColumns._COUNT:
appendCountField(); appendCountField();
break; break;
default: default:
if (field.equals(DataColumns.CATEGORIES)) { if (field.equals(DataColumns.CATEGORIES)) {
categoryFieldAdded = true; categoryFieldAdded = true;
} }
appendField(field, "fdroid_app"); appendField(field, "fdroid_app");
break; break;
} }
} }
@ -648,65 +648,65 @@ public class AppProvider extends FDroidProvider {
boolean includeSwap = true; boolean includeSwap = true;
switch (matcher.match(uri)) { switch (matcher.match(uri)) {
case CODE_LIST: case CODE_LIST:
includeSwap = false; includeSwap = false;
break; break;
case CODE_SINGLE: case CODE_SINGLE:
selection = selection.add(querySingle(uri.getLastPathSegment())); selection = selection.add(querySingle(uri.getLastPathSegment()));
break; break;
case CAN_UPDATE: case CAN_UPDATE:
selection = selection.add(queryCanUpdate()); selection = selection.add(queryCanUpdate());
includeSwap = false; includeSwap = false;
break; break;
case REPO: case REPO:
selection = selection.add(queryRepo(Long.parseLong(uri.getLastPathSegment()))); selection = selection.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
break; break;
case INSTALLED: case INSTALLED:
selection = selection.add(queryInstalled()); selection = selection.add(queryInstalled());
includeSwap = false; includeSwap = false;
break; break;
case SEARCH: case SEARCH:
selection = selection.add(querySearch(uri.getLastPathSegment())); selection = selection.add(querySearch(uri.getLastPathSegment()));
includeSwap = false; includeSwap = false;
break; break;
case NO_APKS: case NO_APKS:
selection = selection.add(queryNoApks()); selection = selection.add(queryNoApks());
break; break;
case APPS: case APPS:
selection = selection.add(queryApps(uri.getLastPathSegment())); selection = selection.add(queryApps(uri.getLastPathSegment()));
break; break;
case IGNORED: case IGNORED:
selection = selection.add(queryIgnored()); selection = selection.add(queryIgnored());
break; break;
case CATEGORY: case CATEGORY:
selection = selection.add(queryCategory(uri.getLastPathSegment())); selection = selection.add(queryCategory(uri.getLastPathSegment()));
includeSwap = false; includeSwap = false;
break; break;
case RECENTLY_UPDATED: case RECENTLY_UPDATED:
sortOrder = " fdroid_app.lastUpdated DESC"; sortOrder = " fdroid_app.lastUpdated DESC";
selection = selection.add(queryRecentlyUpdated()); selection = selection.add(queryRecentlyUpdated());
includeSwap = false; includeSwap = false;
break; break;
case NEWLY_ADDED: case NEWLY_ADDED:
sortOrder = " fdroid_app.added DESC"; sortOrder = " fdroid_app.added DESC";
selection = selection.add(queryNewlyAdded()); selection = selection.add(queryNewlyAdded());
includeSwap = false; includeSwap = false;
break; break;
default: default:
Log.e(TAG, "Invalid URI for app content provider: " + uri); Log.e(TAG, "Invalid URI for app content provider: " + uri);
throw new UnsupportedOperationException("Invalid URI for app content provider: " + uri); throw new UnsupportedOperationException("Invalid URI for app content provider: " + uri);
} }
if (!includeSwap) { if (!includeSwap) {
@ -732,12 +732,12 @@ public class AppProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (matcher.match(uri)) {
case NO_APKS: case NO_APKS:
query = query.add(queryNoApks()); query = query.add(queryNoApks());
break; break;
default: default:
throw new UnsupportedOperationException("Delete not supported for " + uri + "."); throw new UnsupportedOperationException("Delete not supported for " + uri + ".");
} }
@ -760,16 +760,16 @@ public class AppProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (matcher.match(uri)) {
case CALC_APP_DETAILS_FROM_INDEX: case CALC_APP_DETAILS_FROM_INDEX:
updateAppDetails(); updateAppDetails();
return 0; return 0;
case CODE_SINGLE: case CODE_SINGLE:
query = query.add(querySingle(uri.getLastPathSegment())); query = query.add(querySingle(uri.getLastPathSegment()));
break; break;
default: default:
throw new UnsupportedOperationException("Update not supported for " + uri + "."); throw new UnsupportedOperationException("Update not supported for " + uri + ".");
} }
int count = write().update(getTableName(), values, query.getSelection(), query.getArgs()); int count = write().update(getTableName(), values, query.getSelection(), query.getArgs());

78
F-Droid/src/org/fdroid/fdroid/data/Repo.java
View File

@ -42,45 +42,45 @@ public class Repo extends ValueObject {
for (int i = 0; i < cursor.getColumnCount(); i++) { for (int i = 0; i < cursor.getColumnCount(); i++) {
switch (cursor.getColumnName(i)) { switch (cursor.getColumnName(i)) {
case RepoProvider.DataColumns._ID: case RepoProvider.DataColumns._ID:
id = cursor.getInt(i); id = cursor.getInt(i);
break; break;
case RepoProvider.DataColumns.LAST_ETAG: case RepoProvider.DataColumns.LAST_ETAG:
lastetag = cursor.getString(i); lastetag = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.ADDRESS: case RepoProvider.DataColumns.ADDRESS:
address = cursor.getString(i); address = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.DESCRIPTION: case RepoProvider.DataColumns.DESCRIPTION:
description = cursor.getString(i); description = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.FINGERPRINT: case RepoProvider.DataColumns.FINGERPRINT:
fingerprint = cursor.getString(i); fingerprint = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.IN_USE: case RepoProvider.DataColumns.IN_USE:
inuse = cursor.getInt(i) == 1; inuse = cursor.getInt(i) == 1;
break; break;
case RepoProvider.DataColumns.LAST_UPDATED: case RepoProvider.DataColumns.LAST_UPDATED:
lastUpdated = toDate(cursor.getString(i)); lastUpdated = toDate(cursor.getString(i));
break; break;
case RepoProvider.DataColumns.MAX_AGE: case RepoProvider.DataColumns.MAX_AGE:
maxage = cursor.getInt(i); maxage = cursor.getInt(i);
break; break;
case RepoProvider.DataColumns.VERSION: case RepoProvider.DataColumns.VERSION:
version = cursor.getInt(i); version = cursor.getInt(i);
break; break;
case RepoProvider.DataColumns.NAME: case RepoProvider.DataColumns.NAME:
name = cursor.getString(i); name = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.PUBLIC_KEY: case RepoProvider.DataColumns.PUBLIC_KEY:
pubkey = cursor.getString(i); pubkey = cursor.getString(i);
break; break;
case RepoProvider.DataColumns.PRIORITY: case RepoProvider.DataColumns.PRIORITY:
priority = cursor.getInt(i); priority = cursor.getInt(i);
break; break;
case RepoProvider.DataColumns.IS_SWAP: case RepoProvider.DataColumns.IS_SWAP:
isSwap = cursor.getInt(i) == 1; isSwap = cursor.getInt(i) == 1;
break; break;
} }
} }
} }

12
F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java
View File

@ -201,12 +201,12 @@ public class ApkDownloader implements AsyncDownloadWrapper.Listener {
private void sendProgressEvent(Event event) { private void sendProgressEvent(Event event) {
switch (event.type) { switch (event.type) {
case Downloader.EVENT_PROGRESS: case Downloader.EVENT_PROGRESS:
// Keep a copy of these ourselves, so people can interrogate us for the // Keep a copy of these ourselves, so people can interrogate us for the
// info (in addition to receiving events with the info). // info (in addition to receiving events with the info).
totalSize = event.total; totalSize = event.total;
progress = event.progress; progress = event.progress;
break; break;
} }
event.getData().putLong(EVENT_SOURCE_ID, id); event.getData().putLong(EVENT_SOURCE_ID, id);

48
F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -188,21 +188,21 @@ public class ManageReposActivity extends ActionBarActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
Intent destIntent = new Intent(this, FDroid.class); Intent destIntent = new Intent(this, FDroid.class);
markChangedIfRequired(destIntent); markChangedIfRequired(destIntent);
setResult(RESULT_OK, destIntent); setResult(RESULT_OK, destIntent);
NavUtils.navigateUpTo(this, destIntent); NavUtils.navigateUpTo(this, destIntent);
return true; return true;
case R.id.action_add_repo: case R.id.action_add_repo:
showAddRepo(); showAddRepo();
return true; return true;
case R.id.action_update_repo: case R.id.action_update_repo:
updateRepos(); updateRepos();
return true; return true;
case R.id.action_find_local_repos: case R.id.action_find_local_repos:
scanForRepos(); scanForRepos();
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@ -213,15 +213,15 @@ public class ManageReposActivity extends ActionBarActivity {
@Override @Override
public void onProgress(Event event) { public void onProgress(Event event) {
switch (event.type) { switch (event.type) {
case UpdateService.EVENT_COMPLETE_AND_SAME: case UpdateService.EVENT_COMPLETE_AND_SAME:
case UpdateService.EVENT_COMPLETE_WITH_CHANGES: case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
// No need to prompt to update any more, we just // No need to prompt to update any more, we just
// did it! // did it!
changed = false; changed = false;
break; break;
case UpdateService.EVENT_FINISHED: case UpdateService.EVENT_FINISHED:
updateHandler = null; updateHandler = null;
break; break;
} }
} }
}); });

170
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
View File

@ -68,110 +68,110 @@ public class PreferenceFragment
int result = 0; int result = 0;
switch (key) { switch (key) {
case Preferences.PREF_UPD_INTERVAL: case Preferences.PREF_UPD_INTERVAL:
ListPreference listPref = (ListPreference)findPreference( ListPreference listPref = (ListPreference)findPreference(
Preferences.PREF_UPD_INTERVAL); Preferences.PREF_UPD_INTERVAL);
int interval = Integer.parseInt(listPref.getValue()); int interval = Integer.parseInt(listPref.getValue());
Preference onlyOnWifi = findPreference( Preference onlyOnWifi = findPreference(
Preferences.PREF_UPD_WIFI_ONLY); Preferences.PREF_UPD_WIFI_ONLY);
onlyOnWifi.setEnabled(interval > 0); onlyOnWifi.setEnabled(interval > 0);
if (interval == 0) { if (interval == 0) {
listPref.setSummary(R.string.update_interval_zero); listPref.setSummary(R.string.update_interval_zero);
} else { } else {
listPref.setSummary(listPref.getEntry()); listPref.setSummary(listPref.getEntry());
} }
break; break;
case Preferences.PREF_UPD_WIFI_ONLY: case Preferences.PREF_UPD_WIFI_ONLY:
checkSummary(key, R.string.automatic_scan_wifi_on); checkSummary(key, R.string.automatic_scan_wifi_on);
break; break;
case Preferences.PREF_UPD_NOTIFY: case Preferences.PREF_UPD_NOTIFY:
checkSummary(key, R.string.notify_on); checkSummary(key, R.string.notify_on);
break; break;
case Preferences.PREF_UPD_HISTORY: case Preferences.PREF_UPD_HISTORY:
textSummary(key, R.string.update_history_summ); textSummary(key, R.string.update_history_summ);
break; break;
case Preferences.PREF_PERMISSIONS: case Preferences.PREF_PERMISSIONS:
checkSummary(key, R.string.showPermissions_on); checkSummary(key, R.string.showPermissions_on);
break; break;
case Preferences.PREF_COMPACT_LAYOUT: case Preferences.PREF_COMPACT_LAYOUT:
checkSummary(key, R.string.compactlayout_on); checkSummary(key, R.string.compactlayout_on);
break; break;
case Preferences.PREF_THEME: case Preferences.PREF_THEME:
entrySummary(key); entrySummary(key);
if (changing) { if (changing) {
result |= PreferencesActivity.RESULT_RESTART; result |= PreferencesActivity.RESULT_RESTART;
getActivity().setResult(result); getActivity().setResult(result);
} }
break; break;
case Preferences.PREF_INCOMP_VER: case Preferences.PREF_INCOMP_VER:
checkSummary(key, R.string.show_incompat_versions_on); checkSummary(key, R.string.show_incompat_versions_on);
break; break;
case Preferences.PREF_ROOTED: case Preferences.PREF_ROOTED:
checkSummary(key, R.string.rooted_on); checkSummary(key, R.string.rooted_on);
break; break;
case Preferences.PREF_IGN_TOUCH: case Preferences.PREF_IGN_TOUCH:
checkSummary(key, R.string.ignoreTouch_on); checkSummary(key, R.string.ignoreTouch_on);
break; break;
case Preferences.PREF_LOCAL_REPO_BONJOUR: case Preferences.PREF_LOCAL_REPO_BONJOUR:
checkSummary(key, R.string.local_repo_bonjour_on); checkSummary(key, R.string.local_repo_bonjour_on);
break; break;
case Preferences.PREF_LOCAL_REPO_NAME: case Preferences.PREF_LOCAL_REPO_NAME:
textSummary(key, R.string.local_repo_name_summary); textSummary(key, R.string.local_repo_name_summary);
break; break;
case Preferences.PREF_LOCAL_REPO_HTTPS: case Preferences.PREF_LOCAL_REPO_HTTPS:
checkSummary(key, R.string.local_repo_https_on); checkSummary(key, R.string.local_repo_https_on);
break; break;
case Preferences.PREF_CACHE_APK: case Preferences.PREF_CACHE_APK:
checkSummary(key, R.string.cache_downloaded_on); checkSummary(key, R.string.cache_downloaded_on);
break; break;
case Preferences.PREF_EXPERT: case Preferences.PREF_EXPERT:
checkSummary(key, R.string.expert_on); checkSummary(key, R.string.expert_on);
break; break;
case Preferences.PREF_ROOT_INSTALLER: case Preferences.PREF_ROOT_INSTALLER:
checkSummary(key, R.string.root_installer_on); checkSummary(key, R.string.root_installer_on);
break; break;
case Preferences.PREF_SYSTEM_INSTALLER: case Preferences.PREF_SYSTEM_INSTALLER:
checkSummary(key, R.string.system_installer_on); checkSummary(key, R.string.system_installer_on);
break; break;
case Preferences.PREF_ENABLE_PROXY: case Preferences.PREF_ENABLE_PROXY:
CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key); CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key);
checkPref.setSummary(R.string.enable_proxy_summary); checkPref.setSummary(R.string.enable_proxy_summary);
break; break;
case Preferences.PREF_PROXY_HOST: case Preferences.PREF_PROXY_HOST:
EditTextPreference textPref = (EditTextPreference) findPreference(key); EditTextPreference textPref = (EditTextPreference) findPreference(key);
String text = Preferences.get().getProxyHost(); String text = Preferences.get().getProxyHost();
if (TextUtils.isEmpty(text) || text.equals(Preferences.DEFAULT_PROXY_HOST)) if (TextUtils.isEmpty(text) || text.equals(Preferences.DEFAULT_PROXY_HOST))
textPref.setSummary(R.string.proxy_host_summary); textPref.setSummary(R.string.proxy_host_summary);
else else
textPref.setSummary(text); textPref.setSummary(text);
break; break;
case Preferences.PREF_PROXY_PORT: case Preferences.PREF_PROXY_PORT:
EditTextPreference textPref2 = (EditTextPreference) findPreference(key); EditTextPreference textPref2 = (EditTextPreference) findPreference(key);
int port = Preferences.get().getProxyPort(); int port = Preferences.get().getProxyPort();
if (port == Preferences.DEFAULT_PROXY_PORT) if (port == Preferences.DEFAULT_PROXY_PORT)
textPref2.setSummary(R.string.proxy_port_summary); textPref2.setSummary(R.string.proxy_port_summary);
else else
textPref2.setSummary(String.valueOf(port)); textPref2.setSummary(String.valueOf(port));
break; break;
} }
} }

34
F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
View File

@ -230,13 +230,13 @@ public class RepoDetailsFragment extends Fragment {
@Override @Override
public void onProgress(Event event) { public void onProgress(Event event) {
switch (event.type) { switch (event.type) {
case UpdateService.EVENT_COMPLETE_WITH_CHANGES: case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
repo = loadRepoDetails(); repo = loadRepoDetails();
updateView((ViewGroup)getView()); updateView((ViewGroup)getView());
break; break;
case UpdateService.EVENT_FINISHED: case UpdateService.EVENT_FINISHED:
updateHandler = null; updateHandler = null;
break; break;
} }
} }
}); });
@ -321,16 +321,16 @@ public class RepoDetailsFragment extends Fragment {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case DELETE: case DELETE:
promptForDelete(); promptForDelete();
return true; return true;
case UPDATE: case UPDATE:
performUpdate(); performUpdate();
return true; return true;
case ENABLE_NFC: case ENABLE_NFC:
Intent intent = new Intent(getActivity(), NfcNotEnabledActivity.class); Intent intent = new Intent(getActivity(), NfcNotEnabledActivity.class);
startActivity(intent); startActivity(intent);
return true; return true;
} }
return false; return false;

28
F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
View File

@ -107,19 +107,19 @@ public class ConfirmReceiveSwapFragment extends Fragment implements ProgressList
// know what we are up to. // know what we are up to.
switch (event.type) { switch (event.type) {
case UpdateService.EVENT_COMPLETE_AND_SAME: case UpdateService.EVENT_COMPLETE_AND_SAME:
case UpdateService.EVENT_COMPLETE_WITH_CHANGES: case UpdateService.EVENT_COMPLETE_WITH_CHANGES:
((ConnectSwapActivity)getActivity()).onRepoUpdated(repo); ((ConnectSwapActivity)getActivity()).onRepoUpdated(repo);
/*Intent intent = new Intent(); /*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. 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); getActivity().setResult(Activity.RESULT_OK, intent);
finish();*/ finish();*/
break; break;
case UpdateService.EVENT_ERROR: case UpdateService.EVENT_ERROR:
// TODO: Show message on this screen (with a big "okay" button that goes back to F-Droid activity) // TODO: Show message on this screen (with a big "okay" button that goes back to F-Droid activity)
// rather than finishing directly. // rather than finishing directly.
finish(); finish();
break; break;
} }
} }
} }

44
F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
View File

@ -38,12 +38,12 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
@Override @Override
public void onBackPressed() { public void onBackPressed() {
switch (currentState()) { switch (currentState()) {
case STATE_START_SWAP: case STATE_START_SWAP:
finish(); finish();
break; break;
default: default:
super.onBackPressed(); super.onBackPressed();
break; break;
} }
} }
@ -54,23 +54,23 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
public void nextStep() { public void nextStep() {
switch (currentState()) { switch (currentState()) {
case STATE_START_SWAP: case STATE_START_SWAP:
showSelectApps(); showSelectApps();
break; break;
case STATE_SELECT_APPS: case STATE_SELECT_APPS:
prepareLocalRepo(); prepareLocalRepo();
break; break;
case STATE_JOIN_WIFI: case STATE_JOIN_WIFI:
ensureLocalRepoRunning(); ensureLocalRepoRunning();
if (!attemptToShowNfc()) { if (!attemptToShowNfc()) {
showWifiQr();
}
break;
case STATE_NFC:
showWifiQr(); showWifiQr();
break; }
case STATE_WIFI_QR: break;
break; case STATE_NFC:
showWifiQr();
break;
case STATE_WIFI_QR:
break;
} }
supportInvalidateOptionsMenu(); supportInvalidateOptionsMenu();
} }