Merge branch 'develop'

Author: zack

README.md

@@ -39,3 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 The views and conclusions contained in the software and documentation are those
 of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
+
+
+

module/inspector/an-inspector/.hash

@@ -1 +1 @@
-2fd13df5404804616d0a8d93a4cc49f13360254f
+5777bc0d9751d98fcbc894a9d25a9cfc8aae4bb2

module/inspector/an-inspector/ForgeModule/libs/urbanairship-lib-2.1.4.jar

@@ -274,12 +274,13 @@ public static void setTags(final ForgeTask callbackContext,  @ForgeParam("tags")
            HashSet<String> tagSet = new HashSet<String>();
 
            for (int i = 0; i < tagsArray.size(); ++i) {
-               tagSet.add(tagsArray.get(i).toString());
+               tagSet.add(tagsArray.get(i).getAsString());
            }
 
            PushManager.shared().setTags(tagSet);
-           Logger.debug("Settings tags: " + tagSet);;
+           Logger.debug("Settings tags: " + tagSet);  
            callbackContext.success();
+           
        } catch (JsonIOException e) {
            Logger.error("Error reading tags JSON", e);
            callbackContext.error("Error reading tags JSON");

module/inspector/an-inspector/ForgeModule/libs/urbanairship-lib-3.1.0.jar

@@ -6,18 +6,44 @@
 import com.urbanairship.UAirship;
 import com.urbanairship.location.UALocationManager;
 import com.urbanairship.push.PushManager;
+import android.util.Log;
+
 
 public class EventListener extends ForgeEventListener {
+	
+	private static final String TAG = ">>>>> UA_MODULE";
+	
 	@Override
 	public void onApplicationCreate() {
+		
+		Log.v(TAG, "onApplicationCreate");
+		
 		UAirship.takeOff(ForgeApp.getApp());
 		PushManager.enablePush();
 		UALocationManager.init();
 		PushManager.shared().setIntentReceiver(IntentReceiver.class);
 	}
 
+//	@Override
+//    public void onStop() {      
+//		Log.v(TAG, "onStop");
+//        UAirship.land(); 
+//    }
+	
+	
+	
+//	where these belong... ?
+	
 	@Override
+    public void onStart() {
+		Log.v(TAG, "onStop");
+        UAirship.shared().getAnalytics().activityStarted(ForgeApp.getActivity());
+    }
+
+    @Override
     public void onStop() {
-        UAirship.land();
+    	Log.v(TAG, "onStop");
+//    	UAirship.land();
+        UAirship.shared().getAnalytics().activityStopped(ForgeApp.getActivity());
     }
 }

module/inspector/an-inspector/ForgeModule/src/io/trigger/forge/android/modules/urbanairship/API.java

@@ -85,11 +85,7 @@ +(void)registerForNotificationTypes:(ForgeTask*)command text:(NSNumber *)text {
         UALOG(@"bitmask value: %d", text);
         [[UAPush shared] registerForRemoteNotificationTypes:bitmask];
         [command success:nil];
-
-    
-        [command success:nil];
-        
-    
+        //[command success:nil];
 }
 
 //general enablement
@@ -302,11 +298,10 @@ + (void)getAlias:(ForgeTask*)command {
 //setters
 
 + (void)setTags:(ForgeTask*)command tags:(NSArray *)tags{
-    
-    //todo revist this def
-    // NSMutableArray *tagsA = [NSMutableArray arrayWithArray:tags ];
-    // [UAPush shared].tags = tagsA;
-    // [[UAPush shared] updateRegistration];
+//    UALOG(@"setTags: %@", tags);
+    NSMutableArray *tagsA = [NSMutableArray arrayWithArray:tags ];
+    [UAPush shared].tags = tagsA;
+    [[UAPush shared] updateRegistration];
     [command success:nil];
 }
 
@@ -347,7 +342,7 @@ + (void)setQuietTimeEnabled:(ForgeTask*)command  text:(NSNumber *)text {
 }
 
 + (void)setQuietTime:(ForgeTask*)command startHour:(NSNumber *)startHour startMinute:(NSNumber *)startMinute  endHour:(NSNumber *)endHour  endMinute:(NSNumber *)endMinute  {
-    Class c = [NSNumber class];
+//    Class c = [NSNumber class];
     [self takeOff:command];
     id startHr = startHour;
     id startMin = startMinute;