Upstream version 9.38.204.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / extension / api / contacts / Contacts.java

diff --git a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/Contacts.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/Contacts.java
index b910cae..b2c64d0 100644 (file)
--- a/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/Contacts.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/Contacts.java
@@ -4,8 +4,10 @@
 
 package org.xwalk.core.internal.extension.api.contacts;
 
+import android.app.Activity;
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
@@ -17,14 +19,14 @@ import android.util.Log;
 
 import java.util.ArrayList;
 
+import org.chromium.base.ActivityState;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import org.xwalk.core.internal.extension.XWalkExtension;
-import org.xwalk.core.internal.extension.XWalkExtensionContext;
+import org.xwalk.core.internal.extension.XWalkExtensionWithActivityStateListener;
 
-public class Contacts extends XWalkExtension {
+public class Contacts extends XWalkExtensionWithActivityStateListener {
     public static final String JS_API_PATH = "jsapi/contacts_api.js";
 
     private static final String TAG = "Contacts";
@@ -33,13 +35,19 @@ public class Contacts extends XWalkExtension {
     private final ContactEventListener mObserver;
     private final ContentResolver mResolver;
 
-    public Contacts(String jsApiContent, XWalkExtensionContext context) {
-        super(NAME, jsApiContent, context);
-        mResolver = context.getContext().getContentResolver();
+    public Contacts(String jsApiContent, Activity activity) {
+        super(NAME, jsApiContent, activity);
+        mResolver = activity.getContentResolver();
         mObserver = new ContactEventListener(new Handler(), this, mResolver);
         mResolver.registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, mObserver);
     }
 
+
+    @Override
+    public String onSyncMessage(int instanceID, String message) {
+        return null;
+    }
+
     @Override
     public void onMessage(int instanceID, String message) {
         if (message.isEmpty()) return;
@@ -89,22 +97,6 @@ public class Contacts extends XWalkExtension {
         }
     }
 
-    @Override
-    public void onResume() {
-        mObserver.onResume();
-        mResolver.registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, mObserver);
-    }
-
-    @Override
-    public void onPause() {
-        mResolver.unregisterContentObserver(mObserver);
-    }
-
-    @Override
-    public void onDestroy() {
-        mResolver.unregisterContentObserver(mObserver);
-    }
-
     // Remove all contacts.
     private void handleClear() {
         Cursor c = null;
@@ -121,4 +113,21 @@ public class Contacts extends XWalkExtension {
             if (c != null) c.close();
         }
     }
+
+
+    @Override
+    public void onActivityStateChange(Activity activity, int newState) {
+        switch (newState) {
+            case ActivityState.RESUMED:
+                mObserver.onResume();
+                mResolver.registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, mObserver);
+                break;
+            case ActivityState.PAUSED:
+            case ActivityState.DESTROYED:
+                mResolver.unregisterContentObserver(mObserver);
+                break;
+            default:
+                break;
+        }
+    }
 }