From d2ac7e6eba8c39b18ef1a8945a60f2407025f247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 7 Jun 2016 22:23:43 +0100
Subject: [PATCH] Remove some dead code found by Studio

---
 .../main/java/org/fdroid/fdroid/Utils.java    |  5 -----
 .../fdroid/fdroid/installer/Installer.java    |  3 ---
 .../net/bluetooth/httpish/Response.java       | 18 ---------------
 .../fdroid/privileged/views/AppDiff.java      | 22 -------------------
 4 files changed, 48 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 619e63bbc..5e6d2f7ea 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -473,11 +473,6 @@ public final class Utils {
             return out;
         }
 
-        public String[] toArray() {
-            ArrayList<String> list = toArrayList();
-            return list.toArray(new String[list.size()]);
-        }
-
         public boolean contains(String v) {
             for (final String s : this) {
                 if (s.equals(v)) {
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
index b585d0533..660508358 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
@@ -23,7 +23,6 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.PatternMatcher;
 import android.support.v4.content.LocalBroadcastManager;
@@ -50,7 +49,6 @@ import java.util.Map;
  */
 public abstract class Installer {
     final Context context;
-    private final PackageManager pm;
     private final LocalBroadcastManager localBroadcastManager;
 
     public static final String ACTION_INSTALL_STARTED = "org.fdroid.fdroid.installer.Installer.action.INSTALL_STARTED";
@@ -91,7 +89,6 @@ public abstract class Installer {
 
     Installer(Context context) {
         this.context = context;
-        this.pm = context.getPackageManager();
         localBroadcastManager = LocalBroadcastManager.getInstance(context);
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
index b35f324e8..6ec969a29 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
@@ -8,7 +8,6 @@ import org.fdroid.fdroid.net.bluetooth.FileDetails;
 import org.fdroid.fdroid.net.bluetooth.httpish.headers.Header;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
@@ -130,23 +129,6 @@ public class Response {
 
     }
 
-    public String readContents() throws IOException {
-        int size = getFileSize();
-        if (contentStream == null || size <= 0) {
-            return null;
-        }
-
-        int pos = 0;
-        byte[] buffer = new byte[4096];
-        ByteArrayOutputStream contents = new ByteArrayOutputStream(size);
-        while (pos < size) {
-            int read = contentStream.read(buffer);
-            pos += read;
-            contents.write(buffer, 0, read);
-        }
-        return contents.toString();
-    }
-
     public static class Builder {
 
         private InputStream contentStream;
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
index 03bb77592..ee61311b3 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
@@ -22,7 +22,6 @@ import android.annotation.TargetApi;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 
 import org.fdroid.fdroid.data.Apk;
@@ -61,27 +60,6 @@ public class AppDiff {
         init();
     }
 
-    public AppDiff(PackageManager mPm, Uri mPackageURI) {
-        this.mPm = mPm;
-
-        final String pkgPath = mPackageURI.getPath();
-
-        mPkgInfo = mPm.getPackageArchiveInfo(pkgPath, PackageManager.GET_PERMISSIONS);
-        // We could not get the package info from the file. This means that we
-        // could not parse the file, which can happen if the file cannot be
-        // read or the minSdk is not satisfied.
-        // Since we can't return an error from a constructor, we refuse to
-        // continue. The caller must check if mPkgInfo is null to see if the
-        // AppDiff was initialised correctly.
-        if (mPkgInfo == null) {
-            return;
-        }
-        mPkgInfo.applicationInfo.sourceDir = pkgPath;
-        mPkgInfo.applicationInfo.publicSourceDir = pkgPath;
-
-        init();
-    }
-
     private void init() {
         String pkgName = mPkgInfo.packageName;
         // Check if there is already a package on the device with this name