diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java index 6c7ab3da3..a59ca820e 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java @@ -500,11 +500,6 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog return !TextUtils.isEmpty(mActiveDownloadUrlString); } - @Override - public boolean isAppInstalled() { - return mApp.isInstalled(); - } - @Override public void enableAndroidBeam() { NfcHelper.setAndroidBeam(this, mApp.packageName); diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 947fdb430..de042e4be 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -56,7 +56,6 @@ public class AppDetailsRecyclerViewAdapter public interface AppDetailsRecyclerViewAdapterCallbacks { boolean isAppDownloading(); - boolean isAppInstalled(); void enableAndroidBeam(); void disableAndroidBeam(); void openUrl(String url); @@ -248,21 +247,21 @@ public class AppDetailsRecyclerViewAdapter } }); 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.buttonPrimaryView.setText(R.string.menu_install); vh.buttonPrimaryView.setVisibility(mVersions.size() > 0 ? View.VISIBLE : View.GONE); if (mCallbacks.isAppDownloading()) { vh.buttonPrimaryView.setText(R.string.downloading); 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. mCallbacks.disableAndroidBeam(); // Set Install button and hide second button vh.buttonPrimaryView.setText(R.string.menu_install); vh.buttonPrimaryView.setOnClickListener(mOnInstallClickListener); vh.buttonPrimaryView.setEnabled(true); - } else if (mCallbacks.isAppInstalled()) { + } else if (mApp.isInstalled()) { mCallbacks.enableAndroidBeam(); if (mApp.canAndWantToUpdate(mContext)) { vh.buttonPrimaryView.setText(R.string.menu_upgrade);