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

Inline check for 'isInstalled()'.

Browse Source 
The adapter has its own copy of the `App`, and so can ask directly
instead of delegating to the activity.
This commit is contained in:
Peter Serwylo 2016-12-01 11:05:08 +11:00
parent 6e0ea68bab
commit 0847bb6008
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/AppDetails2.java
View File

@ -500,11 +500,6 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
return !TextUtils.isEmpty(mActiveDownloadUrlString); return !TextUtils.isEmpty(mActiveDownloadUrlString);
} }
@Override
public boolean isAppInstalled() {
return mApp.isInstalled();
}
@Override @Override
public void enableAndroidBeam() { public void enableAndroidBeam() {
NfcHelper.setAndroidBeam(this, mApp.packageName); NfcHelper.setAndroidBeam(this, mApp.packageName);

7
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -56,7 +56,6 @@ public class AppDetailsRecyclerViewAdapter
public interface AppDetailsRecyclerViewAdapterCallbacks { public interface AppDetailsRecyclerViewAdapterCallbacks {
boolean isAppDownloading(); boolean isAppDownloading();
boolean isAppInstalled();
void enableAndroidBeam(); void enableAndroidBeam();
void disableAndroidBeam(); void disableAndroidBeam();
void openUrl(String url); void openUrl(String url);
@ -248,21 +247,21 @@ public class AppDetailsRecyclerViewAdapter
} }
}); });
vh.buttonSecondaryView.setText(R.string.menu_uninstall); vh.buttonSecondaryView.setText(R.string.menu_uninstall);
vh.buttonSecondaryView.setVisibility(mCallbacks.isAppInstalled() ? View.VISIBLE : View.INVISIBLE); vh.buttonSecondaryView.setVisibility(mApp.isInstalled() ? View.VISIBLE : View.INVISIBLE);
vh.buttonSecondaryView.setOnClickListener(mOnUnInstallClickListener); vh.buttonSecondaryView.setOnClickListener(mOnUnInstallClickListener);
vh.buttonPrimaryView.setText(R.string.menu_install); vh.buttonPrimaryView.setText(R.string.menu_install);
vh.buttonPrimaryView.setVisibility(mVersions.size() > 0 ? View.VISIBLE : View.GONE); vh.buttonPrimaryView.setVisibility(mVersions.size() > 0 ? View.VISIBLE : View.GONE);
if (mCallbacks.isAppDownloading()) { if (mCallbacks.isAppDownloading()) {
vh.buttonPrimaryView.setText(R.string.downloading); vh.buttonPrimaryView.setText(R.string.downloading);
vh.buttonPrimaryView.setEnabled(false); vh.buttonPrimaryView.setEnabled(false);
} else if (!mCallbacks.isAppInstalled() && mApp.suggestedVersionCode > 0 && mVersions.size() > 0) { } else if (!mApp.isInstalled() && mApp.suggestedVersionCode > 0 && mVersions.size() > 0) {
// Check count > 0 due to incompatible apps resulting in an empty list. // Check count > 0 due to incompatible apps resulting in an empty list.
mCallbacks.disableAndroidBeam(); mCallbacks.disableAndroidBeam();
// Set Install button and hide second button // Set Install button and hide second button
vh.buttonPrimaryView.setText(R.string.menu_install); vh.buttonPrimaryView.setText(R.string.menu_install);
vh.buttonPrimaryView.setOnClickListener(mOnInstallClickListener); vh.buttonPrimaryView.setOnClickListener(mOnInstallClickListener);
vh.buttonPrimaryView.setEnabled(true); vh.buttonPrimaryView.setEnabled(true);
} else if (mCallbacks.isAppInstalled()) { } else if (mApp.isInstalled()) {
mCallbacks.enableAndroidBeam(); mCallbacks.enableAndroidBeam();
if (mApp.canAndWantToUpdate(mContext)) { if (mApp.canAndWantToUpdate(mContext)) {
vh.buttonPrimaryView.setText(R.string.menu_upgrade); vh.buttonPrimaryView.setText(R.string.menu_upgrade);