Merge branch 'master' of https://github.com/taivo/parse-push-plugin

Author: taivo

src/android/ParsePushPlugin.java

@@ -27,6 +27,7 @@ public class ParsePushPlugin extends CordovaPlugin {
    private static final String ACTION_SUBSCRIBE = "subscribe";
    private static final String ACTION_UNSUBSCRIBE = "unsubscribe";
    private static final String ACTION_REGISTER_CALLBACK = "registerCallback";
+   private static final String ACTION_INITIALIZE = "initialize";
 
    private static CallbackContext gEventCallback = null;
    private static Queue<PluginResult> pnQueue = new LinkedList();
@@ -68,6 +69,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
          this.unsubscribe(args.getString(0), callbackContext);
          return true;
       }
+      if (action.equals(ACTION_INITIALIZE)) {
+         this.doInitialization(callbackContext);
+         return true;
+      }
       return false;
    }
 
@@ -113,6 +118,10 @@ private void unsubscribe(final String channel, final CallbackContext callbackCon
          callbackContext.success();
    }
 
+   private void doInitialization(final CallbackContext callbackContext) {
+      callbackContext.success();
+   }
+
    /*
     * keep reusing the saved callback context to call the javascript PN handler
     */

src/ios/AppDelegate+parsepush.m

@@ -90,8 +90,9 @@ - (BOOL)swizzled_application:(UIApplication*)application didFinishLaunchingWithO
       //
       ParsePushPlugin* pluginInstance = [self getParsePluginInstance];
 
-      NSString *appId     = [pluginInstance getConfigForKey:@"ParseAppId"];
-      NSString *serverUrl = [pluginInstance getConfigForKey:@"ParseServerUrl"];
+      NSString *appId      = [pluginInstance getConfigForKey:@"ParseAppId"];
+      NSString *serverUrl  = [pluginInstance getConfigForKey:@"ParseServerUrl"];
+      NSString *shouldInit = [pluginInstance getConfigForKey:@"ParseAutoRegistration"];
 
       if(!appId.length){
          NSException* invalidSettingException = [NSException
@@ -124,11 +125,12 @@ - (BOOL)swizzled_application:(UIApplication*)application didFinishLaunchingWithO
          }]];
       }
 
-
-      UIUserNotificationType userNotificationTypes = (UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound);
-      UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:userNotificationTypes categories:nil];
-      [application registerUserNotificationSettings:settings];
-      [application registerForRemoteNotifications];
+      if (!shouldInit.length || [shouldInit isEqualToString:@"true"]){
+        UIUserNotificationType userNotificationTypes = (UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound);
+        UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:userNotificationTypes categories:nil];
+        [application registerUserNotificationSettings:settings];
+        [application registerForRemoteNotifications];
+      }
 	}
 
    return isOk;

src/ios/ParsePushPlugin.h

@@ -10,6 +10,7 @@
 // methods exposed to JS
 - (void)registerCallback: (CDVInvokedUrlCommand*)command;
 
+- (void)initialize: (CDVInvokedUrlCommand *)command;
 - (void)getInstallationId: (CDVInvokedUrlCommand*)command;
 - (void)getInstallationObjectId: (CDVInvokedUrlCommand*)command;
 

src/ios/ParsePushPlugin.m

@@ -30,6 +30,22 @@ - (void)registerCallback: (CDVInvokedUrlCommand*)command
     }
 }
 
+- (void)initialize:(CDVInvokedUrlCommand *)command
+{
+    CDVPluginResult* pluginResult = nil;   
+    
+    NSString *shouldInit = [self getConfigForKey:@"ParseAutoRegistration"];
+    if ([shouldInit isEqualToString:@"false"]){
+        UIUserNotificationType userNotificationTypes = (UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound);
+        UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:userNotificationTypes categories:nil];
+        [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
+        [[UIApplication sharedApplication] registerForRemoteNotifications];
+    }
+    
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (void)getInstallationId:(CDVInvokedUrlCommand*) command
 {
     [self.commandDelegate runInBackground:^{

www/parse-push-plugin.js

@@ -66,6 +66,10 @@ var ParsePushPlugin = {
    unsubscribe: function(channel, successCb, errorCb) {
       cordova.exec(successCb, errorCb, serviceName, 'unsubscribe', [ channel ]);
    },
+
+   initialize: function(successCb, errorCb) {
+      cordova.exec(successCb, errorCb, serviceName, 'initialize', []);
+   },
 };
 
 //