From a31c35a4ade84433b482023b7a156e0073bd78fc Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 2 Jul 2018 13:25:18 +0200 Subject: [PATCH] refresh on any key change by default --- .../keychain/provider/DatabaseNotifyManager.java | 4 ++++ .../keychain/ui/keyview/GenericViewModel.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseNotifyManager.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseNotifyManager.java index 8be6eb33a..896ebef3e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseNotifyManager.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseNotifyManager.java @@ -43,6 +43,10 @@ public class DatabaseNotifyManager { contentResolver.notifyChange(uri, null); } + public static Uri getNotifyUriAllKeys() { + return BASE_URI; + } + public static Uri getNotifyUriMasterKeyId(long masterKeyId) { return BASE_URI.buildUpon().appendPath(Long.toString(masterKeyId)).build(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/GenericViewModel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/GenericViewModel.java index ab4054297..1dfeed825 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/GenericViewModel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/GenericViewModel.java @@ -4,9 +4,11 @@ package org.sufficientlysecure.keychain.ui.keyview; import android.arch.lifecycle.LiveData; import android.arch.lifecycle.ViewModel; import android.content.Context; +import android.net.Uri; import org.sufficientlysecure.keychain.livedata.GenericLiveData; import org.sufficientlysecure.keychain.livedata.GenericLiveData.GenericDataLoader; +import org.sufficientlysecure.keychain.provider.DatabaseNotifyManager; /** A simple generic ViewModel that can be used if exactly one field of data needs to be stored. */ @@ -15,7 +17,7 @@ public class GenericViewModel extends ViewModel { public LiveData getGenericLiveData(Context context, GenericDataLoader func) { if (genericLiveData == null) { - genericLiveData = new GenericLiveData<>(context, null, func); + genericLiveData = new GenericLiveData<>(context, DatabaseNotifyManager.getNotifyUriAllKeys(), func); } // noinspection unchecked return genericLiveData;