diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-03-09 12:36:26 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2015-03-09 13:56:41 -0700 |
| commit | 693406016fa0b02b4af4188fd9668a3d74881652 (patch) | |
| tree | 63ce5aef73578546c9ec4fb70f32f646a994fe18 /src/com | |
| parent | 10fc5278a4633f5ef7d0a4b6cca40528e84294a9 (diff) | |
| download | packages_providers_ContactsProvider-693406016fa0b02b4af4188fd9668a3d74881652.zip packages_providers_ContactsProvider-693406016fa0b02b4af4188fd9668a3d74881652.tar.gz packages_providers_ContactsProvider-693406016fa0b02b4af4188fd9668a3d74881652.tar.bz2 | |
Cache photo URI too in calllog
Enterprise phone lookup returns special photo URLs for corp contacts, which
can't be obtained just with contact IDs. So we need to cache the URIs too and
otherwise pictures sometimes don't show up.
Bug 19546108
Change-Id: I48517da681c194b6ee4ca47dda57ccff81e76981
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/providers/contacts/CallLogProvider.java | 1 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index 59c9bda..547e4d3 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -139,6 +139,7 @@ public class CallLogProvider extends ContentProvider { sCallsProjectionMap.put(Calls.CACHED_MATCHED_NUMBER, Calls.CACHED_MATCHED_NUMBER); sCallsProjectionMap.put(Calls.CACHED_NORMALIZED_NUMBER, Calls.CACHED_NORMALIZED_NUMBER); sCallsProjectionMap.put(Calls.CACHED_PHOTO_ID, Calls.CACHED_PHOTO_ID); + sCallsProjectionMap.put(Calls.CACHED_PHOTO_URI, Calls.CACHED_PHOTO_URI); sCallsProjectionMap.put(Calls.CACHED_FORMATTED_NUMBER, Calls.CACHED_FORMATTED_NUMBER); } diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 92c3c89..eb4172c 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -120,7 +120,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { * 1000-1100 M * </pre> */ - static final int DATABASE_VERSION = 1004; + static final int DATABASE_VERSION = 1005; public interface Tables { public static final String CONTACTS = "contacts"; @@ -1532,6 +1532,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { Calls.CACHED_MATCHED_NUMBER + " TEXT," + Calls.CACHED_NORMALIZED_NUMBER + " TEXT," + Calls.CACHED_PHOTO_ID + " INTEGER NOT NULL DEFAULT 0," + + Calls.CACHED_PHOTO_URI + " TEXT," + Calls.CACHED_FORMATTED_NUMBER + " TEXT," + Voicemails._DATA + " TEXT," + Voicemails.HAS_CONTENT + " INTEGER," + @@ -2886,6 +2887,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 1004; } + if (oldVersion < 1005) { + upgradeToVersion1005(db); + oldVersion = 1005; + } + if (upgradeViewsAndTriggers) { createContactsViews(db); createGroupsView(db); @@ -4387,6 +4393,10 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { db.execSQL("ALTER TABLE calls ADD phone_account_hidden INTEGER NOT NULL DEFAULT 0;"); } + public void upgradeToVersion1005(SQLiteDatabase db) { + db.execSQL("ALTER TABLE calls ADD photo_uri TEXT;"); + } + public String extractHandleFromEmailAddress(String email) { Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(email); if (tokens.length == 0) { |