Integrate CallerInfo with notifications

- Allow notifications to use network URIs for avatar icons.
- Implement redirect following in network URI requests.
- Refactor lookup API

Change-Id: Ica61c7aadac1d32dc9d04785f381abf9e0fb1441
issue-id: OPO-725

3 files changed, 7 insertions, 7 deletions

diff --git a/src/com/android/messaging/widget/BaseWidgetFactory.java b/src/com/android/messaging/widget/BaseWidgetFactory.java
index c87a100..4d74c93 100644
--- a/src/com/android/messaging/widget/BaseWidgetFactory.java
+++ b/src/com/android/messaging/widget/BaseWidgetFactory.java
@@ -30,6 +30,7 @@ import android.text.style.StyleSpan;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
+import com.android.messaging.BugleApplication;
 import com.android.messaging.R;
 import com.android.messaging.datamodel.media.AvatarGroupRequestDescriptor;
 import com.android.messaging.datamodel.media.AvatarRequestDescriptor;
@@ -40,7 +41,6 @@ import com.android.messaging.datamodel.media.MediaResourceManager;
 import com.android.messaging.datamodel.media.UriImageRequestDescriptor;
 import com.android.messaging.util.AvatarUriUtil;
 import com.android.messaging.util.LogUtil;
-import com.cyanogenmod.messaging.lookup.LookupProviderManager;
 
 /**
  * Remote Views Factory for Bugle Widget.
@@ -81,7 +81,7 @@ abstract class BaseWidgetFactory implements RemoteViewsService.RemoteViewsFactor
         if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
             LogUtil.v(TAG, "onCreate");
         }
-        mContext.sendBroadcast(new Intent(LookupProviderManager.ACTION_CREATED));
+        BugleApplication.acquireLookupProvider();
     }
 
     @Override
@@ -94,7 +94,7 @@ abstract class BaseWidgetFactory implements RemoteViewsService.RemoteViewsFactor
                 mCursor.close();
                 mCursor = null;
             }
-            mContext.sendBroadcast(new Intent(LookupProviderManager.ACTION_DESTROYED));
+            BugleApplication.releaseLookupProvider();
         }
     }
 
diff --git a/src/com/android/messaging/widget/WidgetConversationListService.java b/src/com/android/messaging/widget/WidgetConversationListService.java
index 0748757..0ef1874 100644
--- a/src/com/android/messaging/widget/WidgetConversationListService.java
+++ b/src/com/android/messaging/widget/WidgetConversationListService.java
@@ -107,7 +107,7 @@ public class WidgetConversationListService extends RemoteViewsService {
                 LookupResponse lookupResponse = null;
                 if (!ContactUtil.isValidContactId(conv.getParticipantContactId())) {
                     // Make blocking call
-                    lookupResponse = BugleApplication.getLookupProviderClient()
+                    lookupResponse = BugleApplication.getLookupProvider()
                             .blockingLookupInfoForPhoneNumber(conv
                                     .getOtherParticipantNormalizedDestination());
                 }
@@ -184,7 +184,7 @@ public class WidgetConversationListService extends RemoteViewsService {
 
                 // Attribution logo
                 if (lookupResponse != null) {
-                    Bitmap bitmap = BugleApplication.getLookupProviderClient()
+                    Bitmap bitmap = BugleApplication.getLookupProvider()
                             .getCachedAttributionLogoBitmap(lookupResponse.mProviderName);
                     if (bitmap != null) {
                         remoteViews.setImageViewBitmap(R.id.attribution_logo, bitmap);
diff --git a/src/com/android/messaging/widget/WidgetConversationService.java b/src/com/android/messaging/widget/WidgetConversationService.java
index 94dc545..48955e5 100644
--- a/src/com/android/messaging/widget/WidgetConversationService.java
+++ b/src/com/android/messaging/widget/WidgetConversationService.java
@@ -149,7 +149,7 @@ public class WidgetConversationService extends RemoteViewsService {
                 LookupResponse lookupResponse = null;
                 if (!ContactUtil.isValidContactId(message.getSenderContactId())) {
                     // Make blocking call
-                    lookupResponse = BugleApplication.getLookupProviderClient()
+                    lookupResponse = BugleApplication.getLookupProvider()
                             .blockingLookupInfoForPhoneNumber(
                                     message.getSenderNormalizedDestination());
                 }
@@ -266,7 +266,7 @@ public class WidgetConversationService extends RemoteViewsService {
 
                 // Attribution logo
                 if (lookupResponse != null) {
-                    Bitmap bitmap = BugleApplication.getLookupProviderClient()
+                    Bitmap bitmap = BugleApplication.getLookupProvider()
                             .getCachedAttributionLogoBitmap(lookupResponse.mProviderName);
                     if (bitmap != null) {
                         remoteViews.setImageViewBitmap(R.id.attribution_logo, bitmap);