From 1f6f25e434828eb06413f01f30670fd251040079 Mon Sep 17 00:00:00 2001
From: gdeluna-branch <94577415+gdeluna-branch@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:48:38 -0700
Subject: [PATCH] fix some tests

---
 .../java/io/branch/referral/BranchGAIDTest.java  | 16 ----------------
 .../main/java/io/branch/referral/DeviceInfo.java | 14 --------------
 .../java/io/branch/referral/ServerRequest.java   |  6 ++++--
 .../src/test/java/android/text/TextUtils.java    | 11 -----------
 4 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 Branch-SDK/src/test/java/android/text/TextUtils.java

diff --git a/Branch-SDK/src/androidTest/java/io/branch/referral/BranchGAIDTest.java b/Branch-SDK/src/androidTest/java/io/branch/referral/BranchGAIDTest.java
index a9caab3b9..b122704ca 100644
--- 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
index 964df3b3f..5f106ed8b 100644
--- 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
index 914c69dd5..635cee83a 100644
--- 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
deleted file mode 100644
index f0d302a5a..000000000
--- a/Branch-SDK/src/test/java/android/text/TextUtils.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package android.text;
-
-/**
- * All android methods don't exist when running unit tests, so we have to manually provide the
- * implementation ourselves.
- */
-public class TextUtils {
-    public static boolean isEmpty(CharSequence str) {
-        return str == null || str.length() == 0;
-    }
-}