Bug fixes

* Fixed bug where notifications would not be displayed if the app was still running in the background unless enableNotificationsWhenActive was set to true.
* Omitting Google Play specific error logging when running on Amazon devices.

Author: jkasten2

OneSignalSDK.jar

@@ -35,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // Pass in your app's Context, Google Project number, OneSignal App ID, and a NotificationOpenedHandler
         OneSignal.init(this, "703322744261", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba", new ExampleNotificationOpenedHandler());
         //OneSignal.init(this, "703322744261", "5eb5a37e-b458-11e3-ac11-000c2940e62c", new ExampleNotificationOpenedHandler());
-        OneSignal.enableInAppAlertNotification(false);
-        OneSignal.enableNotificationsWhenActive(true);
+        //OneSignal.enableInAppAlertNotification(false);
+        //OneSignal.enableNotificationsWhenActive(true);
         //OneSignal.setSubscription(false);
 
         OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {

OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity.java

@@ -26,7 +26,18 @@ protected void onCreate(Bundle savedInstanceState) {
         currentActivity = this;
 
         OneSignal.init(this, "703322744261", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba", new ExampleNotificationOpenedHandler());
-        OneSignal.enableNotificationsWhenActive(true);
+        //OneSignal.enableNotificationsWhenActive(true);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        OneSignal.onPaused();
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        OneSignal.onResumed();
     }
 
     @Override

OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity2Activity.java

@@ -46,24 +46,26 @@ public static void Process(Context context, Bundle bundle, Class<?> notification
          boolean isActive = OneSignal.initDone && OneSignal.isForeground();
          boolean display = OneSignal.getNotificationsWhenActiveEnabled(context)
                            || showAsAlert
-                           || isActive;
+                           || !isActive;
+         
          prepareBundle(bundle);
 
          BackgroundBroadcaster.Invoke(context, bundle, isActive);
 
          if (!bundle.containsKey("alert") || bundle.getString("alert") == null || bundle.getString("alert").equals(""))
             return;
 
-         if (!display) {
+         if (display)// Build notification from the Bundle
+            GenerateNotification.fromBundle(context, bundle, notificationOpenedActivityClass, showAsAlert && isActive);
+         else {
             final Bundle finalBundle = bundle;
             // Current thread is meant to be short lived. Make a new thread to do our OneSignal work on.
             new Thread(new Runnable() {
                public void run() {
                   OneSignal.handleNotificationOpened(finalBundle);
                }
             }).start();
-         } else // Build notification from the Bundle
-            GenerateNotification.fromBundle(context, bundle, notificationOpenedActivityClass, showAsAlert && isActive);
+         }
       }
    }
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java

@@ -139,7 +139,7 @@ public interface PostNotificationResponseHandler {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "010901";
+   public static final String VERSION = "010902";
 
    private static PushRegistrator pushRegistrator;
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
@@ -155,6 +155,16 @@ public static void init(Activity context, String googleProjectNumber, String one
    }
 
    public static void init(Activity context, String googleProjectNumber, String oneSignalAppId, NotificationOpenedHandler inNotificationOpenedHandler) {
+
+      try {
+         Class.forName("com.amazon.device.messaging.ADM");
+         pushRegistrator = new PushRegistratorADM();
+         deviceType = 2;
+      } catch (ClassNotFoundException e) {
+         pushRegistrator = new PushRegistratorGPS();
+         deviceType = 1;
+      }
+
       // START: Init validation
       try {
          UUID.fromString(oneSignalAppId);
@@ -166,14 +176,22 @@ public static void init(Activity context, String googleProjectNumber, String one
       if ("b2f7f966-d8cc-11eg-bed1-df8f05be55ba".equals(oneSignalAppId) || "5eb5a37e-b458-11e3-ac11-000c2940e62c".equals(oneSignalAppId))
          Log(LOG_LEVEL.WARN, "OneSignal Example AppID detected, please update to your app's id found on OneSignal.com");
 
-      try {
-         Double.parseDouble(googleProjectNumber);
-         if (googleProjectNumber.length() < 8 || googleProjectNumber.length() > 16)
-            throw new IllegalArgumentException("Google Project number (Sender_ID) should be a 10 to 14 digit number in length.");
-      }
-      catch (Throwable t) {
-         Log(LOG_LEVEL.FATAL, "Google Project number (Sender_ID) format is invalid. Please use the 10 to 14 digit number found in the Google Developer Console for your project.\nExample: '703322744261'\n", t, context);
-         currentSubscription = -6;
+      if (deviceType == 1) {
+         try {
+            Double.parseDouble(googleProjectNumber);
+            if (googleProjectNumber.length() < 8 || googleProjectNumber.length() > 16)
+               throw new IllegalArgumentException("Google Project number (Sender_ID) should be a 10 to 14 digit number in length.");
+         } catch (Throwable t) {
+            Log(LOG_LEVEL.FATAL, "Google Project number (Sender_ID) format is invalid. Please use the 10 to 14 digit number found in the Google Developer Console for your project.\nExample: '703322744261'\n", t, context);
+            currentSubscription = -6;
+         }
+         
+         try {
+            Class.forName("com.google.android.gms.common.GooglePlayServicesUtil");
+         } catch (ClassNotFoundException e) {
+            Log(LOG_LEVEL.FATAL, "The Google Play services client library was not found. Please make sure to include it in your project.", e, context);
+            currentSubscription = -4;
+         }
       }
 
       try {
@@ -189,13 +207,6 @@ public static void init(Activity context, String googleProjectNumber, String one
          currentSubscription = -3;
       }
 
-      try {
-         Class.forName("com.google.android.gms.common.GooglePlayServicesUtil");
-      } catch (ClassNotFoundException e) {
-         Log(LOG_LEVEL.FATAL, "The Google Play services client library was not found. Please make sure to include it in your project.", e, context);
-         currentSubscription = -4;
-      }
-
       if (initDone) {
          if (context != null)
             appContext = context;
@@ -228,15 +239,6 @@ public static void init(Activity context, String googleProjectNumber, String one
          trackAmazonPurchase = new TrackAmazonPurchase(appContext);
       } catch (ClassNotFoundException e) {}
 
-      try {
-         Class.forName("com.amazon.device.messaging.ADM");
-         pushRegistrator = new PushRegistratorADM();
-         deviceType = 2;
-      } catch (ClassNotFoundException e) {
-         pushRegistrator = new PushRegistratorGPS();
-         deviceType = 1;
-      }
-
       // Re-register user if the app id changed, this might happen when a dev is testing.
       String oldAppId = getSavedAppId();
       if (oldAppId != null) {