Merge remote-tracking branch 'origin/beta' into bridge-merge

Author: BinLiang-Eric

aware-core/src/main/java/com/aware/Notes.java

@@ -1,12 +1,14 @@
 package com.aware;
 
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SyncRequest;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.aware.providers.Keyboard_Provider;
 import com.aware.providers.Notes_Provider;
 import com.aware.syncadapters.Notes_Sync;
 import com.aware.utils.Aware_Sensor;
@@ -34,6 +36,22 @@ public void onCreate() {
         Log.d(TAG, "Notes service created!");
     }
 
+
+    private final BroadcastReceiver noteReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction() != null) {
+                switch (intent.getAction()) {
+                    case Aware.ACTION_AWARE_SYNC_DATA:
+                        Bundle sync = new Bundle();
+                        sync.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+                        sync.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
+                        ContentResolver.requestSync(Aware.getAWAREAccount(context), Notes_Provider.AUTHORITY, sync);
+                }
+            }
+        }
+    };
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -66,12 +84,18 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                         .setExtras(new Bundle()).build();
                 ContentResolver.requestSync(request);
             }
-
+            registerNoteReceiver();
             Log.d(TAG, "Sync configured for authority: " + Notes_Provider.getAuthority(this));
             Log.d(TAG, "Is syncable: " + ContentResolver.getIsSyncable(Aware.getAWAREAccount(this), Notes_Provider.getAuthority(this)));
             Log.d(TAG, "Auto sync: " + ContentResolver.getSyncAutomatically(Aware.getAWAREAccount(this), Notes_Provider.getAuthority(this)));
         }
 
         return START_STICKY;
     }
+
+    private void registerNoteReceiver(){
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Aware.ACTION_AWARE_SYNC_DATA);
+        registerReceiver(noteReceiver, filter);
+    }
 }

aware-core/src/main/java/com/aware/providers/Notes_Provider.java

@@ -31,8 +31,8 @@ private Notes_Data() {}
 
         public static final Uri CONTENT_URI = Uri.parse("content://"
                 + Notes_Provider.AUTHORITY + "/notes");
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.aware.applications.notes";
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.aware.applications.notes";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.aware.notes";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.aware.notes";
 
         public static final String _ID = "_id";
         public static final String TIMESTAMP = "timestamp";