summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/calllog/datasources
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2017-11-15 21:16:49 -0800
committerzachh <zachh@google.com>2017-11-18 07:32:54 +0000
commitbf27d875b7c6e9dec5d3cfc1d4595a71af67deae (patch)
tree0b17b6d1f38e5f7bd3a6b241e30fb34c89eed35c /java/com/android/dialer/calllog/datasources
parent5c7524f3354e5121bbea1064a9f13f19e94c276d (diff)
Added PhoneLookupDataSource and implemented isDirty.
Also extracted FakePhoneLookup to a testing package. Bug: 34672501 Test: unit PiperOrigin-RevId: 175923790 Change-Id: I866708a676e788051b369a024344967975c05979
Diffstat (limited to 'java/com/android/dialer/calllog/datasources')
-rw-r--r--java/com/android/dialer/calllog/datasources/DataSources.java6
-rw-r--r--java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java139
2 files changed, 142 insertions, 3 deletions
diff --git a/java/com/android/dialer/calllog/datasources/DataSources.java b/java/com/android/dialer/calllog/datasources/DataSources.java
index 911ca3fa3..113a9f7b1 100644
--- a/java/com/android/dialer/calllog/datasources/DataSources.java
+++ b/java/com/android/dialer/calllog/datasources/DataSources.java
@@ -17,14 +17,14 @@
package com.android.dialer.calllog.datasources;
import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
-import java.util.List;
+import com.google.common.collect.ImmutableList;
/** Immutable lists of data sources used to populate the annotated call log. */
public interface DataSources {
SystemCallLogDataSource getSystemCallLogDataSource();
- List<CallLogDataSource> getDataSourcesIncludingSystemCallLog();
+ ImmutableList<CallLogDataSource> getDataSourcesIncludingSystemCallLog();
- List<CallLogDataSource> getDataSourcesExcludingSystemCallLog();
+ ImmutableList<CallLogDataSource> getDataSourcesExcludingSystemCallLog();
}
diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
new file mode 100644
index 000000000..90298a104
--- /dev/null
+++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2017 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.dialer.calllog.datasources.phonelookup;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.support.annotation.MainThread;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.phonelookup.PhoneLookup;
+import com.android.dialer.storage.Unencrypted;
+import com.google.common.collect.ImmutableSet;
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import javax.inject.Inject;
+
+/**
+ * Responsible for maintaining the columns in the annotated call log which are derived from phone
+ * numbers.
+ */
+public final class PhoneLookupDataSource implements CallLogDataSource {
+ private static final String PREF_LAST_TIMESTAMP_PROCESSED = "phoneLookupLastTimestampProcessed";
+
+ private final PhoneLookup phoneLookup;
+ private final SharedPreferences sharedPreferences;
+
+ @Inject
+ PhoneLookupDataSource(PhoneLookup phoneLookup, @Unencrypted SharedPreferences sharedPreferences) {
+ this.phoneLookup = phoneLookup;
+ this.sharedPreferences = sharedPreferences;
+ }
+
+ @WorkerThread
+ @Override
+ public boolean isDirty(Context appContext) {
+ ImmutableSet<DialerPhoneNumber> uniqueDialerPhoneNumbers =
+ queryDistinctDialerPhoneNumbersFromAnnotatedCallLog(appContext);
+
+ long lastTimestampProcessedSharedPrefValue =
+ sharedPreferences.getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L);
+ try {
+ // TODO(zachh): Would be good to rework call log architecture to properly use futures.
+ // TODO(zachh): Consider how individual lookups should behave wrt timeouts/exceptions and
+ // handle appropriately here.
+ return phoneLookup
+ .isDirty(uniqueDialerPhoneNumbers, lastTimestampProcessedSharedPrefValue)
+ .get();
+ } catch (InterruptedException | ExecutionException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @WorkerThread
+ @Override
+ public void fill(Context appContext, CallLogMutations mutations) {
+ // TODO(zachh): Implementation.
+ }
+
+ @WorkerThread
+ @Override
+ public void onSuccessfulFill(Context appContext) {
+ // TODO(zachh): Implementation.
+ }
+
+ @WorkerThread
+ @Override
+ public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
+ // TODO(zachh): Implementation.
+ return new ContentValues();
+ }
+
+ @MainThread
+ @Override
+ public void registerContentObservers(
+ Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
+ // No content observers required for this data source.
+ }
+
+ private static ImmutableSet<DialerPhoneNumber>
+ queryDistinctDialerPhoneNumbersFromAnnotatedCallLog(Context appContext) {
+ ImmutableSet.Builder<DialerPhoneNumber> numbers = ImmutableSet.builder();
+
+ try (Cursor cursor =
+ appContext
+ .getContentResolver()
+ .query(
+ AnnotatedCallLog.DISTINCT_NUMBERS_CONTENT_URI,
+ new String[] {AnnotatedCallLog.NUMBER},
+ null,
+ null,
+ null)) {
+
+ if (cursor == null) {
+ LogUtil.e(
+ "PhoneLookupDataSource.queryDistinctDialerPhoneNumbersFromAnnotatedCallLog",
+ "null cursor");
+ return numbers.build();
+ }
+
+ if (cursor.moveToFirst()) {
+ int numberColumn = cursor.getColumnIndexOrThrow(AnnotatedCallLog.NUMBER);
+ do {
+ byte[] blob = cursor.getBlob(numberColumn);
+ if (blob == null) {
+ // Not all [incoming] calls have associated phone numbers.
+ continue;
+ }
+ try {
+ numbers.add(DialerPhoneNumber.parseFrom(blob));
+ } catch (InvalidProtocolBufferException e) {
+ throw new IllegalStateException(e);
+ }
+ } while (cursor.moveToNext());
+ }
+ }
+ return numbers.build();
+ }
+}