Merge branch 'master' into fix/sql_db_lock_added_more_transactions

mikechoch · web-flow · commit 53c86e58f11f · 2020-06-10T16:57:27.000-04:00
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalCacheCleaner.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalCacheCleaner.java
@@ -118,5 +118,5 @@ private static void cleanCachedUniqueOutcomeEventNotifications(SQLiteDatabase wr
                 whereStr,
                 null);
     }
-
+  
 }
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalPrefs.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalPrefs.java
@@ -286,7 +286,7 @@ static Object getObject(String prefsName, String key, Object defValue) {
         }
 
         SharedPreferences prefs = getSharedPrefsByName(prefsName);
-        if (prefs != null ) {
+        if (prefs != null) {
             if (type.equals(String.class))
                return prefs.getString(key, (String)defValue);
             else if (type.equals(Boolean.class))

Original file line number	Diff line number	Diff line change
`@@ -118,5 +118,5 @@ private static void cleanCachedUniqueOutcomeEventNotifications(SQLiteDatabase wr`
`118`	`118`	`whereStr,`
`119`	`119`	`null);`
`120`	`120`	`}`
`121`		`-`
	`121`	`+`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ static Object getObject(String prefsName, String key, Object defValue) {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`SharedPreferences prefs = getSharedPrefsByName(prefsName);`
`289`		`- if (prefs != null ) {`
	`289`	`+ if (prefs != null) {`
`290`	`290`	`if (type.equals(String.class))`
`291`	`291`	`return prefs.getString(key, (String)defValue);`
`292`	`292`	`else if (type.equals(Boolean.class))`