1.0.1: Using PrefsKey with tags for amplitude syncing

PeelTechnologies · Jul 12, 2018 · c8d7116 · c8d7116
1 parent 3c51536
commit c8d7116
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -8,4 +8,4 @@ Extension to automatically sync [prefs](https://github.com/PeelTechnologies/andr
         maven { url "https://jitpack.io" }
     }
     ```
-* In your app build.gradle, add:  ```implementation "com.github.PeelTechnologies:android-typesafe-prefs-amplitude:1.0.0"```
+* In your app build.gradle, add:  ```implementation "com.github.PeelTechnologies:android-typesafe-prefs-amplitude:1.0.1"```
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.github.PeelTechnologies</groupId>
 	<artifactId>android-typesafe-prefs-amplitude</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.github.PeelTechnologies</groupId>
 			<artifactId>android-typesafe-prefs</artifactId>
-			<version>[1.0.9,)</version>
+			<version>[1.1.0,)</version>
 		</dependency>
 		<dependency>
 			<groupId>com.amplitude</groupId>

diff --git a/src/main/java/com/peel/appscope/amplitude/PrefsAmplitudeSyncListener.java b/src/main/java/com/peel/appscope/amplitude/PrefsAmplitudeSyncListener.java
@@ -28,20 +28,22 @@
  *
  * @author Inderjeet Singh
  */
-public final class PrefsAmplitudeSyncListener implements Prefs.EventListener {
+public class PrefsAmplitudeSyncListener implements Prefs.EventListener {
     private final AmplitudeClient amplitudeClient;
+    private final String amplitudeTag;
 
     public PrefsAmplitudeSyncListener() {
-        this(Amplitude.getInstance());
+        this(Amplitude.getInstance(), "amplitude");
     }
 
-    public PrefsAmplitudeSyncListener(AmplitudeClient client) {
+    public PrefsAmplitudeSyncListener(AmplitudeClient client, String amplitudeTag) {
         this.amplitudeClient = client;
+        this.amplitudeTag = amplitudeTag;
     }
 
     @Override
     public <T> void onPut(PrefsKey<T> key, T value) {
-        if (key instanceof PrefsKeyAmplitudeSynced) {
+        if (key.containsTag(amplitudeTag)) {
             try {
                 JSONObject props = new JSONObject();
                 props.put(key.getName(), value);
@@ -54,7 +56,7 @@ public <T> void onPut(PrefsKey<T> key, T value) {
     @Override
     public <T> void onRemove(PrefsKey<T> key) {
         try {
-            if (key instanceof PrefsKeyAmplitudeSynced && key.getTypeOfValue() == Boolean.class) {
+            if (key.containsTag(amplitudeTag) && key.getTypeOfValue() == Boolean.class) {
                 // Only for boolean keys, set them to false in Amplitude
                 JSONObject props = new JSONObject();
                 props.put(key.getName(), false);

diff --git a/src/main/java/com/peel/appscope/amplitude/PrefsKeyAmplitudeSynced.java b/src/main/java/com/peel/appscope/amplitude/PrefsKeyAmplitudeSynced.java
diff --git a/src/test/java/com/peel/appscope/amplitude/PrefsAmplitudeSyncFunctionalTest.java b/src/test/java/com/peel/appscope/amplitude/PrefsAmplitudeSyncFunctionalTest.java
@@ -48,6 +48,7 @@
 @PrepareForTest({Context.class, SharedPreferences.class, PreferenceManager.class, Amplitude.class})
 public class PrefsAmplitudeSyncFunctionalTest {
 
+    private static final String AMPLITUDE_SYNCED = "amplitudeSynced";
     private Prefs prefs;
     private AmplitudeClient amplitudeClient;
     private JSONObject userProperties;
@@ -64,12 +65,12 @@ public Void answer(InvocationOnMock invocation) {
                 return null;
             }
         }).when(amplitudeClient).setUserProperties(Mockito.any(JSONObject.class));
-        prefs.addListener(new PrefsAmplitudeSyncListener(amplitudeClient));
+        prefs.addListener(new PrefsAmplitudeSyncListener(amplitudeClient, AMPLITUDE_SYNCED));
     }
 
     @Test
     public void testAmplitudeSync() throws Exception {
-        PrefsKeyAmplitudeSynced<String> sync = new PrefsKeyAmplitudeSynced<>("sync", String.class);
+        PrefsKey<String> sync = new PrefsKey<>("sync", String.class, AMPLITUDE_SYNCED);
         prefs.put(sync, "test");
         assertEquals("test", userProperties.get("sync"));
 
@@ -81,7 +82,7 @@ public void testAmplitudeSync() throws Exception {
 
     @Test
     public void testAmplitudeUnsetOnBooleanPropertyRemoval() throws Exception {
-        PrefsKeyAmplitudeSynced<Boolean> bool = new PrefsKeyAmplitudeSynced<>("bool", Boolean.class);
+        PrefsKey<Boolean> bool = new PrefsKey<>("bool", Boolean.class, AMPLITUDE_SYNCED);
         prefs.put(bool, true);
         assertTrue(userProperties.getBoolean("bool"));