Remove some dead code

app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt

@@ -21,8 +21,8 @@ class FullscreenImageActivity : BaseActivity() {
     companion object {
-        private val KEY_URL = "url"
-        private val KEY_PROJECT = "project"
+        private const val KEY_URL = "url"
+        private const val KEY_PROJECT = "project"
         fun newIntent(context: Context, project: Project, url: String): Intent {
             val intent = Intent(context, FullscreenImageActivity::class.java)

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt

@@ -38,8 +38,8 @@ class GroupActivity : BaseActivity() {
     companion object {
-        private val KEY_GROUP = "key_group"
-        private val KEY_GROUP_ID = "key_group_id"
+        private const val KEY_GROUP = "key_group"
+        private const val KEY_GROUP_ID = "key_group_id"
         fun newIntent(context: Context, group: Group): Intent {
             val intent = Intent(context, GroupActivity::class.java)

app/src/main/java/com/commit451/gitlab/activity/LaunchActivity.kt

@@ -14,9 +14,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.migration.Migration261
-import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.navigation.Navigator
-import com.commit451.gitlab.ssl.CustomKeyManager
 import timber.log.Timber
 /**

app/src/main/java/com/commit451/gitlab/api/AuthenticationRequestInterceptor.kt

@@ -6,7 +6,7 @@ import okhttp3.Response
 import java.io.IOException
 /**
- * Adds the private token to all requests
+ * Adds the private token to all requests of the same server as the account
  */
 class AuthenticationRequestInterceptor(private val account: Account) : Interceptor {
@@ -18,7 +18,7 @@ class AuthenticationRequestInterceptor(private val account: Account) : Intercept
     override fun intercept(chain: Interceptor.Chain): Response {
         var request = chain.request()
-        var url = request.url()
+        val url = request.url()
         val serverUrl = account.serverUrl ?: "https://example.com"
         if (isSameServer(url.toString(), serverUrl)) {

app/src/main/java/com/commit451/gitlab/navigation/Navigator.kt

@@ -11,7 +11,6 @@ import android.support.v4.app.ActivityOptionsCompat
 import android.view.View
 import android.widget.ImageView
 import com.commit451.addendum.themeAttrColor
-import com.commit451.easel.Easel
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.*
 import com.commit451.gitlab.data.Prefs
@@ -60,7 +59,7 @@ object Navigator {
             Prefs.STARTING_VIEW_GROUPS -> navigateToGroups(activity)
             Prefs.STARTING_VIEW_ACTIVITY -> navigateToActivity(activity)
             Prefs.STARTING_VIEW_TODOS -> navigateToTodos(activity)
-            else -> throw IllegalArgumentException("You need to define start activity " + startingActivity)
+            else -> throw IllegalArgumentException("You need to define start activity $startingActivity")
         }
     }

app/src/main/java/com/commit451/gitlab/ssl/CustomKeyManager.java

-package com.commit451.gitlab.ssl;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.security.KeyChain;
-
-import java.net.Socket;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.net.ssl.X509ExtendedKeyManager;
-
-public class CustomKeyManager extends X509ExtendedKeyManager {
-
-    private static final Map<String, KeyEntry> keyCache = new ConcurrentHashMap<>();
-
-    public static boolean isCached(String alias) {
-        return keyCache.containsKey(alias);
-    }
-
-    public static KeyEntry getCachedKey(String alias) {
-        return keyCache.get(alias);
-    }
-
-    public static void cache(final Context context, final String alias, final KeyCallback callback) {
-        //TODO remove this async task in favor of Rx
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                try {
-                    X509Certificate[] chain = KeyChain.getCertificateChain(context, alias);
-                    PrivateKey privateKey = KeyChain.getPrivateKey(context, alias);
-
-                    KeyEntry entry = new KeyEntry(alias, chain, privateKey);
-                    keyCache.put(alias, entry);
-                    callback.onSuccess(entry);
-                } catch (Exception e) {
-                    callback.onError(e);
-                }
-
-                return null;
-            }
-        }.execute();
-    }
-
-    private final KeyEntry entry;
-
-    public CustomKeyManager(String alias) {
-        entry = getCachedKey(alias);
-
-        if (entry == null) {
-            throw new IllegalStateException("No cached key available");
-        }
-    }
-
-    @Override
-    public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
-        return entry.alias;
-    }
-
-    @Override
-    public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
-        return null;
-    }
-
-    @Override
-    public X509Certificate[] getCertificateChain(String alias) {
-        if (!entry.alias.equals(alias)) {
-            return null;
-        }
-
-        return entry.chain;
-    }
-
-    @Override
-    public String[] getClientAliases(String keyType, Principal[] issuers) {
-        return new String[]{entry.alias};
-    }
-
-    @Override
-    public String[] getServerAliases(String keyType, Principal[] issuers) {
-        return new String[0];
-    }
-
-    @Override
-    public PrivateKey getPrivateKey(String alias) {
-        if (!entry.alias.equals(alias)) {
-            return null;
-        }
-
-        return entry.privateKey;
-    }
-
-    public static class KeyEntry {
-        public final String alias;
-        public final X509Certificate[] chain;
-        public final PrivateKey privateKey;
-
-        public KeyEntry(String alias, X509Certificate[] chain, PrivateKey privateKey) {
-            this.alias = alias;
-            this.chain = chain;
-            this.privateKey = privateKey;
-        }
-    }
-
-    public interface KeyCallback {
-        void onSuccess(KeyEntry entry);
-
-        void onError(Exception e);
-    }
-}

app/src/main/java/com/commit451/gitlab/ssl/CustomTrustManager.kt

@@ -13,7 +13,6 @@ class CustomTrustManager : X509TrustManager {
     private var trustedCertificate: String? = null
     private var trustedHostname: String? = null
-    private var privateKeyAlias: String? = null
     private var sslSocketFactory: SSLSocketFactory? = null
     private var hostnameVerifier: HostnameVerifier? = null
@@ -58,10 +57,7 @@ class CustomTrustManager : X509TrustManager {
             return sslSocketFactory!!
         }
-        var keyManagers: Array<KeyManager>? = null
-        if (privateKeyAlias != null) {
-            keyManagers = arrayOf(CustomKeyManager(privateKeyAlias))
-        }
+        val keyManagers: Array<KeyManager>? = null
         try {
             val sslContext = SSLContext.getInstance("TLS")

app/src/main/java/com/commit451/gitlab/ssl/X509CertificateException.kt

@@ -3,18 +3,4 @@ package com.commit451.gitlab.ssl
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
-class X509CertificateException : CertificateException {
-    val chain: Array<X509Certificate>
-
-    constructor(msg: String, chain: Array<X509Certificate>) : super(msg) {
-        this.chain = chain
-    }
-
-    constructor(message: String, cause: Throwable, chain: Array<X509Certificate>) : super(message, cause) {
-        this.chain = chain
-    }
-
-    constructor(cause: Throwable, chain: Array<X509Certificate>) : super(cause) {
-        this.chain = chain
-    }
-}
+class X509CertificateException(message: String, cause: Throwable, val chain: Array<X509Certificate>) : CertificateException(message, cause)

app/src/main/java/com/commit451/gitlab/util/ConversionUtil.kt

-package com.commit451.gitlab.util
-
-import android.net.Uri
-import com.commit451.gitlab.model.Account
-
-/**
- * Converts things!
- */
-object ConversionUtil {
-
-    fun fromUri(uri: Uri?): String? {
-        if (uri == null) {
-            return null
-        }
-
-        return uri.toString()
-    }
-
-    fun toUri(account: Account?, uriString: String?): Uri? {
-        if (uriString == null) {
-            return null
-        }
-        if (uriString.isEmpty()) {
-            return Uri.EMPTY
-        }
-
-        val uri = Uri.parse(uriString)
-        if (!uri.isRelative) {
-            return uri
-        }
-
-        if (account == null) {
-            return uri
-        }
-
-        val serverUri = Uri.parse(account.serverUrl)
-        val builder = serverUri
-                .buildUpon()
-                .encodedQuery(uri.encodedQuery)
-                .encodedFragment(uri.encodedFragment)
-
-        if (uri.path.startsWith("/")) {
-            builder.encodedPath(uri.encodedPath)
-        } else {
-            builder.appendEncodedPath(uri.encodedPath)
-        }
-
-        return builder.build()
-    }
-}