Merge pull request #396 from Countly/missing_contents

fix: missing density calc
Countly · Oct 1, 2024 · 96497cf · 96497cf
2 parents 72e471a + 97aa7fa
commit 96497cf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 * Mitigated an issue where content fetching was enabled after initialization of the SDK.
 
+* Fixed an issue where the validation of the parameters during content retrieval was improper.
+* Mitigated an issue that density calculation was missing while resizing content.
+
 ## 24.7.3
 * Automatic view pause/resumes are changed with stop/start for better data consistency.
 * Added the config interface 'experimental' to group experimental features.

diff --git a/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java b/sdk/src/main/java/ly/count/android/sdk/ModuleContent.java
@@ -125,7 +125,7 @@ private String prepareContentFetchRequest(@NonNull DisplayMetrics displayMetrics
     }
 
     boolean validateResponse(@NonNull JSONObject response) {
-        boolean success = response.optBoolean("result", false);
+        boolean success = response.optString("result", "error").equals("success");
         JSONArray content = response.optJSONArray("content");
         return success && content != null && content.length() > 0;
     }

diff --git a/sdk/src/main/java/ly/count/android/sdk/TransparentActivity.java b/sdk/src/main/java/ly/count/android/sdk/TransparentActivity.java
@@ -249,19 +249,26 @@ private void resizeMeAction(Map<String, Object> query) {
             return;
         }
         try {
+            final WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+            final Display display = wm.getDefaultDisplay();
+            final DisplayMetrics metrics = new DisplayMetrics();
+            display.getMetrics(metrics);
+
+            float density = metrics.density;
+
             JSONObject resizeMeJson = (JSONObject) resizeMe;
             Log.v(Countly.TAG, "[TransparentActivity] resizeMeAction, resize_me JSON: [" + resizeMeJson + "]");
             JSONObject portrait = resizeMeJson.getJSONObject("p");
             JSONObject landscape = resizeMeJson.getJSONObject("l");
-            configPortrait.x = portrait.getInt("x");
-            configPortrait.y = portrait.getInt("y");
-            configPortrait.width = portrait.getInt("w");
-            configPortrait.height = portrait.getInt("h");
-
-            configLandscape.x = landscape.getInt("x");
-            configLandscape.y = landscape.getInt("y");
-            configLandscape.width = landscape.getInt("w");
-            configLandscape.height = landscape.getInt("h");
+            configPortrait.x = (int) Math.ceil(portrait.getInt("x") * density);
+            configPortrait.y = (int) Math.ceil(portrait.getInt("y") * density);
+            configPortrait.width = (int) Math.ceil(portrait.getInt("w") * density);
+            configPortrait.height = (int) Math.ceil(portrait.getInt("h") * density);
+
+            configLandscape.x = (int) Math.ceil(landscape.getInt("x") * density);
+            configLandscape.y = (int) Math.ceil(landscape.getInt("y") * density);
+            configLandscape.width = (int) Math.ceil(landscape.getInt("w") * density);
+            configLandscape.height = (int) Math.ceil(landscape.getInt("h") * density);
 
             changeOrientationInternal();
         } catch (JSONException e) {