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

Externalize application changed actions

Browse Source 
When we receive notifications indicating that the app has changed, the
App object needs to be changed and the view updated.

These notifications can be received from two sources:
 - the ContentObserver;
 - onActivityResult().

Thus, the implementation should not be related to the ContentObserver
(in theory, we might want to keep only the onActivityResult()
notification). Therefore, move it to a separate method in AppDetails.

This also preventively avoids bugs when the ContentObserver is null.
This commit is contained in:
Romain Vimont 2015-03-13 10:37:57 +01:00
parent 578084ff96
commit eef1e0a406
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,18 +144,9 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
@Override
public void onChange(boolean selfChange, Uri uri) {
onChange();
onAppChanged();
}
public void onChange() {
if (!reset(app.id)) {
AppDetails.this.finish();
return;
}
refreshApkList();
supportInvalidateOptionsMenu();
}
}
class ApkListAdapter extends ArrayAdapter<Apk> {
@ -546,6 +537,16 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
removeProgressDialog();
}
private void onAppChanged() {
if (!reset(app.id)) {
AppDetails.this.finish();
return;
}
refreshApkList();
supportInvalidateOptionsMenu();
}
public void setIgnoreUpdates(String appId, boolean ignoreAll, int ignoreVersionCode) {
Uri uri = AppProvider.getContentUri(appId);
@ -929,7 +930,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
}
setSupportProgressBarIndeterminateVisibility(false);
myAppObserver.onChange();
onAppChanged();
}
});
}
@ -941,7 +942,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
@Override
public void run() {
setSupportProgressBarIndeterminateVisibility(false);
myAppObserver.onChange();
onAppChanged();
}
});
} else {
@ -949,7 +950,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
@Override
public void run() {
setSupportProgressBarIndeterminateVisibility(false);
myAppObserver.onChange();
onAppChanged();
Log.e(TAG, "Installer aborted with errorCode: " + errorCode);