From 59befbd355866f9417d84f5a2181b3e5317971f3 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 Aug 2018 11:58:09 +0200
Subject: [PATCH] use Android constants for common URI schemes

This makes the code easier to trace.
---
 .../fdroid/fdroid/installer/DefaultInstallerActivity.java  | 5 +++--
 .../main/java/org/fdroid/fdroid/net/DownloaderFactory.java | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
index ba20934df..322350c29 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
@@ -23,6 +23,7 @@ package org.fdroid.fdroid.installer;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -78,11 +79,11 @@ public class DefaultInstallerActivity extends FragmentActivity {
         }
         // https://code.google.com/p/android/issues/detail?id=205827
         if ((Build.VERSION.SDK_INT < 24)
-                && (!uri.getScheme().equals("file"))) {
+                && (!ContentResolver.SCHEME_FILE.equals(uri.getScheme()))) {
             throw new RuntimeException("PackageInstaller < Android N only supports file scheme!");
         }
         if ((Build.VERSION.SDK_INT >= 24)
-                && (!uri.getScheme().equals("content"))) {
+                && (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()))) {
             throw new RuntimeException("PackageInstaller >= Android N only supports content scheme!");
         }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
index 2a13e947a..1ef905b62 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
@@ -1,5 +1,6 @@
 package org.fdroid.fdroid.net;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import org.fdroid.fdroid.data.Repo;
@@ -29,11 +30,11 @@ public class DownloaderFactory {
         Downloader downloader;
 
         String scheme = uri.getScheme();
-        if ("bluetooth".equals(scheme)) {
+        if (BluetoothDownloader.SCHEME.equals(scheme)) {
             downloader = new BluetoothDownloader(uri, destFile);
-        } else if ("content".equals(scheme)) {
+        } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
             downloader = new TreeUriDownloader(uri, destFile);
-        } else if ("file".equals(scheme)) {
+        } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
             downloader = new LocalFileDownloader(uri, destFile);
         } else {
             final String[] projection = {Schema.RepoTable.Cols.USERNAME, Schema.RepoTable.Cols.PASSWORD};