From 9979cf5d6591458ed0b87e2031e639944f279c35 Mon Sep 17 00:00:00 2001
From: Abhishek Pandey <abhishekpandey10196@gmail.com>
Date: Thu, 2 Feb 2023 15:45:28 +0530
Subject: [PATCH] chore: addressing comment

---
 .../android/sdk/core/EventRepository.java     | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java b/core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java
index 1851326db..b62c80098 100644
--- a/core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java
+++ b/core/src/main/java/com/rudderstack/android/sdk/core/EventRepository.java
@@ -166,22 +166,11 @@ public void run() {
                         if (serverConfig != null) {
                             isSDKEnabled = serverConfig.source.isSourceEnabled;
                             if (isSDKEnabled) {
-                                // Initialise dataPlaneUrl based on Residency server
-                                RudderDataResidencyManager rudderDataResidencyManager = new RudderDataResidencyManager(serverConfig, config);
-                                dataPlaneUrl = rudderDataResidencyManager.getDataResidencyUrl();
-                                if (Utils.isEmpty(dataPlaneUrl)) {
-                                    dataPlaneUrl = config.getDataPlaneUrl();
-                                }
+                                dataPlaneUrl = getDataPlaneUrlWrtResidencyConfig(serverConfig, config);
                                 RudderLogger.logDebug("DataPlaneUrl is set to: " + dataPlaneUrl);
 
-                                // save flush config
-                                RudderFlushConfig rudderFlushConfig = new RudderFlushConfig(dataPlaneUrl, authHeaderString, anonymousIdHeaderString, config.getFlushQueueSize(), config.getLogLevel());
-                                rudderFlushWorkManager.saveRudderFlushConfig(rudderFlushConfig);
-
-                                // initiate processor
-                                RudderLogger.logDebug("EventRepository: initiateSDK: Initiating processor");
-                                Thread processorThread = new Thread(getProcessorRunnable());
-                                processorThread.start();
+                                saveFlushConfig();
+                                initiateProcessor();
 
                                 // initiate factories
                                 if (serverConfig.source.destinations != null) {
@@ -220,6 +209,26 @@ public void run() {
         }).start();
     }
 
+    private String getDataPlaneUrlWrtResidencyConfig(RudderServerConfig serverConfig, RudderConfig config) {
+        RudderDataResidencyManager rudderDataResidencyManager = new RudderDataResidencyManager(serverConfig, config);
+        String dataPlaneUrl = rudderDataResidencyManager.getDataResidencyUrl();
+        if (Utils.isEmpty(dataPlaneUrl)) {
+            dataPlaneUrl = config.getDataPlaneUrl();
+        }
+        return dataPlaneUrl;
+    }
+
+    private void saveFlushConfig() {
+        RudderFlushConfig rudderFlushConfig = new RudderFlushConfig(dataPlaneUrl, authHeaderString, anonymousIdHeaderString, config.getFlushQueueSize(), config.getLogLevel());
+        rudderFlushWorkManager.saveRudderFlushConfig(rudderFlushConfig);
+    }
+
+    private void initiateProcessor() {
+        RudderLogger.logDebug("EventRepository: initiateSDK: Initiating processor");
+        Thread processorThread = new Thread(getProcessorRunnable());
+        processorThread.start();
+    }
+
     private void sendApplicationInstalled(int currentBuild, String currentVersion) {
         // If trackLifeCycleEvents is not allowed then discard the event
         if (!config.isTrackLifecycleEvents()) {