[Java] Add networking fallback to add device ID just before sending a request. (#163)

* feat: fallback for device id

* refactor: remove unnecessary funcs

Author: arifBurakDemiray

sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java

@@ -122,24 +122,6 @@ public void deviceIdChanged(String oldDeviceId, boolean withMerge) {
         }
     }
 
-    /**
-     * Puts {@code "device_id"} parameter into all requests which don't have it yet
-     *
-     * @param config InternalConfig to run in
-     * @param deviceId deviceId string
-     * @return {@code true} if {@link Request}s changed successfully, {@code false} otherwise
-     */
-    private boolean transformRequests(final InternalConfig config, final String deviceId) {
-        return Storage.transform(config, Request.getStoragePrefix(), (id, data) -> {
-            Request request = new Request(id);
-            if (request.restore(data, L) && !request.params.has(Params.PARAM_DEVICE_ID)) {
-                request.params.add(Params.PARAM_DEVICE_ID, deviceId);
-                return request.store(L);
-            }
-            return null;
-        });
-    }
-
     /**
      * Logging into app-specific account:
      * - reset device id and notify modules;
@@ -192,7 +174,6 @@ protected void changeDeviceIdInternal(String id, DeviceIdType type, boolean with
                 L.d("[ModuleDeviceIdCore] changeDeviceIdInternal, Ending session because device id was unset from [" + old.id + "]");
                 session.end(null, null, old.id);
             }
-            changeOldRequestsDeviceIds(did);
         }
 
         SDKCore.instance.notifyModulesDeviceIdChanged(old.id, withMerge);
@@ -239,34 +220,6 @@ protected Config.DID acquireId(final InternalConfig config) {
         return did;
     }
 
-    private void changeOldRequestsDeviceIds(Config.DID deviceId) {
-        if (this.tasks == null) {
-            this.tasks = new Tasks("deviceId", L);
-        }
-        tasks.run(new Tasks.Task<Object>(0L) {
-            @Override
-            public Object call() {
-                // put device_id parameter into existing requests
-                L.i("[ModuleDeviceIdCore] changeOldRequestsDeviceIds, Adding device_id to previous requests");
-                boolean success = transformRequests(internalConfig, deviceId.id);
-                if (success) {
-                    L.i("[ModuleDeviceIdCore] changeOldRequestsDeviceIds, First transform: success");
-                } else {
-                    L.w("[ModuleDeviceIdCore] changeOldRequestsDeviceIds, First transform: failure");
-                }
-
-                // do it second time in case new requests were added during first attempt
-                success = transformRequests(internalConfig, deviceId.id);
-                if (!success) {
-                    L.e("[ModuleDeviceIdCore] changeOldRequestsDeviceIds, Failed to put device_id into existing requests, following behaviour for unhandled requests is undefined.");
-                } else {
-                    L.i("[ModuleDeviceIdCore] changeOldRequestsDeviceIds, Second transform: success");
-                }
-                return null;
-            }
-        });
-    }
-
     @Override
     public void stop(InternalConfig config, boolean clear) {
         if (tasks != null) {

sdk-java/src/main/java/ly/count/sdk/java/internal/Transport.java

@@ -123,6 +123,12 @@ public HttpURLConnection openConnection(String url, String params, boolean using
      */
     HttpURLConnection connection(final Request request, final User user) throws IOException {
         String endpoint = request.params.remove(Request.ENDPOINT);
+
+        if (!request.params.has("device_id") && config.getDeviceId() != null) {
+            //fallback if request does not have any device id
+            request.params.add("device_id", config.getDeviceId().id);
+        }
+
         if (endpoint == null) {
             endpoint = "/i?";
         }
@@ -402,7 +408,7 @@ private void setPins(Set<String> keys, Set<String> certs) throws CertificateExce
                         X509EncodedKeySpec spec = new X509EncodedKeySpec(data);
                         KeyFactory kf = KeyFactory.getInstance("RSA");
                         PublicKey k = kf.generatePublic(spec);
-                        
+
                         keyPins.add(k.getEncoded());
                     } catch (InvalidKeySpecException e) {
                         L.d("[network] Certificate in instead of public key it seems " + e);