Observe call history data forever
Bug: 158120478
Test: Cannot reproduce the bug, so only tested that the app is running
fine.
Change-Id: I40e5f64587f3e6c4af0459764c1d1c496aebd21e
diff --git a/src/com/android/car/dialer/DialerApplication.java b/src/com/android/car/dialer/DialerApplication.java
index 0b9faf0..cf42279 100644
--- a/src/com/android/car/dialer/DialerApplication.java
+++ b/src/com/android/car/dialer/DialerApplication.java
@@ -18,6 +18,7 @@
import android.app.Application;
+import com.android.car.dialer.bluetooth.CallHistoryManager;
import com.android.car.dialer.bluetooth.UiBluetoothMonitor;
import com.android.car.dialer.notification.InCallNotificationController;
import com.android.car.dialer.notification.MissedCallNotificationController;
@@ -32,6 +33,7 @@
InMemoryPhoneBook.init(this);
UiCallManager.init(this);
UiBluetoothMonitor.init(this);
+ CallHistoryManager.init(this);
InCallNotificationController.init(this);
MissedCallNotificationController.init(this);
}
diff --git a/src/com/android/car/dialer/bluetooth/CallHistoryManager.java b/src/com/android/car/dialer/bluetooth/CallHistoryManager.java
new file mode 100644
index 0000000..af1ffbb
--- /dev/null
+++ b/src/com/android/car/dialer/bluetooth/CallHistoryManager.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.car.dialer.bluetooth;
+
+import android.content.Context;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.Transformations;
+
+import com.android.car.dialer.livedata.CallHistoryLiveData;
+import com.android.car.dialer.log.L;
+import com.android.car.telephony.common.PhoneCallLog;
+
+import java.util.List;
+
+/**
+ * A class that monitors the call history data change.
+ */
+public class CallHistoryManager {
+ private static final String TAG = "CD.CallHistoryManager";
+
+ private static CallHistoryManager sCallHistoryManager;
+
+ private LiveData<List<PhoneCallLog>> mCallHistoryLiveData;
+
+ private Observer mCallHistoryObserver;
+
+ /**
+ * Initializes a globally accessible {@link CallHistoryManager} which can be retrieved by {@link
+ * #get}. Must be called after {@link UiBluetoothMonitor} has been initiated.
+ *
+ * @param applicationContext Application context.
+ */
+ public static CallHistoryManager init(Context applicationContext) {
+ if (sCallHistoryManager == null) {
+ sCallHistoryManager = new CallHistoryManager(applicationContext);
+ }
+
+ return sCallHistoryManager;
+ }
+
+ /**
+ * Gets the global {@link CallHistoryManager} instance. Make sure {@link #init(Context)} is
+ * called before calling this method.
+ */
+ public static CallHistoryManager get() {
+ if (sCallHistoryManager == null) {
+ L.e(TAG, "Call CallHistoryManager.init(Context) before calling this function");
+ }
+ return sCallHistoryManager;
+ }
+
+ private CallHistoryManager(Context applicationContext) {
+ mCallHistoryLiveData = Transformations.switchMap(
+ UiBluetoothMonitor.get().getFirstHfpConnectedDevice(), (device) -> device != null
+ ? CallHistoryLiveData.newInstance(applicationContext, device.getAddress())
+ : new MutableLiveData<>());
+
+ mCallHistoryObserver = o -> L.i(TAG, "Call history is updated");
+
+ // Call history live data is observed forever to avoid race condition between new call
+ // log insertion timing and data change registering.
+ mCallHistoryLiveData.observeForever(mCallHistoryObserver);
+ }
+
+ /**
+ * Tears down the {@link CallHistoryManager}. Calling this function will null out the global
+ * accessible {@link CallHistoryManager} instance.
+ */
+ public void tearDown() {
+ if (mCallHistoryLiveData != null && mCallHistoryLiveData.hasObservers()) {
+ mCallHistoryLiveData.removeObserver(mCallHistoryObserver);
+ }
+
+ sCallHistoryManager = null;
+ }
+
+ /**
+ * Returns a LiveData which monitors the call history data for the first connected device.
+ */
+ public LiveData<List<PhoneCallLog>> getCallHistoryLiveData() {
+ return mCallHistoryLiveData;
+ }
+}
diff --git a/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java b/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
index 3bbe7fc..869786e 100644
--- a/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
+++ b/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
@@ -17,23 +17,18 @@
package com.android.car.dialer.ui.calllog;
import android.app.Application;
-import android.content.Context;
import android.text.format.DateUtils;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Transformations;
import com.android.car.arch.common.FutureData;
import com.android.car.arch.common.LiveDataFunctions;
-import com.android.car.dialer.bluetooth.UiBluetoothMonitor;
-import com.android.car.dialer.livedata.CallHistoryLiveData;
+import com.android.car.dialer.bluetooth.CallHistoryManager;
import com.android.car.dialer.livedata.HeartBeatLiveData;
import com.android.car.dialer.ui.common.DialerListViewModel;
import com.android.car.dialer.ui.common.UiCallLogLiveData;
import com.android.car.telephony.common.InMemoryPhoneBook;
-import com.android.car.telephony.common.PhoneCallLog;
import java.util.List;
@@ -46,7 +41,7 @@
super(application);
mUiCallLogLiveData = new UiCallLogLiveData(application.getApplicationContext(),
new HeartBeatLiveData(DateUtils.MINUTE_IN_MILLIS),
- getFirstHfpDeviceCallLog(application.getApplicationContext()),
+ CallHistoryManager.get().getCallHistoryLiveData(),
InMemoryPhoneBook.get().getContactsLiveData());
mUiCallLogFutureData = LiveDataFunctions.loadingSwitchMap(mUiCallLogLiveData,
@@ -57,11 +52,4 @@
public LiveData<FutureData<List<Object>>> getCallHistory() {
return mUiCallLogFutureData;
}
-
- private LiveData<List<PhoneCallLog>> getFirstHfpDeviceCallLog(Context context) {
- return Transformations.switchMap(
- UiBluetoothMonitor.get().getFirstHfpConnectedDevice(), (device) -> device != null
- ? CallHistoryLiveData.newInstance(context, device.getAddress())
- : new MutableLiveData<>());
- }
}