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

Don't show "not installed" for apks installed from someplace else

Browse Source 
Fixes #107.
This commit is contained in:
Daniel Martí 2015-01-03 20:27:28 +01:00
parent 1405705fd5
commit d2ade5c69b
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/res/values/strings.xml
View File

@ -63,6 +63,8 @@
<string name="inst">Installed</string> <string name="inst">Installed</string>
<string name="not_inst">Not Installed</string> <string name="not_inst">Not Installed</string>
<string name="inst_known_source">Installed (from %s)</string>
<string name="inst_unknown_source">Installed (from unknown source)</string>
<string name="added_on">Added on %s</string> <string name="added_on">Added on %s</string>

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

@ -70,6 +70,7 @@ import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.App;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.InstalledAppProvider;
import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.installer.Installer; import org.fdroid.fdroid.installer.Installer;
@ -173,11 +174,31 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
} }
private String getInstalledStatus(final Apk apk) {
// Definitely not installed.
if (apk.vercode != app.installedVersionCode) {
return getString(R.string.not_inst);
}
// Definitely installed this version.
if (mInstalledSigID != null && apk.sig != null
&& apk.sig.equals(mInstalledSigID)) {
return getString(R.string.inst);
}
// Installed the same version, but from someplace else.
final String installerPkgName = mPm.getInstallerPackageName(app.id);
if (installerPkgName != null && installerPkgName.length() > 0) {
final String installerLabel = InstalledAppProvider
.getApplicationLabel(mctx, installerPkgName);
return getString(R.string.inst_known_source, installerLabel);
}
return getString(R.string.inst_unknown_source);
}
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
java.text.DateFormat df = DateFormat.getDateFormat(mctx); java.text.DateFormat df = DateFormat.getDateFormat(mctx);
Apk apk = getItem(position); final Apk apk = getItem(position);
ViewHolder holder; ViewHolder holder;
if (convertView == null) { if (convertView == null) {
@ -202,13 +223,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
+ " " + apk.version + " " + apk.version
+ (apk.vercode == app.suggestedVercode ? " ☆" : "")); + (apk.vercode == app.suggestedVercode ? " ☆" : ""));
if (apk.vercode == app.installedVersionCode holder.status.setText(getInstalledStatus(apk));
&& mInstalledSigID != null && apk.sig != null
&& apk.sig.equals(mInstalledSigID)) {
holder.status.setText(getString(R.string.inst));
} else {
holder.status.setText(getString(R.string.not_inst));
}
if (apk.size > 0) { if (apk.size > 0) {
holder.size.setText(Utils.getFriendlySize(apk.size)); holder.size.setText(Utils.getFriendlySize(apk.size));