core changes

willpassidomo · willpassidomo · commit 6f28ca94b05b · 2022-07-29T17:01:34.000-04:00
diff --git a/android-core/build.gradle b/android-core/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     androidTestImplementation "androidx.lifecycle:lifecycle-common:2.5.0"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2-native-mt"
-    androidTestImplementation("com.mparticle.internal:mocking:1.3.0")
+    androidTestImplementation("com.mparticle.internal:mocking:1.4.0")
     androidTestImplementation 'androidx.test:rules:1.4.0'
 }
 
diff --git a/android-core/src/main/java/com/mparticle/MParticle.java b/android-core/src/main/java/com/mparticle/MParticle.java
@@ -1634,7 +1634,8 @@ public interface ResetListener {
      * @hidden
      */
     public class Internal {
-        protected Internal() { }
+
+        private Internal() { }
 
         /**
          * The ConfigManager is tasked with incorporating server-based, run-time, and XML configuration,
diff --git a/android-core/src/main/java/com/mparticle/identity/IdentityApi.java b/android-core/src/main/java/com/mparticle/identity/IdentityApi.java
@@ -392,7 +392,7 @@ public void run() {
                         }
                     } catch (Exception ex) {
                         ConfigManager.setIdentityRequestInProgress(false);
-                        task.setFailed(new IdentityHttpResponse(IdentityApi.UNKNOWN_ERROR, ex.toString()));
+                        task.setFailed(new IdentityHttpResponse(IdentityApi.UNKNOWN_ERROR, ex));
                     }
                 }
             }
diff --git a/android-core/src/main/java/com/mparticle/identity/IdentityHttpResponse.java b/android-core/src/main/java/com/mparticle/identity/IdentityHttpResponse.java
@@ -14,10 +14,11 @@
 
 public final class IdentityHttpResponse {
     private ArrayList<Error> errors = new ArrayList<Error>();
-    private long mpId;
+    private Long mpId = null;
     private String context;
     private int httpCode;
     private boolean loggedIn;
+    private Exception exception;
 
     @NonNull public static final String MPID = "mpid";
     @NonNull public static final String CONTEXT = "context";
@@ -42,6 +43,11 @@ public IdentityHttpResponse(int code, @NonNull String errorString) {
         this.errors.add(new Error(UNKNOWN, errorString));
     }
 
+    public IdentityHttpResponse(int code, @NonNull Exception exception) {
+        this(code, exception.getMessage());
+        this.exception = exception;
+    }
+
     public IdentityHttpResponse(int httpCode, @Nullable JSONObject jsonObject) throws JSONException {
         this.httpCode = httpCode;
         if (!MPUtility.isEmpty(jsonObject)) {
@@ -80,7 +86,8 @@ public List<Error> getErrors() {
         return errors;
     }
 
-    public long getMpId() {
+    @Nullable
+    public Long getMpId() {
         return mpId;
     }
 
@@ -93,6 +100,11 @@ public int getHttpCode() {
         return httpCode;
     }
 
+    @Nullable
+    public Exception getException() {
+        return exception;
+    }
+
     public boolean isLoggedIn() {
         return loggedIn;
     }
diff --git a/android-core/src/main/java/com/mparticle/identity/MParticleIdentityClientImpl.java b/android-core/src/main/java/com/mparticle/identity/MParticleIdentityClientImpl.java
@@ -250,7 +250,7 @@ private IdentityHttpResponse parseIdentityResponse(int httpCode, JSONObject json
             }
             return httpResponse;
         } catch (JSONException e) {
-            return new IdentityHttpResponse(httpCode, e.getMessage());
+            return new IdentityHttpResponse(httpCode, e);
         }
     }
 
diff --git a/android-core/src/main/java/com/mparticle/internal/MParticleApiClient.java b/android-core/src/main/java/com/mparticle/internal/MParticleApiClient.java
@@ -30,7 +30,7 @@ public AliasNetworkResponse(int responseCode) {
             this(responseCode, null);
         }
 
-        AliasNetworkResponse(int responseCode, String errorMessage) {
+        public AliasNetworkResponse(int responseCode, String errorMessage) {
             this.responseCode = responseCode;
             this.errorMessage = errorMessage;
         }
diff --git a/android-core/src/main/java/com/mparticle/internal/MParticleApiClientImpl.java b/android-core/src/main/java/com/mparticle/internal/MParticleApiClientImpl.java
@@ -68,7 +68,7 @@ public class MParticleApiClientImpl extends MParticleBaseClientImpl implements M
     private final String mApiKey;
     private final Context mContext;
     Integer mDeviceRampNumber = null;
-    private static String sSupportedKits;
+    private String supportedKits;
     private JSONObject mCurrentCookies;
 
     /**
@@ -104,8 +104,8 @@ void setConfigUrl(MPUrl configUrl) {
         mConfigUrl = configUrl;
     }
 
-    static void setSupportedKitString(String supportedKitString) {
-        sSupportedKits = supportedKitString;
+    void setSupportedKitString(String supportedKitString) {
+        supportedKits = supportedKitString;
     }
 
 
@@ -415,7 +415,7 @@ private void checkRampValue() throws MPRampException {
     }
 
     private String getSupportedKitString(){
-        if (sSupportedKits == null) {
+        if (supportedKits == null) {
             MParticle instance = MParticle.getInstance();
             if (instance != null) {
                 Set<Integer> supportedKitIds = instance.Internal().getKitManager().getSupportedKits();
@@ -429,13 +429,13 @@ private String getSupportedKitString(){
                             buffer.append(",");
                         }
                     }
-                    sSupportedKits = buffer.toString();
+                    supportedKits = buffer.toString();
                 }
             } else {
-                sSupportedKits = "";
+                supportedKits = "";
             }
         }
-        return sSupportedKits;
+        return supportedKits;
     }
 
     public void setCookies(JSONObject serverCookies) {
diff --git a/android-core/src/main/java/com/mparticle/internal/UploadHandler.java b/android-core/src/main/java/com/mparticle/internal/UploadHandler.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
@@ -17,7 +16,6 @@
 import com.mparticle.segmentation.SegmentListener;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java
@@ -39,7 +39,7 @@ public static NetworkOptions validateAndResolve(NetworkOptions networkOptions) {
     }
 
 
-    static NetworkOptions defaultNetworkOptions() {
+    public static NetworkOptions defaultNetworkOptions() {
         return NetworkOptions.builder()
                 .addDomainMapping(DomainMapping.identityMapping(getDefaultUrl(Endpoint.IDENTITY))
                         .setCertificates(defaultCertificates)
diff --git a/android-core/src/test/java/com/mparticle/MockMParticle.java b/android-core/src/test/java/com/mparticle/MockMParticle.java
@@ -19,7 +19,7 @@ public class MockMParticle extends MParticle {
 
     public MockMParticle() {
         mAppContext = new MockContext();
-        mInternal = new Internal();
+        mInternal = Mockito.mock(Internal.class);
         mConfigManager = Mockito.mock(ConfigManager.class);
         mKitManager = Mockito.mock(KitFrameworkWrapper.class);
         mAppStateManager = Mockito.mock(AppStateManager.class);
@@ -29,12 +29,13 @@ public MockMParticle() {
         mMessageManager = Mockito.mock(MessageManager.class);
         mMessaging = Mockito.mock(MPMessagingAPI.class);
         mMedia = Mockito.mock(MPMediaAPI.class);
-        mIdentityApi = new IdentityApi(new MockContext(), mAppStateManager, mMessageManager, Internal().getConfigManager(), mKitManager, OperatingSystem.ANDROID);
         Mockito.when(mKitManager.updateKits(Mockito.any())).thenReturn(new KitsLoadedCallback());
-        MPEvent event = new MPEvent.Builder("this")
-                .customAttributes(new HashMap<String, String>())
-                .build();
-        Map<String, ?> attributes = event.getCustomAttributes();
+        Mockito.when(mInternal.getAppStateManager()).thenReturn(mAppStateManager);
+        Mockito.when(mInternal.getConfigManager()).thenReturn(mConfigManager);
+        Mockito.when(mInternal.getKitManager()).thenReturn(mKitManager);
+        Mockito.when(mInternal.getMessageManager()).thenReturn(mMessageManager);
+        mIdentityApi = new IdentityApi(new MockContext(), mAppStateManager, mMessageManager, Internal().getConfigManager(), mKitManager, OperatingSystem.ANDROID);
+
     }
 
 
diff --git a/android-kit-base/build.gradle b/android-kit-base/build.gradle
@@ -75,5 +75,5 @@ dependencies {
     testImplementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation project(':testutils')
 
-    androidTestImplementation "com.mparticle.internal:mocking:1.3.0"
+    androidTestImplementation "com.mparticle.internal:mocking:1.4.0"
 }
diff --git a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/ConfiguredKitOptions.kt b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/ConfiguredKitOptions.kt
@@ -5,10 +5,14 @@ import com.mparticle.messages.KitConfigMessage
 class ConfiguredKitOptions : KitOptions() {
     val initialConfig = mutableMapOf<Int, KitConfigMessage>()
 
-    override fun addKit(type: Class<out KitIntegration>, kitId: Int): ConfiguredKitOptions {
+    fun addKit(type: Class<out KitIntegration>, kitId: Int): ConfiguredKitOptions {
         return addKit(type, KitConfigMessage(id = kitId))
     }
 
+    override fun addKit(kitId: Int, type: Class<out KitIntegration>): KitOptions {
+        return addKit(type, kitId)
+    }
+
     fun addKit(type: Class<out KitIntegration>, kitId: Int, includeInConfig: Boolean): ConfiguredKitOptions {
         return addKit(type, KitConfigMessage(id = kitId), includeInConfig)
     }
@@ -17,7 +21,7 @@ class ConfiguredKitOptions : KitOptions() {
         if (includeInConfig) {
             initialConfig[config.id] = config
         }
-        super.addKit(type, config.id)
+        super.addKit(config.id, type)
         return this
     }
 }
diff --git a/android-kit-base/src/main/kotlin/com/mparticle/internal/AccessUtil.kt b/android-kit-base/src/main/kotlin/com/mparticle/internal/AccessUtil.kt
@@ -0,0 +1,8 @@
+package com.mparticle.internal
+
+import com.mparticle.MParticle
+import com.mparticle.kits.KitManagerImpl
+
+object AccessUtil {
+    fun kitManager(): KitManagerImpl = (MParticle.getInstance()?.Internal()?.kitManager as KitFrameworkWrapper).mKitManager as KitManagerImpl
+}
diff --git a/testutils/src/main/java/com/mparticle/mock/MockMParticle.java b/testutils/src/main/java/com/mparticle/mock/MockMParticle.java
@@ -29,11 +29,4 @@ public MockMParticle() {
     public void setIdentityApi(IdentityApi identityApi) {
         this.mIdentityApi = identityApi;
     }
-
-    class MockInternal extends Internal {
-
-        MockInternal() {
-            super();
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ dependencies {`
`169`	`169`	`androidTestImplementation "androidx.lifecycle:lifecycle-common:2.5.0"`
`170`	`170`	`androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"`
`171`	`171`	`androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2-native-mt"`
`172`		`- androidTestImplementation("com.mparticle.internal:mocking:1.3.0")`
	`172`	`+ androidTestImplementation("com.mparticle.internal:mocking:1.4.0")`
`173`	`173`	`androidTestImplementation 'androidx.test:rules:1.4.0'`
`174`	`174`	`}`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ public void run() {`
`392`	`392`	`}`
`393`	`393`	`} catch (Exception ex) {`
`394`	`394`	`ConfigManager.setIdentityRequestInProgress(false);`
`395`		`- task.setFailed(new IdentityHttpResponse(IdentityApi.UNKNOWN_ERROR, ex.toString()));`
	`395`	`+ task.setFailed(new IdentityHttpResponse(IdentityApi.UNKNOWN_ERROR, ex));`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ private IdentityHttpResponse parseIdentityResponse(int httpCode, JSONObject json`
`250`	`250`	`}`
`251`	`251`	`return httpResponse;`
`252`	`252`	`} catch (JSONException e) {`
`253`		`- return new IdentityHttpResponse(httpCode, e.getMessage());`
	`253`	`+ return new IdentityHttpResponse(httpCode, e);`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public AliasNetworkResponse(int responseCode) {`
`30`	`30`	`this(responseCode, null);`
`31`	`31`	`}`
`32`	`32`
`33`		`- AliasNetworkResponse(int responseCode, String errorMessage) {`
	`33`	`+ public AliasNetworkResponse(int responseCode, String errorMessage) {`
`34`	`34`	`this.responseCode = responseCode;`
`35`	`35`	`this.errorMessage = errorMessage;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public class MParticleApiClientImpl extends MParticleBaseClientImpl implements M`
`68`	`68`	`private final String mApiKey;`
`69`	`69`	`private final Context mContext;`
`70`	`70`	`Integer mDeviceRampNumber = null;`
`71`		`- private static String sSupportedKits;`
	`71`	`+ private String supportedKits;`
`72`	`72`	`private JSONObject mCurrentCookies;`
`73`	`73`
`74`	`74`	`/**`
`@@ -104,8 +104,8 @@ void setConfigUrl(MPUrl configUrl) {`
`104`	`104`	`mConfigUrl = configUrl;`
`105`	`105`	`}`
`106`	`106`
`107`		`- static void setSupportedKitString(String supportedKitString) {`
`108`		`- sSupportedKits = supportedKitString;`
	`107`	`+ void setSupportedKitString(String supportedKitString) {`
	`108`	`+ supportedKits = supportedKitString;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`
`@@ -415,7 +415,7 @@ private void checkRampValue() throws MPRampException {`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`private String getSupportedKitString(){`
`418`		`- if (sSupportedKits == null) {`
	`418`	`+ if (supportedKits == null) {`
`419`	`419`	`MParticle instance = MParticle.getInstance();`
`420`	`420`	`if (instance != null) {`
`421`	`421`	`Set<Integer> supportedKitIds = instance.Internal().getKitManager().getSupportedKits();`
`@@ -429,13 +429,13 @@ private String getSupportedKitString(){`
`429`	`429`	`buffer.append(",");`
`430`	`430`	`}`
`431`	`431`	`}`
`432`		`- sSupportedKits = buffer.toString();`
	`432`	`+ supportedKits = buffer.toString();`
`433`	`433`	`}`
`434`	`434`	`} else {`
`435`		`- sSupportedKits = "";`
	`435`	`+ supportedKits = "";`
`436`	`436`	`}`
`437`	`437`	`}`
`438`		`- return sSupportedKits;`
	`438`	`+ return supportedKits;`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`public void setCookies(JSONObject serverCookies) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static NetworkOptions validateAndResolve(NetworkOptions networkOptions) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`
`42`		`- static NetworkOptions defaultNetworkOptions() {`
	`42`	`+ public static NetworkOptions defaultNetworkOptions() {`
`43`	`43`	`return NetworkOptions.builder()`
`44`	`44`	`.addDomainMapping(DomainMapping.identityMapping(getDefaultUrl(Endpoint.IDENTITY))`
`45`	`45`	`.setCertificates(defaultCertificates)`