Merge branch 'release/2.2.3'

Author: Enuviel

AndroidSDK/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:protectionLevel="signature" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
 
-    <application android:label="@string/app_name">
+    <application>
 
         <!-- Leanplum Push Notification Receiver for GCM and FCM -->
         <receiver android:name="com.leanplum.LeanplumPushReceiver" android:exported="false"

AndroidSDK/proguard-rules.pro

@@ -1,6 +1,7 @@
 -dontwarn com.actionbarsherlock.**
 
 -dontnote
+-dontshrink
 -keepparameternames
 -keepattributes EnclosingMethod
 

AndroidSDK/src/com/leanplum/LeanplumInbox.java

@@ -306,9 +306,25 @@ public List<String> messagesIds() {
     try {
       Collections.sort(messageIds, new Comparator<String>() {
         @Override
-        public int compare(String firstMessage, String secondMessage) {
-          Date firstDate = messageForId(firstMessage).getDeliveryTimestamp();
-          Date secondDate = messageForId(secondMessage).getDeliveryTimestamp();
+        public int compare(String firstMessageId, String secondMessageId) {
+          // Message that is null will be moved to the back of the list.
+          LeanplumInboxMessage firstMessage = messageForId(firstMessageId);
+          if (firstMessage == null) {
+            return -1;
+          }
+          LeanplumInboxMessage secondMessage = messageForId(secondMessageId);
+          if (secondMessage == null) {
+            return 1;
+          }
+          // Message with null date will be moved to the back of the list.
+          Date firstDate = firstMessage.getDeliveryTimestamp();
+          if (firstDate == null) {
+            return -1;
+          }
+          Date secondDate = secondMessage.getDeliveryTimestamp();
+          if (secondDate == null) {
+            return 1;
+          }
           return firstDate.compareTo(secondDate);
         }
       });

AndroidSDK/src/com/leanplum/LeanplumLocalPushListenerService.java

@@ -47,7 +47,7 @@ protected void onHandleIntent(Intent intent) {
         return;
       }
       Bundle extras = intent.getExtras();
-      if (!extras.isEmpty() && extras.containsKey(Constants.Keys.PUSH_MESSAGE_TEXT)) {
+      if (extras != null && extras.containsKey(Constants.Keys.PUSH_MESSAGE_TEXT)) {
         LeanplumPushService.handleNotification(this, extras);
       }
     } catch (Throwable t) {

AndroidSDK/src/com/leanplum/LeanplumPushService.java

@@ -283,6 +283,10 @@ static void handleNotification(final Context context, final Bundle message) {
    * Put the message into a notification and post it.
    */
   private static void showNotification(Context context, Bundle message) {
+    if (context == null || message == null) {
+      return;
+    }
+
     NotificationManager notificationManager = (NotificationManager)
         context.getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -346,7 +350,15 @@ private static void showNotification(Context context, Bundle message) {
         notificationId = value.hashCode();
       }
     }
-    notificationManager.notify(notificationId, builder.build());
+
+    try {
+      notificationManager.notify(notificationId, builder.build());
+    } catch (NullPointerException e) {
+      Log.e("Unable to show push notification.", e);
+    } catch (Throwable t) {
+      Log.e("Unable to show push notification.", t);
+      Util.handleException(t);
+    }
   }
 
   static void openNotification(Context context, final Bundle notification) {
@@ -375,6 +387,9 @@ static void openNotification(Context context, final Bundle notification) {
 
     if (shouldStartActivity) {
       Intent actionIntent = getActionIntent(context);
+      if (actionIntent == null) {
+        return;
+      }
       actionIntent.putExtras(notification);
       actionIntent.addFlags(
           Intent.FLAG_ACTIVITY_CLEAR_TOP |

AndroidSDK/src/com/leanplum/LocationManagerImplementation.java

@@ -241,7 +241,11 @@ private void startLocationClient() {
 
   private boolean isPermissionGranted() {
     Context context = Leanplum.getContext();
-    return context.checkCallingOrSelfPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED;
+    try {
+      return context.checkCallingOrSelfPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED;
+    } catch (RuntimeException ignored) {
+      return false;
+    }
   }
 
   private boolean isMetaDataSet() {

AndroidSDK/src/com/leanplum/NewsfeedMessage.java

@@ -146,9 +146,13 @@ public Date deliveryTimestamp() {
   }
 
   /**
-   * Returns the delivery timestamp of the newsfeed message.
+   * Returns the delivery timestamp of the newsfeed message,
+   * or null if delivery timestamp is not present.
    */
   public Date getDeliveryTimestamp() {
+    if (deliveryTimestamp == null) {
+      return null;
+    }
     return new Date(deliveryTimestamp);
   }
 

AndroidSDK/src/com/leanplum/internal/ActionManager.java

@@ -86,7 +86,7 @@ public static LocationManager getLocationManager() {
         }
       } catch (Throwable e) {
         if (!loggedLocationManagerFailure) {
-          Log.e("Geofencing support requires Google Play Services v8.1 and higher.\n" +
+          Log.w("Geofencing support requires Google Play Services v8.1 and higher.\n" +
               "Add this to your build.gradle file:\n" +
               "compile ('com.google.android.gms:play-services-location:8.3.0+')");
           loggedLocationManagerFailure = true;
@@ -240,7 +240,7 @@ public boolean onResponse(ActionContext actionContext) {
           }
 
           // Cancel notification.
-          Intent intentAlarm = new Intent(context, LeanplumPushService.class);
+          Intent intentAlarm = new Intent(context, LeanplumLocalPushListenerService.class);
           AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
           PendingIntent existingIntent = PendingIntent.getService(
               context, messageId.hashCode(), intentAlarm, PendingIntent.FLAG_UPDATE_CURRENT);

AndroidSDK/src/com/leanplum/internal/Constants.java

@@ -37,7 +37,7 @@ public class Constants {
   public static int NETWORK_TIMEOUT_SECONDS_FOR_DOWNLOADS = 10;
   static final String LEANPLUM_PACKAGE_IDENTIFIER = BuildConfig.LEANPLUM_PACKAGE_IDENTIFIER;
 
-  public static String LEANPLUM_VERSION = "2.2.2";
+  public static String LEANPLUM_VERSION = "2.2.3";
   public static String CLIENT = "android";
 
   static final String INVALID_MAC_ADDRESS = "02:00:00:00:00:00";

AndroidSDK/src/com/leanplum/internal/LeanplumInternal.java

@@ -413,6 +413,9 @@ protected Void doInBackground(Void... voids) {
                 }
               } catch (IOException e) {
                 Log.e("Failed to connect to Geocoder: " + e);
+              } catch (IllegalArgumentException e) {
+                Log.e("Invalid latitude or longitude values: " + e);
+              } catch (Throwable ignored) {
               }
             }
             Request req = Request.post(Constants.Methods.SET_USER_ATTRIBUTES, params);
@@ -532,10 +535,6 @@ public static <T> Map<String, T> validateAttributes(Map<String, T> attributes, S
       for (Map.Entry<String, T> entry : attributes.entrySet()) {
         T value = entry.getValue();
 
-        if (value == null) {
-          continue;
-        }
-
         // Validate lists.
         if (allowLists && value instanceof Iterable<?>) {
           boolean valid = true;
@@ -556,7 +555,7 @@ public static <T> Map<String, T> validateAttributes(Map<String, T> attributes, S
             Date date = CollectionUtil.uncheckedCast(value);
             value = CollectionUtil.uncheckedCast(date.getTime());
           }
-          if (!isValidScalarValue(value, argName)) {
+          if (value != null && !isValidScalarValue(value, argName)) {
             continue;
           }
         }