Merge pull request #349 from Countly/temp_id_type_set

fix: correctly set temp id type

Author: turtledreams

sdk/src/main/java/ly/count/android/sdk/DeviceId.java

@@ -142,7 +142,7 @@ protected void changeToCustomId(@NonNull String deviceId) {
 
     protected void enterTempIDMode() {
         L.v("[DeviceId-int] enterTempIDMode");
-        setAndStoreId(DeviceIdType.DEVELOPER_SUPPLIED, ly.count.android.sdk.DeviceId.temporaryCountlyDeviceId);
+        setAndStoreId(DeviceIdType.TEMPORARY_ID, ly.count.android.sdk.DeviceId.temporaryCountlyDeviceId);
     }
 
     void setAndStoreId(@NonNull DeviceIdType setType, @NonNull String setDeviceId) {
@@ -164,9 +164,6 @@ void setAndStoreId(@NonNull DeviceIdType setType, @NonNull String setDeviceId) {
     protected DeviceIdType getType() {
         assert type != null;
 
-        if (isTemporaryIdModeEnabled()) {
-            return DeviceIdType.TEMPORARY_ID;
-        }
         return type;
     }