Merge pull request #44 from flarelane/dev-1.6.2

1.6.2
flarelane · Jun 8, 2024 · 9b2253a · 9b2253a
2 parents f40108c + ee72d03
commit 9b2253a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 98 deletions.
diff --git a/FlareLane/src/main/java/com/flarelane/DeviceService.java b/FlareLane/src/main/java/com/flarelane/DeviceService.java
@@ -65,29 +65,6 @@ public void onSuccess(Device device) {
         }
     }
 
-    static void getTags(String projectId, String deviceId, TagsResponseHandler handler) {
-        HTTPClient.get("internal/v1/projects/" + projectId + "/devices/" + deviceId + "/tags", new HTTPClient.ResponseHandler() {
-            @Override
-            void onSuccess(int responseCode, JSONObject response) {
-                super.onSuccess(responseCode, response);
-
-                try {
-                    JSONObject data = response.getJSONObject("data");
-                    handler.onSuccess(data.getJSONObject("tags"));
-                } catch (Exception e) {
-                    BaseErrorHandler.handle(e);
-                }
-            }
-        });
-    }
-
-    static void deleteTags(String projectId, String deviceId, ArrayList<String> keys) throws JSONException {
-        JSONObject data = new JSONObject();
-        data.put("keys", new JSONArray(keys));
-
-        HTTPClient.delete("internal/v1/projects/" + projectId + "/devices/" + deviceId + "/tags", data, new HTTPClient.ResponseHandler());
-    }
-
     static void create(String projectId, JSONObject data, @Nullable ResponseHandler handler) {
         HTTPClient.post("internal/v1/projects/" + projectId + "/devices", data, new HTTPClient.ResponseHandler() {
             @Override

diff --git a/FlareLane/src/main/java/com/flarelane/FlareLane.java b/FlareLane/src/main/java/com/flarelane/FlareLane.java
@@ -24,7 +24,7 @@
 public class FlareLane {
     public static class SdkInfo {
         public static SdkType type = SdkType.NATIVE;
-        public static String version = "1.6.1";
+        public static String version = "1.6.2";
     }
 
     protected static com.flarelane.NotificationForegroundReceivedHandler notificationForegroundReceivedHandler = null;
@@ -113,29 +113,6 @@ public void onSuccess(com.flarelane.Device device) {
         }
     }
 
-    public static void getTags(Context context, @NonNull GetTagsHandler getTagsHandler) {
-        try {
-            String projectId = com.flarelane.BaseSharedPreferences.getProjectId(context, false);
-            String deviceId = com.flarelane.BaseSharedPreferences.getDeviceId(context, false);
-
-            com.flarelane.DeviceService.getTags(projectId, deviceId, new com.flarelane.DeviceService.TagsResponseHandler() {
-                @Override
-                public void onSuccess(JSONObject tags) {
-                    if (getTagsHandler != null) {
-                        mainHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                getTagsHandler.onReceiveTags(tags);
-                            }
-                        });
-                    }
-                }
-            });
-        } catch (Exception e) {
-            com.flarelane.BaseErrorHandler.handle(e);
-        }
-    }
-
     public static void setTags(Context context, JSONObject tags) {
         try {
             JSONObject data = new JSONObject();
@@ -152,17 +129,6 @@ public void onSuccess(com.flarelane.Device device) {
         }
     }
 
-    public static void deleteTags(Context context, ArrayList<String> keys) {
-        try {
-            String projectId = com.flarelane.BaseSharedPreferences.getProjectId(context, false);
-            String deviceId = com.flarelane.BaseSharedPreferences.getDeviceId(context, false);
-
-            com.flarelane.DeviceService.deleteTags(projectId, deviceId, keys);
-        } catch (Exception e) {
-            com.flarelane.BaseErrorHandler.handle(e);
-        }
-    }
-
     public static String getDeviceId(Context context) {
         try {
             String deviceId = com.flarelane.BaseSharedPreferences.getDeviceId(context, true);
@@ -310,10 +276,6 @@ public void onSuccess(Device device) {
         }
     }
 
-    public interface GetTagsHandler {
-        void onReceiveTags(JSONObject tags);
-    }
-
     public interface IsSubscribedHandler {
         void onSuccess(boolean isSubscribed);
     }

diff --git a/app/src/main/java/com/flarelane/example/MainActivity.kt b/app/src/main/java/com/flarelane/example/MainActivity.kt
@@ -21,6 +21,7 @@ import org.json.JSONObject
 
 class MainActivity : AppCompatActivity() {
     private val context: Context = this
+    private var isSetTags: Boolean = false
 
     @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,33 +48,26 @@ class MainActivity : AppCompatActivity() {
             }
         })
 
-        findViewById<Button>(R.id.getTagsButton).setOnClickListener {
-            FlareLane.getTags(context) { tags ->
-                Log.d(
-                    "FlareLane",
-                    "Received Tags: $tags"
-                )
-            }
-        }
-
-        findViewById<Button>(R.id.setTagsButton).setOnClickListener {
+        findViewById<Button>(R.id.toggleTagsButton).setOnClickListener {
             try {
-                val data = JSONObject()
-                data.put("age", 27)
-                data.put("gender", "men")
-                FlareLane.setTags(context, data)
+                if (isSetTags) {
+                    val data = JSONObject()
+                    data.put("age", JSONObject.NULL)
+                    data.put("gender", JSONObject.NULL)
+                    FlareLane.setTags(context, data)
+                    isSetTags = false
+                } else {
+                    val data = JSONObject()
+                    data.put("age", 27)
+                    data.put("gender", "men")
+                    FlareLane.setTags(context, data)
+                    isSetTags = true
+                }
             } catch (e: JSONException) {
                 e.printStackTrace()
             }
         }
 
-        findViewById<Button>(R.id.deleteTagsButton).setOnClickListener {
-            val keys = ArrayList<String>()
-            keys.add("age")
-            keys.add("gender")
-            FlareLane.deleteTags(context, keys)
-        }
-
         findViewById<Button>(R.id.trackEventButton).setOnClickListener {
             try {
                 val data = JSONObject()

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -31,22 +31,10 @@
             android:text="Toggle UserId" />
 
         <Button
-            android:id="@+id/getTagsButton"
+            android:id="@+id/toggleTagsButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Get Tags" />
-
-        <Button
-            android:id="@+id/setTagsButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Set Tags" />
-
-        <Button
-            android:id="@+id/deleteTagsButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Delete Tags" />
+            android:text="Toggle Tags" />
 
         <Button
             android:id="@+id/trackEventButton"
@@ -86,4 +74,4 @@
 
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>