From a49fe9adf54cf9f3463e061e8dac8134e31584c8 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 18 Aug 2017 23:25:40 -0500 Subject: ObservableAdapters: notify on map/list being set Signed-off-by: Jason A. Donenfeld --- app/src/main/java/com/wireguard/android/ObservableListAdapter.java | 3 +-- app/src/main/java/com/wireguard/android/ObservableMapAdapter.java | 1 + app/src/main/java/com/wireguard/android/ObservableTreeMap.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/wireguard/android/ObservableListAdapter.java b/app/src/main/java/com/wireguard/android/ObservableListAdapter.java index 66cb957d..c69af4b5 100644 --- a/app/src/main/java/com/wireguard/android/ObservableListAdapter.java +++ b/app/src/main/java/com/wireguard/android/ObservableListAdapter.java @@ -23,7 +23,6 @@ class ObservableListAdapter extends BaseAdapter implements ListAdapter { private final OnListChangedCallback callback = new OnListChangedCallback<>(this); ObservableListAdapter(final Context context, final int layoutId, final ObservableList list) { - super(); layoutInflater = LayoutInflater.from(context); this.layoutId = layoutId; setList(list); @@ -61,6 +60,7 @@ class ObservableListAdapter extends BaseAdapter implements ListAdapter { if (list != null) { list.addOnListChangedCallback(callback); } + notifyDataSetChanged(); } private static class OnListChangedCallback @@ -69,7 +69,6 @@ class ObservableListAdapter extends BaseAdapter implements ListAdapter { private final WeakReference> weakAdapter; private OnListChangedCallback(final ObservableListAdapter adapter) { - super(); weakAdapter = new WeakReference<>(adapter); } diff --git a/app/src/main/java/com/wireguard/android/ObservableMapAdapter.java b/app/src/main/java/com/wireguard/android/ObservableMapAdapter.java index 1fce78c2..3090ed5e 100644 --- a/app/src/main/java/com/wireguard/android/ObservableMapAdapter.java +++ b/app/src/main/java/com/wireguard/android/ObservableMapAdapter.java @@ -86,6 +86,7 @@ class ObservableMapAdapter, V> extends BaseAdapter imple if (map != null) { map.addOnMapChangedCallback(callback); } + notifyDataSetChanged(); } private static class OnMapChangedCallback, V> diff --git a/app/src/main/java/com/wireguard/android/ObservableTreeMap.java b/app/src/main/java/com/wireguard/android/ObservableTreeMap.java index b0444d66..db72d857 100644 --- a/app/src/main/java/com/wireguard/android/ObservableTreeMap.java +++ b/app/src/main/java/com/wireguard/android/ObservableTreeMap.java @@ -4,7 +4,6 @@ import android.databinding.MapChangeRegistry; import android.databinding.ObservableMap; import android.support.annotation.NonNull; -import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -- cgit v1.2.3