Bug fixes

* Correctly sets isActive to true when it should be when enableInAppAlertNotification is set to true.
* Now handles switching over to a new Activity if it is finished, it implements the NotificationOpenedHandler interface, and OneSignal.init is called on the new Activity.
   - Added a TiedToCurrentActivity annotation to give the same effect as above without needing to add the NotificationOpenedHandler interface to your Activities.

Author: jkasten2

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

@@ -14,6 +14,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.Field;
+import java.util.HashMap;
+
 
 public class MainActivity extends ActionBarActivity {
 
@@ -32,23 +35,23 @@ 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(true);
+        OneSignal.enableInAppAlertNotification(false);
         OneSignal.enableNotificationsWhenActive(true);
         //OneSignal.setSubscription(false);
 
-//        OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {
-//            @Override
-//            public void idsAvailable(String userId, String registrationId) {
-//                Log.i("OneSignal Example:", "UserID: " + userId + ", RegId: " + (registrationId != null ? registrationId : "null"));
-//
-//                try {
-//                    // OneSignal.postNotification(new JSONObject("{'contents': {'en':'Test Message'}, 'include_player_ids': ['" + userId + "']}"));
-//                    OneSignal.postNotification(new JSONObject("{'contents': {'en':'Test Message'}, 'include_player_ids': ['" + "86480bb0-ef9a-11e4-8cf1-000c29917011', '2def6d7a-4395-11e4-890a-000c2940e62c" + "']}"), null);
-//                } catch (JSONException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        });
+        OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {
+            @Override
+            public void idsAvailable(String userId, String registrationId) {
+                Log.i("OneSignal Example:", "UserID: " + userId + ", RegId: " + (registrationId != null ? registrationId : "null"));
+
+                try {
+                    OneSignal.postNotification(new JSONObject("{'contents': {'en':'Test Message'}, 'include_player_ids': ['" + userId + "']}"), null);
+                    //OneSignal.postNotification(new JSONObject("{'contents': {'en':'Test Message'}, 'include_player_ids': ['" + "86480bb0-ef9a-11e4-8cf1-000c29917011', '2def6d7a-4395-11e4-890a-000c2940e62c" + "']}"), null);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
     @Override
@@ -85,6 +88,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     // NotificationOpenedHandler is implemented in its own class instead of adding implements to MainActivity so we don't hold on to a reference of our first activity if it gets recreated.
+    @OneSignal.TiedToCurrentActivity
     private class ExampleNotificationOpenedHandler implements NotificationOpenedHandler {
         /**
          * Callback to implement in your app to handle when a notification is opened from the Android status bar or
@@ -97,7 +101,7 @@ private class ExampleNotificationOpenedHandler implements NotificationOpenedHand
          */
         @Override
         public void notificationOpened(String message, JSONObject additionalData, boolean isActive) {
-            String messageTitle = "OneSignal Example", messageBody = message;
+            String messageTitle = "OneSignal Example:" + isActive, messageBody = message;
 
             try {
                 if (additionalData != null) {

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

@@ -1,17 +1,32 @@
 package com.onesignal.example;
 
+import android.app.Activity;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.onesignal.OneSignal;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 public class MainActivity2Activity extends ActionBarActivity {
 
+    private static Activity currentActivity;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main_activity2);
+
+        currentActivity = this;
+
+        OneSignal.init(this, "703322744261", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba", new ExampleNotificationOpenedHandler());
+        OneSignal.enableNotificationsWhenActive(true);
     }
 
     @Override
@@ -35,4 +50,38 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
+
+    private class ExampleNotificationOpenedHandler implements OneSignal.NotificationOpenedHandler {
+        /**
+         * Callback to implement in your app to handle when a notification is opened from the Android status bar or
+         * a new one comes in while the app is running.
+         * This method is located in this activity as an example, you may have any class you wish implement NotificationOpenedHandler and define this method.
+         *
+         * @param message        The message string the user seen/should see in the Android status bar.
+         * @param additionalData The additionalData key value pair section you entered in on onesignal.com.
+         * @param isActive       Was the app in the foreground when the notification was received.
+         */
+        @Override
+        public void notificationOpened(String message, JSONObject additionalData, boolean isActive) {
+            String messageTitle = "OneSignal Example2:" + isActive, messageBody = message;
+
+            try {
+                if (additionalData != null) {
+                    if (additionalData.has("title"))
+                        messageTitle = additionalData.getString("title");
+                    if (additionalData.has("actionSelected"))
+                        messageBody += "\nPressed ButtonID: " + additionalData.getString("actionSelected");
+
+                    messageBody = message + "\n\nFull additionalData:\n" + additionalData.toString();
+                }
+            } catch (JSONException e) {}
+
+            new AlertDialog.Builder(MainActivity2Activity.currentActivity)
+                    .setTitle(messageTitle)
+                    .setMessage(messageBody)
+                    .setCancelable(true)
+                    .setPositiveButton("OK", null)
+                    .create().show();
+        }
+    }
 }

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

@@ -100,17 +100,17 @@ public void onClick(DialogInterface dialog, int which) {
 
                         Bundle bundle = new Bundle(gcmBundle);
                         bundle.putString("custom", customJson.toString());
-                        OneSignal.handleNotificationOpened(context, bundle);
+                        OneSignal.handleNotificationOpened(bundle);
                      } catch (Throwable t) {}
                   }
                   else
-                     OneSignal.handleNotificationOpened(context, gcmBundle);
+                     OneSignal.handleNotificationOpened(gcmBundle);
                }
             };
             builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
                @Override
                public void onCancel(DialogInterface dialogInterface) {
-                  OneSignal.handleNotificationOpened(context, gcmBundle);
+                  OneSignal.handleNotificationOpened(gcmBundle);
                }
             });
 

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

@@ -30,6 +30,10 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -59,6 +63,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Looper;
 import android.os.SystemClock;
 import android.util.Log;
 import android.util.TypedValue;
@@ -72,6 +77,10 @@ public enum LOG_LEVEL {
       NONE, FATAL, ERROR, WARN, INFO, DEBUG, VERBOSE
    }
 
+   @Retention(RetentionPolicy.RUNTIME)
+   @Target(ElementType.TYPE)
+   public @interface TiedToCurrentActivity {}
+
    public interface NotificationOpenedHandler {
       /**
        * Callback to implement in your app to handle when a notification is
@@ -130,14 +139,17 @@ public interface PostNotificationResponseHandler {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "010900";
+   public static final String VERSION = "010901";
 
    private static PushRegistrator pushRegistrator;
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
 
    private static int deviceType;
    public static String sdkType = "native";
 
+   private static JSONObject nextInitAdditionalDataJSON = null;
+   private static String nextInitMessage = null;
+
    public static void init(Activity context, String googleProjectNumber, String oneSignalAppId) {
       init(context, googleProjectNumber, oneSignalAppId, null);
    }
@@ -184,8 +196,23 @@ public static void init(Activity context, String googleProjectNumber, String one
          currentSubscription = -4;
       }
 
-      if (initDone)
+      if (initDone) {
+         if (context != null)
+            appContext = context;
+         if (inNotificationOpenedHandler != null)
+            notificationOpenedHandler = inNotificationOpenedHandler;
+
+         onResumed();
+
+         if (nextInitMessage != null && notificationOpenedHandler != null) {
+            fireNotificationOpenedHandler(nextInitMessage, nextInitAdditionalDataJSON, false);
+
+            nextInitMessage = null;
+            nextInitAdditionalDataJSON = null;
+         }
+
          return;
+      }
 
       // END: Init validation
 
@@ -236,12 +263,16 @@ public void complete(String id) {
 
       // Called from tapping on a Notification from the status bar when the activity is completely dead and not open in any state.
       if (appContext.getIntent() != null && appContext.getIntent().getBundleExtra("data") != null)
-         runNotificationOpenedCallback(appContext.getIntent().getBundleExtra("data"), false, true);
+         runNotificationOpenedCallback(appContext.getIntent().getBundleExtra("data"), false);
 
       if (TrackGooglePurchase.CanTrack(appContext))
          trackGooglePurchase = new TrackGooglePurchase(appContext);
 
       initDone = true;
+
+      // In the future on Android 4.0 (API 14)+ devices use registerActivityLifecycleCallbacks
+      //    instead of requiring developers to call onPause and onResume in each activity.
+      // Might be able to use registerOnActivityPausedListener in Android 2.3.3 (API 10) to 3.2 (API 13) for backwards compatibility
    }
 
    private static void updateRegistrationId(String id) {
@@ -784,7 +815,7 @@ static void sendPurchases(JSONArray purchases, boolean newAsExisting, ResponseHa
       }
    }
 
-   private static void runNotificationOpenedCallback(final Bundle data, final boolean isActive, boolean isUiThread) {
+   private static void runNotificationOpenedCallback(final Bundle data, final boolean isActive) {
       try {
          JSONObject customJSON = new JSONObject(data.getString("custom"));
 
@@ -823,31 +854,43 @@ private static void runNotificationOpenedCallback(final Bundle data, final boole
             if (additionalDataJSON.equals(new JSONObject()))
                additionalDataJSON = null;
 
-            final JSONObject finalAdditionalDataJSON = additionalDataJSON;
-            Runnable callBack = new Runnable() {
-               @Override
-               public void run() {
-                  notificationOpenedHandler.notificationOpened(data.getString("alert"), finalAdditionalDataJSON, isActive);
-               }
-            };
+            if (appContext.isFinishing()
+               &&  (notificationOpenedHandler.getClass().isAnnotationPresent(TiedToCurrentActivity.class)
+                 || notificationOpenedHandler instanceof Activity )) {
 
-            if (isUiThread)
-               callBack.run();
-            else
-               appContext.runOnUiThread(callBack);
+               // Activity is finished or isFinishing, run callback later when OneSignal.init is called again from anther Activity.
+               nextInitAdditionalDataJSON = additionalDataJSON;
+               nextInitMessage = data.getString("alert");
+               return;
+            }
+
+            fireNotificationOpenedHandler(data.getString("alert"), additionalDataJSON, isActive);
          }
       } catch (Throwable t) {
          Log(LOG_LEVEL.ERROR, "Failed to run callback from notification opened.", t);
       }
    }
 
+   private static void fireNotificationOpenedHandler(final String message, final JSONObject additionalDataJSON, final boolean isActive) {
+      if (Looper.getMainLooper().getThread() == Thread.currentThread()) // isUIThread
+         notificationOpenedHandler.notificationOpened(message, additionalDataJSON, isActive);
+      else {
+         appContext.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+               notificationOpenedHandler.notificationOpened(message, additionalDataJSON, isActive);
+            }
+         });
+      }
+   }
+
    // Called when receiving GCM message when app is open and in focus.
    static void handleNotificationOpened(Bundle data) {
       sendNotificationOpened(appContext, data);
-      runNotificationOpenedCallback(data, true, false);
+      runNotificationOpenedCallback(data, true);
    }
 
-   // Called when opening a notification when the app is suspended in the background.
+   // Called when opening a notification when the app is suspended in the background or when it is dead
    public static void handleNotificationOpened(Context inContext, Bundle data) {
       sendNotificationOpened(inContext, data);
 
@@ -885,7 +928,7 @@ public static void handleNotificationOpened(Context inContext, Bundle data) {
       }
 
       if (initDone)
-         runNotificationOpenedCallback(data, false, false);
+         runNotificationOpenedCallback(data, false);
    }
 
    private static void sendNotificationOpened(Context inContext, Bundle data) {

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

@@ -131,14 +131,14 @@ public void idsAvailable(String userId, String registrationId) {
 
    public void enableSound(boolean enable) { OneSignal.enableSound(enable); }
 
-   public void enableVibrate(boolean enable) {
-      OneSignal.enableVibrate(enable);
-   }
+   public void enableVibrate(boolean enable) { OneSignal.enableVibrate(enable); }
 
    public void enableNotificationsWhenActive(boolean enable) { OneSignal.enableNotificationsWhenActive(enable); }
 
    public void enableInAppAlertNotification(boolean enable) { OneSignal.enableInAppAlertNotification(enable); }
 
+   public void setSubscription(boolean enable) { OneSignal.setSubscription(enable); }
+
    public void postNotification(String json) {
       OneSignal.postNotification(json, new PostNotificationResponseHandler() {
          @Override