cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix content observer notification in IdentityLoader

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-28 14:41:24 +02:00
parent 471d35ebcf
commit 74fad371bb
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/IdentityLoader.java
View File

@@ -34,6 +34,7 @@ import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.linked.LinkedAttribute; import org.sufficientlysecure.keychain.linked.LinkedAttribute;
import org.sufficientlysecure.keychain.linked.UriAttribute; import org.sufficientlysecure.keychain.linked.UriAttribute;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets; import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
import org.sufficientlysecure.keychain.ui.keyview.loader.IdentityLoader.IdentityInfo; import org.sufficientlysecure.keychain.ui.keyview.loader.IdentityLoader.IdentityInfo;
@@ -72,6 +73,7 @@ public class IdentityLoader extends AsyncTaskLoader<List<IdentityInfo>> {
private List<IdentityInfo> cachedResult; private List<IdentityInfo> cachedResult;
private ForceLoadContentObserver identityObserver;
public IdentityLoader(Context context, ContentResolver contentResolver, long masterKeyId, boolean showLinkedIds) { public IdentityLoader(Context context, ContentResolver contentResolver, long masterKeyId, boolean showLinkedIds) {
super(context); super(context);
@@ -79,6 +81,8 @@ public class IdentityLoader extends AsyncTaskLoader<List<IdentityInfo>> {
this.contentResolver = contentResolver; this.contentResolver = contentResolver;
this.masterKeyId = masterKeyId; this.masterKeyId = masterKeyId;
this.showLinkedIds = showLinkedIds; this.showLinkedIds = showLinkedIds;
this.identityObserver = new ForceLoadContentObserver();
} }
@Override @Override
@@ -169,6 +173,16 @@ public class IdentityLoader extends AsyncTaskLoader<List<IdentityInfo>> {
if (takeContentChanged() || cachedResult == null) { if (takeContentChanged() || cachedResult == null) {
forceLoad(); forceLoad();
} }
getContext().getContentResolver().registerContentObserver(
KeyRings.buildGenericKeyRingUri(masterKeyId), true, identityObserver);
}
@Override
protected void onAbandon() {
super.onAbandon();
getContext().getContentResolver().unregisterContentObserver(identityObserver);
} }
public interface IdentityInfo { public interface IdentityInfo {