Merge pull request #20 from appmetr/feature/device-key-hashes

Send hashes instead of real mobile ids via deviceKey
appmetr · Jul 16, 2019 · 6e38943 · 6e38943
2 parents fc4b1d5 + 40bbab6
commit 6e38943
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/appmetr/build.gradle b/appmetr/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 11300
-        versionName "1.13.0"
+        versionCode 11400
+        versionName "1.14.0"
     }
     buildTypes {
         release {
@@ -24,8 +24,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0'
     implementation 'com.android.installreferrer:installreferrer:1.0'
+    implementation 'com.google.guava:guava:28.0-android'
 }
 
 task clearLibraryJar(type: Delete) {

diff --git a/appmetr/src/main/java/com/appmetr/android/UploadService.java b/appmetr/src/main/java/com/appmetr/android/UploadService.java
@@ -4,9 +4,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.appmetr.android.internal.ContextProxy;
 import com.appmetr.android.internal.LibraryPreferences;
 import com.appmetr.android.internal.UploadCacheTask;

diff --git a/appmetr/src/main/java/com/appmetr/android/internal/AppMetrTrackingManager.java b/appmetr/src/main/java/com/appmetr/android/internal/AppMetrTrackingManager.java
@@ -10,10 +10,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.PersistableBundle;
-import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.WorkerThread;
+
 import com.appmetr.android.AppMetr;
 import com.appmetr.android.AppmetrConstants;
 import com.appmetr.android.BuildConfig;
@@ -25,7 +26,11 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;

diff --git a/appmetr/src/main/java/com/appmetr/android/internal/RequestParameters.java b/appmetr/src/main/java/com/appmetr/android/internal/RequestParameters.java
@@ -8,16 +8,22 @@
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.appmetr.android.BuildConfig;
 import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+import com.google.common.base.Charsets;
+import com.google.common.hash.Hashing;
 
 import java.lang.reflect.Field;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,13 +52,19 @@ public class RequestParameters {
     /**
      * Retrieve request parameters from context
      */
-    public RequestParameters(Context context, String token) {
+    public RequestParameters(@NonNull final Context context, @NonNull String token) {
         this.token = token;
         macAddress = getMacAddress(context);
         deviceId = getDeviceID(context);
         buildSerial = getBuildSerial();
         androidId = getAndroidID(context);
         userId = getUserID();
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                googleAid = getGoogleId(context);
+            }
+        });
     }
 
     public String getToken() {
@@ -65,12 +77,14 @@ public String getUID() {
 
     public String getDeviceKey(Context context) {
         List<HttpNameValuePair> nameValuePairs = new ArrayList<HttpNameValuePair>();
+        nameValuePairs.add(new HttpNameValuePair("token", getToken().toLowerCase(Locale.US)));
         nameValuePairs.add(new HttpNameValuePair("mobDeviceType", getDeviceType()));
-        nameValuePairs.add(new HttpNameValuePair("mobMac", getMacAddress(context)));
-        nameValuePairs.add(new HttpNameValuePair("mobTmDevId", getDeviceID(context)));
-        nameValuePairs.add(new HttpNameValuePair("mobAndroidID", getAndroidID(context)));
-        nameValuePairs.add(new HttpNameValuePair("mobGoogleAid", getGoogleId(context)));
-        nameValuePairs.add(new HttpNameValuePair("mobFireOsAid", getFireOsId(context)));
+        nameValuePairs.add(new HttpNameValuePair("mobMac", getHash(getMacAddress(context))));
+        nameValuePairs.add(new HttpNameValuePair("mobTmDevId", getHash(getDeviceID(context))));
+        nameValuePairs.add(new HttpNameValuePair("mobAndroidID", getHash(getAndroidID(context))));
+        nameValuePairs.add(new HttpNameValuePair("mobGoogleAid", getHash(googleAid)));
+                                                // use googleAid only if we already have it
+        nameValuePairs.add(new HttpNameValuePair("mobFireOsAid", getHash(getFireOsId(context))));
         StringBuilder res = new StringBuilder();
         for (HttpNameValuePair pair : nameValuePairs) {
             if(TextUtils.isEmpty(pair.getValue()))
@@ -141,7 +155,7 @@ private static String getMacAddress(Context context) {
                 if (wifiInfo != null) {
                     ret = wifiInfo.getMacAddress();
                     if (ret != null) {
-                        ret = ret.replace(":", "").toLowerCase(Locale.getDefault());
+                        ret = ret.replaceAll("\\W", "").toUpperCase(Locale.US);
                     }
                 }
             }
@@ -253,7 +267,7 @@ private static String getGoogleId(Context context) {
      * doesn't return null in any situation.
      *
      * @param context Current context
-     * @return Google Advertising Id
+     * @return FireOS Advertising Id
      */
     private static String getFireOsId(Context context) {
         if(fireOsId == null) {
@@ -270,4 +284,10 @@ private static String getFireOsId(Context context) {
         }
         return fireOsId;
     }
+
+    private static String getHash(String data) {
+        if(TextUtils.isEmpty(data))
+            return data;
+        return Hashing.murmur3_128().hashString(data.toLowerCase(Locale.US), Charsets.UTF_8).toString();
+    }
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.appmetr.android.demo"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 11300
-        versionName "1.13.0"
+        versionCode 11400
+        versionName "1.14.0"
     }
     buildTypes {
         release {
@@ -21,5 +21,5 @@ android {
 dependencies {
     implementation project(":appmetr")
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 }
diff --git a/dummy/build.gradle b/dummy/build.gradle
@@ -29,5 +29,5 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 }