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

Deduplicate getApp() getter madness

Browse Source 
Not that it's any more efficient, but it's surely more readable.
This commit is contained in:
Daniel Martí 2015-10-23 12:35:05 +02:00
parent 8b114326f5
commit 56d9ccd737
1 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1153,30 +1153,31 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
private final View.OnClickListener mOnClickListener = new View.OnClickListener() { private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
String url = null; String url = null;
App app = getApp();
switch (v.getId()) { switch (v.getId()) {
case R.id.website: case R.id.website:
url = getApp().webURL; url = app.webURL;
break; break;
case R.id.source: case R.id.source:
url = getApp().sourceURL; url = app.sourceURL;
break; break;
case R.id.issues: case R.id.issues:
url = getApp().trackerURL; url = app.trackerURL;
break; break;
case R.id.changelog: case R.id.changelog:
url = getApp().changelogURL; url = app.changelogURL;
break; break;
case R.id.donate: case R.id.donate:
url = getApp().donateURL; url = app.donateURL;
break; break;
case R.id.bitcoin: case R.id.bitcoin:
url = "bitcoin:" + getApp().bitcoinAddr; url = "bitcoin:" + app.bitcoinAddr;
break; break;
case R.id.litecoin: case R.id.litecoin:
url = "litecoin:" + getApp().litecoinAddr; url = "litecoin:" + app.litecoinAddr;
break; break;
case R.id.flattr: case R.id.flattr:
url = "https://flattr.com/thing/" + getApp().flattrID; url = "https://flattr.com/thing/" + app.flattrID;
break; break;
} }
if (url != null) { if (url != null) {
@ -1202,9 +1203,10 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
}; };
private void setupView(final View view) { private void setupView(final View view) {
App app = getApp();
// Expandable description // Expandable description
final TextView description = (TextView) view.findViewById(R.id.description); final TextView description = (TextView) view.findViewById(R.id.description);
final Spanned desc = Html.fromHtml(getApp().description, null, new Utils.HtmlTagHandler()); final Spanned desc = Html.fromHtml(app.description, null, new Utils.HtmlTagHandler());
description.setMovementMethod(SafeLinkMovementMethod.getInstance(getActivity())); description.setMovementMethod(SafeLinkMovementMethod.getInstance(getActivity()));
description.setText(trimNewlines(desc)); description.setText(trimNewlines(desc));
final View viewMoreDescription = view.findViewById(R.id.view_more_description); final View viewMoreDescription = view.findViewById(R.id.view_more_description);
@ -1231,13 +1233,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
// App ID // App ID
final TextView appIdView = (TextView) view.findViewById(R.id.appid); final TextView appIdView = (TextView) view.findViewById(R.id.appid);
if (prefs.expertMode()) if (prefs.expertMode())
appIdView.setText(getApp().id); appIdView.setText(app.id);
else else
appIdView.setVisibility(View.GONE); appIdView.setVisibility(View.GONE);
// Summary // Summary
final TextView summaryView = (TextView) view.findViewById(R.id.summary); final TextView summaryView = (TextView) view.findViewById(R.id.summary);
summaryView.setText(getApp().summary); summaryView.setText(app.summary);
layoutLinks = (ViewGroup) view.findViewById(R.id.ll_information); layoutLinks = (ViewGroup) view.findViewById(R.id.ll_information);
@ -1248,71 +1250,71 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
// Website button // Website button
View tv = view.findViewById(R.id.website); View tv = view.findViewById(R.id.website);
if (!TextUtils.isEmpty(getApp().webURL)) if (!TextUtils.isEmpty(app.webURL))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Source button // Source button
tv = view.findViewById(R.id.source); tv = view.findViewById(R.id.source);
if (!TextUtils.isEmpty(getApp().sourceURL)) if (!TextUtils.isEmpty(app.sourceURL))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Issues button // Issues button
tv = view.findViewById(R.id.issues); tv = view.findViewById(R.id.issues);
if (!TextUtils.isEmpty(getApp().trackerURL)) if (!TextUtils.isEmpty(app.trackerURL))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Changelog button // Changelog button
tv = view.findViewById(R.id.changelog); tv = view.findViewById(R.id.changelog);
if (!TextUtils.isEmpty(getApp().changelogURL)) if (!TextUtils.isEmpty(app.changelogURL))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Donate button // Donate button
tv = view.findViewById(R.id.donate); tv = view.findViewById(R.id.donate);
if (!TextUtils.isEmpty(getApp().donateURL)) if (!TextUtils.isEmpty(app.donateURL))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Bitcoin // Bitcoin
tv = view.findViewById(R.id.bitcoin); tv = view.findViewById(R.id.bitcoin);
if (!TextUtils.isEmpty(getApp().bitcoinAddr)) if (!TextUtils.isEmpty(app.bitcoinAddr))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Litecoin // Litecoin
tv = view.findViewById(R.id.litecoin); tv = view.findViewById(R.id.litecoin);
if (!TextUtils.isEmpty(getApp().litecoinAddr)) if (!TextUtils.isEmpty(app.litecoinAddr))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Flattr // Flattr
tv = view.findViewById(R.id.flattr); tv = view.findViewById(R.id.flattr);
if (!TextUtils.isEmpty(getApp().flattrID)) if (!TextUtils.isEmpty(app.flattrID))
tv.setOnClickListener(mOnClickListener); tv.setOnClickListener(mOnClickListener);
else else
tv.setVisibility(View.GONE); tv.setVisibility(View.GONE);
// Categories TextView // Categories TextView
final TextView categories = (TextView) view.findViewById(R.id.categories); final TextView categories = (TextView) view.findViewById(R.id.categories);
if (prefs.expertMode() && getApp().categories != null) if (prefs.expertMode() && app.categories != null)
categories.setText(getApp().categories.toString().replaceAll(",", ", ")); categories.setText(app.categories.toString().replaceAll(",", ", "));
else else
categories.setVisibility(View.GONE); categories.setVisibility(View.GONE);
Apk curApk = null; Apk curApk = null;
for (int i = 0; i < getApks().getCount(); i++) { for (int i = 0; i < getApks().getCount(); i++) {
final Apk apk = getApks().getItem(i); final Apk apk = getApks().getItem(i);
if (apk.vercode == getApp().suggestedVercode) { if (apk.vercode == app.suggestedVercode) {
curApk = apk; curApk = apk;
break; break;
} }
@ -1334,9 +1336,9 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
// Anti features // Anti features
final TextView antiFeaturesView = (TextView) view.findViewById(R.id.antifeatures); final TextView antiFeaturesView = (TextView) view.findViewById(R.id.antifeatures);
if (getApp().antiFeatures != null) { if (app.antiFeatures != null) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (final String af : getApp().antiFeatures) { for (final String af : app.antiFeatures) {
final String afdesc = descAntiFeature(af); final String afdesc = descAntiFeature(af);
if (afdesc != null) { if (afdesc != null) {
sb.append("\t• ").append(afdesc).append('\n'); sb.append("\t• ").append(afdesc).append('\n');
@ -1463,15 +1465,16 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
} }
private void setupView(View view) { private void setupView(View view) {
App app = getApp();
// Set the icon... // Set the icon...
ImageView iv = (ImageView) view.findViewById(R.id.icon); ImageView iv = (ImageView) view.findViewById(R.id.icon);
ImageLoader.getInstance().displayImage(getApp().iconUrlLarge, iv, ImageLoader.getInstance().displayImage(app.iconUrlLarge, iv,
displayImageOptions); displayImageOptions);
// Set the title // Set the title
TextView tv = (TextView) view.findViewById(R.id.title); TextView tv = (TextView) view.findViewById(R.id.title);
tv.setText(getApp().name); tv.setText(app.name);
btMain = (Button) view.findViewById(R.id.btn_main); btMain = (Button) view.findViewById(R.id.btn_main);
progressBar = (ProgressBar) view.findViewById(R.id.progress_bar); progressBar = (ProgressBar) view.findViewById(R.id.progress_bar);
@ -1565,6 +1568,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
} }
public void updateViews(View view) { public void updateViews(View view) {
App app = getApp();
TextView statusView = (TextView) view.findViewById(R.id.status); TextView statusView = (TextView) view.findViewById(R.id.status);
btMain.setVisibility(View.VISIBLE); btMain.setVisibility(View.VISIBLE);
@ -1574,7 +1578,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
btMain.setEnabled(false); btMain.setEnabled(false);
// Check count > 0 due to incompatible apps resulting in an empty list. // Check count > 0 due to incompatible apps resulting in an empty list.
// If App isn't installed // If App isn't installed
} else if (!getApp().isInstalled() && getApp().suggestedVercode > 0 && } else if (!app.isInstalled() && app.suggestedVercode > 0 &&
activity.adapter.getCount() > 0) { activity.adapter.getCount() > 0) {
installed = false; installed = false;
statusView.setText(R.string.details_notinstalled); statusView.setText(R.string.details_notinstalled);
@ -1584,20 +1588,20 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
btMain.setOnClickListener(mOnClickListener); btMain.setOnClickListener(mOnClickListener);
btMain.setEnabled(true); btMain.setEnabled(true);
// If App is installed // If App is installed
} else if (getApp().isInstalled()) { } else if (app.isInstalled()) {
installed = true; installed = true;
statusView.setText(getString(R.string.details_installed, getApp().installedVersionName)); statusView.setText(getString(R.string.details_installed, app.installedVersionName));
NfcHelper.setAndroidBeam(activity, getApp().id); NfcHelper.setAndroidBeam(activity, app.id);
if (getApp().canAndWantToUpdate()) { if (app.canAndWantToUpdate()) {
updateWanted = true; updateWanted = true;
btMain.setText(R.string.menu_upgrade); btMain.setText(R.string.menu_upgrade);
} else { } else {
updateWanted = false; updateWanted = false;
if (activity.mPm.getLaunchIntentForPackage(getApp().id) != null) { if (activity.mPm.getLaunchIntentForPackage(app.id) != null) {
btMain.setText(R.string.menu_launch); btMain.setText(R.string.menu_launch);
} else { } else {
btMain.setText(R.string.menu_uninstall); btMain.setText(R.string.menu_uninstall);
if (!getApp().uninstallable) { if (!app.uninstallable) {
btMain.setVisibility(View.GONE); btMain.setVisibility(View.GONE);
} }
} }
@ -1617,10 +1621,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
private final View.OnClickListener mOnClickListener = new View.OnClickListener() { private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
App app = getApp();
AppDetails activity = (AppDetails) getActivity(); AppDetails activity = (AppDetails) getActivity();
if (updateWanted) { if (updateWanted) {
if (getApp().suggestedVercode > 0) { if (app.suggestedVercode > 0) {
final Apk apkToInstall = ApkProvider.Helper.find(activity, getApp().id, getApp().suggestedVercode); final Apk apkToInstall = ApkProvider.Helper.find(activity, app.id, app.suggestedVercode);
activity.install(apkToInstall); activity.install(apkToInstall);
return; return;
} }
@ -1628,16 +1633,16 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
// If installed // If installed
if (installed) { if (installed) {
// If "launchable", launch // If "launchable", launch
if (activity.mPm.getLaunchIntentForPackage(getApp().id) != null) { if (activity.mPm.getLaunchIntentForPackage(app.id) != null) {
activity.launchApk(getApp().id); activity.launchApk(app.id);
} else { } else {
activity.removeApk(getApp().id); activity.removeApk(app.id);
} }
// If not installed, install // If not installed, install
} else if (getApp().suggestedVercode > 0) { } else if (app.suggestedVercode > 0) {
btMain.setEnabled(false); btMain.setEnabled(false);
btMain.setText(R.string.system_install_installing); btMain.setText(R.string.system_install_installing);
final Apk apkToInstall = ApkProvider.Helper.find(activity, getApp().id, getApp().suggestedVercode); final Apk apkToInstall = ApkProvider.Helper.find(activity, app.id, app.suggestedVercode);
activity.install(apkToInstall); activity.install(apkToInstall);
} }
} }
@ -1701,10 +1706,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
@Override @Override
public void onListItemClick(ListView l, View v, int position, long id) { public void onListItemClick(ListView l, View v, int position, long id) {
App app = getApp();
final Apk apk = getApks().getItem(position - l.getHeaderViewsCount()); final Apk apk = getApks().getItem(position - l.getHeaderViewsCount());
if (getApp().installedVersionCode == apk.vercode) { if (app.installedVersionCode == apk.vercode) {
remove(); remove();
} else if (getApp().installedVersionCode > apk.vercode) { } else if (app.installedVersionCode > apk.vercode) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.installDowngrade); builder.setMessage(R.string.installDowngrade);
builder.setPositiveButton(R.string.yes, builder.setPositiveButton(R.string.yes,