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

Merge branch 'app-null' into 'master'

Browse Source 
Make checking app availability after external changes a little bit safer

Closes #1573

See merge request fdroid/fdroidclient!739
This commit is contained in:
Hans-Christoph Steiner 2018-08-28 13:59:39 +00:00
commit 766247c1d3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,8 +109,8 @@ public class AppDetails2 extends AppCompatActivity
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
supportPostponeEnterTransition(); supportPostponeEnterTransition();
resetCurrentApp(getPackageNameFromIntent(getIntent())); String packageName = getPackageNameFromIntent(getIntent());
if (app == null) { if (!resetCurrentApp(packageName)) {
finish(); finish();
return; return;
} }
@ -662,10 +662,12 @@ public class AppDetails2 extends AppCompatActivity
* removed while F-Droid was in the background. * removed while F-Droid was in the background.
* <p> * <p>
* Shows a {@link Toast} if no {@link App} was found matching {@code packageName}. * Shows a {@link Toast} if no {@link App} was found matching {@code packageName}.
*
* @return whether the {@link App} for a given {@code packageName} is still available
*/ */
private void resetCurrentApp(String packageName) { private boolean resetCurrentApp(String packageName) {
if (TextUtils.isEmpty(packageName)) { if (TextUtils.isEmpty(packageName)) {
return; return false;
} }
app = AppProvider.Helper.findHighestPriorityMetadata(getContentResolver(), packageName); app = AppProvider.Helper.findHighestPriorityMetadata(getContentResolver(), packageName);
@ -678,15 +680,18 @@ public class AppDetails2 extends AppCompatActivity
} }
if (app == null) { if (app == null) {
Toast.makeText(this, R.string.no_such_app, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.no_such_app, Toast.LENGTH_LONG).show();
return false;
} }
return true;
} }
private void onAppChanged() { private void onAppChanged() {
recyclerView.post(new Runnable() { recyclerView.post(new Runnable() {
@Override @Override
public void run() { public void run() {
resetCurrentApp(app.packageName); String packageName = app != null ? app.packageName : null;
if (app == null) { if (!resetCurrentApp(packageName)) {
AppDetails2.this.finish(); AppDetails2.this.finish();
return; return;
} }