Merge branch 'master' into jay/MOB-4439-update-email

Author: roninopf

CHANGELOG.md

@@ -14,7 +14,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 #### Fixed
 - nothing yet
-- 
+
+## [3.4.8](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.8)
+#### Removed
+- Removed collection of advertising ID.
+
+#### Fixed
+- Fixed an issue where `disableDevice` would get called with no device token.
+
 ## [3.4.7](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.7)
 #### Added
 - This release makes offline events processing available to all Iterable customers who'd like to use it — just ask your customer success manager to enable it for your account. Offline events processing saves a local copy of events triggered in your app while the device is offline (up to 1000 events). When a connection is re-established and your app is in the foreground, the events will be sent to Iterable. For more information, read [Offline events processing](https://support.iterable.com/hc/articles/360035395671#offline-events-processing).

iterableapi-ui/build.gradle

@@ -48,7 +48,7 @@ ext {
     siteUrl = 'https://github.com/Iterable/iterable-android-sdk'
     gitUrl = 'https://github.com/Iterable/iterable-android-sdk.git'
 
-    libraryVersion = '3.4.7'
+    libraryVersion = '3.4.8'
 
     developerId = 'davidtruong'
     developerName = 'David Truong'

iterableapi/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
 
-        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.4.7\""
+        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.4.8\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -71,7 +71,7 @@ ext {
     siteUrl = 'https://github.com/Iterable/iterable-android-sdk'
     gitUrl = 'https://github.com/Iterable/iterable-android-sdk.git'
 
-    libraryVersion = '3.4.7'
+    libraryVersion = '3.4.8'
 
     developerId = 'davidtruong'
     developerName = 'David Truong'

iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java

@@ -429,7 +429,6 @@ protected void registerDeviceToken(@Nullable String email, @Nullable String user
             dataFields.put(IterableConstants.FIREBASE_COMPATIBLE, true);
             dataFields.put(IterableConstants.DEVICE_BRAND, Build.BRAND); //brand: google
             dataFields.put(IterableConstants.DEVICE_MANUFACTURER, Build.MANUFACTURER); //manufacturer: samsung
-            dataFields.putOpt(IterableConstants.DEVICE_ADID, IterableUtil.getAdvertisingId(authProvider.getContext())); //ADID: "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
             dataFields.put(IterableConstants.DEVICE_SYSTEM_NAME, Build.DEVICE); //device name: toro
             dataFields.put(IterableConstants.DEVICE_SYSTEM_VERSION, Build.VERSION.RELEASE); //version: 4.0.4
             dataFields.put(IterableConstants.DEVICE_MODEL, Build.MODEL); //device model: Galaxy Nexus

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -127,7 +127,6 @@ public final class IterableConstants {
     //Device
     public static final String DEVICE_BRAND             = "brand";
     public static final String DEVICE_MANUFACTURER      = "manufacturer";
-    public static final String DEVICE_ADID              = "advertisingId";
     public static final String DEVICE_SYSTEM_NAME       = "systemName";
     public static final String DEVICE_SYSTEM_VERSION    = "systemVersion";
     public static final String DEVICE_MODEL             = "model";

iterableapi/src/main/java/com/iterable/iterableapi/IterableUtil.java

@@ -49,14 +49,6 @@ static int convertVersionStringToInt(String versionString) {
         return instance.convertVersionStringToInt(versionString);
     }
 
-    /**
-     * Gets the advertisingId if available
-     * @return
-     */
-    static String getAdvertisingId(Context context) {
-        return instance.getAdvertisingId(context);
-    }
-
     static void saveExpirableJsonObject(SharedPreferences preferences, String key, JSONObject object, long expirationInterval) {
         instance.saveExpirableJsonObject(preferences, key, object, expirationInterval);
     }
@@ -145,25 +137,6 @@ int convertVersionStringToInt(String versionString) {
             return version;
         }
 
-        String getAdvertisingId(Context context) {
-            String advertisingId = null;
-            try {
-                Class adClass = Class.forName("com.google.android.gms.ads.identifier.AdvertisingIdClient");
-                if (adClass != null) {
-                    Object advertisingIdInfo = adClass.getMethod("getAdvertisingIdInfo", Context.class).invoke(null, context);
-                    if (advertisingIdInfo != null) {
-                        advertisingId = (String) advertisingIdInfo.getClass().getMethod("getId").invoke(advertisingIdInfo);
-                    }
-                }
-            } catch (ClassNotFoundException e) {
-                IterableLogger.d(TAG, "ClassNotFoundException: Can't track ADID. " +
-                        "Check that play-services-ads is added to the dependencies.", e);
-            } catch (Exception e) {
-                IterableLogger.w(TAG, "Error while fetching advertising ID", e);
-            }
-            return advertisingId;
-        }
-
         void saveExpirableJsonObject(SharedPreferences preferences, String key, JSONObject object, long expirationInterval) {
             saveExpirableValue(preferences, key, object.toString(), expirationInterval);
         }

sample-apps/inbox-customization/app/build.gradle

@@ -33,8 +33,8 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'com.google.android.material:material:1.1.0'
 
-    implementation 'com.iterable:iterableapi:3.4.7'
-    implementation 'com.iterable:iterableapi-ui:3.4.7'
+    implementation 'com.iterable:iterableapi:3.4.8'
+    implementation 'com.iterable:iterableapi-ui:3.4.8'
     implementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
 
     testImplementation 'junit:junit:4.12'