Pull from sift-android-private (#36)

Author: garylee1

sift/src/main/java/siftscience/android/DevicePropertiesCollector.java

@@ -4,15 +4,13 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.sift.api.representations.AndroidDevicePropertiesJson;
-import com.sift.api.representations.AndroidInstalledAppJson;
 import com.sift.api.representations.MobileEventJson;
 
 import org.apache.commons.lang3.ArrayUtils;
@@ -139,8 +137,6 @@ private AndroidDevicePropertiesJson get() {
         List<String> evidenceProperties = existingDangerousProperties();
         List<String> evidenceRWPaths = existingRWPaths();
 
-        List<AndroidInstalledAppJson> installedApps = getInstalledApps();
-
         return AndroidDevicePropertiesJson.newBuilder()
                 .withAppName(appName)
                 .withAppVersion(appVersion)
@@ -161,7 +157,6 @@ private AndroidDevicePropertiesJson get() {
                 .withEvidencePackagesPresent(evidencePackages)
                 .withEvidenceProperties(evidenceProperties)
                 .withEvidenceDirectoriesWritable(evidenceRWPaths)
-                .withInstalledApps(installedApps)
                 .build();
     }
 
@@ -302,23 +297,4 @@ private String[] mountReader() {
         }
         return allPaths.split("\n");
     }
-
-    private List<AndroidInstalledAppJson> getInstalledApps() {
-        final PackageManager pm = context.getPackageManager();
-        List<AndroidInstalledAppJson> installedApps = new ArrayList<>();
-
-        List<PackageInfo> packageList = pm.getInstalledPackages(0);
-        for (PackageInfo packageInfo : packageList) {
-            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                String appName = packageInfo.applicationInfo.loadLabel(pm).toString();
-                String packageName = packageInfo.packageName;
-                installedApps.add(AndroidInstalledAppJson.newBuilder()
-                        .withAppName(appName)
-                        .withPackageName(packageName)
-                        .build());
-            }
-        }
-
-        return installedApps;
-    }
 }

sift/src/main/java/siftscience/android/Sift.java

@@ -288,37 +288,6 @@ private Sift(Context context, Config config) throws IOException {
         this(context, config, Executors.newSingleThreadScheduledExecutor());
     }
 
-    private Config unarchive(String archive, Config c) {
-        if (archive == null) {
-            return c == null ? new Config() : c;
-        }
-
-        try {
-            return Sift.GSON.fromJson(archive, Config.class);
-        } catch (JsonParseException e) {
-            Log.e(TAG, "Encountered JsonProcessingException in Config constructor", e);
-            return new Config();
-        }
-    }
-
-    @VisibleForTesting
-    String archiveConfig() {
-        return Sift.GSON.toJson(config);
-    }
-
-    Config unarchiveConfig(String archive, Config c) {
-        if (archive == null) {
-            return c == null ? new Config() : c;
-        }
-
-        try {
-            return Sift.GSON.fromJson(archive, Config.class);
-        } catch (JsonSyntaxException e) {
-            Log.d(TAG, "Encountered exception in Sift config unarchive", e);
-            return c == null ? new Config() : c;
-        }
-    }
-
     @VisibleForTesting
     String archiveConfig() {
         return Sift.GSON.toJson(config);