fix some tests

BranchMetrics · Jul 18, 2023 · 1f6f25e · 1f6f25e
1 parent bb33252
commit 1f6f25e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/Branch-SDK/src/androidTest/java/io/branch/referral/BranchGAIDTest.java b/Branch-SDK/src/androidTest/java/io/branch/referral/BranchGAIDTest.java
@@ -137,22 +137,6 @@ public void run() {
         }, null);
     }
 
-    @Test
-    public void testLogout_hasGAIDv1() {
-        // TODO: initSession needed first
-    }
-
-    @Test
-    public void testPing_hasGAIDv1() {
-        // TODO: Ping does not get enqueued
-    }
-
-    @Test
-    public void testClose_hasGAIDv1() {
-        // TODO: Close happens in a Session context
-        // Note that closeSessionInternal cannot be run on a non-UI thread
-    }
-
     @Test
     public void testStandardEvent_hasGAIDv2() {
         initBranchInstance(TEST_KEY);

diff --git a/Branch-SDK/src/main/java/io/branch/referral/DeviceInfo.java b/Branch-SDK/src/main/java/io/branch/referral/DeviceInfo.java
@@ -217,20 +217,6 @@ void updateRequestWithV2Params(ServerRequest serverRequest, PrefHelper prefHelpe
         } catch (JSONException ignore) { }
     }
 
-    /**
-     * Update the server request with params for all events
-     * @param serverRequest
-     * @param prefHelper
-     * @param requestObj
-     */
-    void updateRequestWithParamsAllEvents(ServerRequest serverRequest, PrefHelper prefHelper, JSONObject requestObj){
-        try {
-            requestObj.put(Defines.Jsonkey.Debug.getKey(), Branch.isDeviceIDFetchDisabled());
-        }
-        catch (JSONException ignore){
-        }
-    }
-
     private void maybeAddTuneFields(ServerRequest serverRequest, JSONObject requestObj) throws JSONException {
         if (serverRequest.isInitializationOrEventRequest()) {
             // fields for parity with Tune traffic

diff --git a/Branch-SDK/src/main/java/io/branch/referral/ServerRequest.java b/Branch-SDK/src/main/java/io/branch/referral/ServerRequest.java
@@ -198,12 +198,14 @@ protected void setPost(JSONObject post) throws JSONException {
 
         if (getBranchRemoteAPIVersion() == BRANCH_API_VERSION.V1) {
             DeviceInfo.getInstance().updateRequestWithV1Params(this, params_);
-        } else {
+        }
+        else {
             JSONObject userDataObj = new JSONObject();
             params_.put(Defines.Jsonkey.UserData.getKey(), userDataObj);
             DeviceInfo.getInstance().updateRequestWithV2Params(this, prefHelper_, userDataObj);
         }
-        DeviceInfo.getInstance().updateRequestWithParamsAllEvents(this, prefHelper_, params_);
+
+        params_.put(Defines.Jsonkey.Debug.getKey(), Branch.isDeviceIDFetchDisabled());
     }
 
     /**

diff --git a/Branch-SDK/src/test/java/android/text/TextUtils.java b/Branch-SDK/src/test/java/android/text/TextUtils.java