Merge branch 'master' into major_release_4.0.0

Author: Jeasmine

OneSignalSDK.jar

@@ -33,7 +33,7 @@
 
 -keep class com.onesignal.shortcutbadger.impl.AdwHomeBadger { <init>(...); }
 -keep class com.onesignal.shortcutbadger.impl.ApexHomeBadger { <init>(...); }
--keep class com.onesignal.shortcutbadger.impl.AsusHomeLauncher { <init>(...); }
+-keep class com.onesignal.shortcutbadger.impl.AsusHomeBadger { <init>(...); }
 -keep class com.onesignal.shortcutbadger.impl.DefaultBadger { <init>(...); }
 -keep class com.onesignal.shortcutbadger.impl.EverythingMeHomeBadger { <init>(...); }
 -keep class com.onesignal.shortcutbadger.impl.HuaweiHomeBadger { <init>(...); }

OneSignalSDK/onesignal/consumer-proguard-rules.pro

@@ -24,7 +24,7 @@ class Global {
     static def POM_NAME = 'OneSignal'
     static def POM_ARTIFACT_ID = 'OneSignal'
     static def POM_PACKAGING = 'aar'
-    static def VERSION_NAME = '3.15.1'
+    static def VERSION_NAME = '3.15.3'
 
     static def GROUP_ID = 'com.onesignal'
     static def POM_DESCRIPTION = 'OneSignal Android SDK'

OneSignalSDK/onesignal/maven-push.gradle

@@ -31,7 +31,6 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
@@ -73,14 +72,14 @@ private static boolean areBadgesEnabled(Context context) {
       return areBadgeSettingsEnabled(context) && OSUtils.areNotificationsEnabled(context);
    }
 
-   static void update(SQLiteDatabase readableDb, Context context) {
+   static void update(OneSignalDb db, Context context) {
       if (!areBadgesEnabled(context))
          return;
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
          updateStandard(context);
       else
-         updateFallback(readableDb, context);
+         updateFallback(db, context);
    }
 
    @RequiresApi(api = Build.VERSION_CODES.M)
@@ -97,8 +96,8 @@ private static void updateStandard(Context context) {
       updateCount(runningCount, context);
    }
 
-   private static void updateFallback(SQLiteDatabase readableDb, Context context) {
-      Cursor cursor = readableDb.query(
+   private static void updateFallback(OneSignalDb db, Context context) {
+      Cursor cursor = db.query(
          NotificationTable.TABLE_NAME,
          null,
          OneSignalDbHelper.recentUninteractedWithNotificationsWhere().toString(),

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

@@ -36,7 +36,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -470,8 +469,6 @@ private static void createSummaryNotification(OSNotificationGenerationJob notifi
       Cursor cursor = null;
 
       try {
-         SQLiteDatabase readableDb = dbHelper.getSQLiteDatabaseWithRetries();
-   
          String[] retColumn = { NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID,
              NotificationTable.COLUMN_NAME_FULL_DATA,
              NotificationTable.COLUMN_NAME_IS_SUMMARY,
@@ -487,7 +484,7 @@ private static void createSummaryNotification(OSNotificationGenerationJob notifi
          if (!updateSummary && notificationJob.getAndroidId() != -1)
             whereStr += " AND " + NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID + " <> " + notificationJob.getAndroidId();
 
-         cursor = readableDb.query(
+         cursor = dbHelper.query(
              NotificationTable.TABLE_NAME,
              retColumn,
              whereStr,
@@ -709,28 +706,11 @@ private static Intent createBaseSummaryIntent(int summaryNotificationId, JSONObj
    private static void createSummaryIdDatabaseEntry(OneSignalDbHelper dbHelper, String group, int id) {
       // There currently isn't a visible notification from for this group_id.
       // Save the group summary notification id so it can be updated later.
-      SQLiteDatabase writableDb = null;
-      try {
-         writableDb = dbHelper.getSQLiteDatabaseWithRetries();
-         writableDb.beginTransaction();
-      
-         ContentValues values = new ContentValues();
-         values.put(NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID, id);
-         values.put(NotificationTable.COLUMN_NAME_GROUP_ID, group);
-         values.put(NotificationTable.COLUMN_NAME_IS_SUMMARY, 1);
-         writableDb.insertOrThrow(NotificationTable.TABLE_NAME, null, values);
-         writableDb.setTransactionSuccessful();
-      } catch (Throwable t) {
-         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error adding summary notification record! ", t);
-      } finally {
-         if (writableDb != null) {
-            try {
-               writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
-            } catch (Throwable t) {
-               OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error closing transaction! ", t);
-            }
-         }
-      }
+      ContentValues values = new ContentValues();
+      values.put(NotificationTable.COLUMN_NAME_ANDROID_NOTIFICATION_ID, id);
+      values.put(NotificationTable.COLUMN_NAME_GROUP_ID, group);
+      values.put(NotificationTable.COLUMN_NAME_IS_SUMMARY, 1);
+      dbHelper.insertOrThrow(NotificationTable.TABLE_NAME, null, values);
    }
 
    // Keep 'throws Throwable' as 'onesignal_bgimage_notif_layout' may not be available