Some lint fixes.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 265059ee108e9ff951743fa88b177b8162063269..f9a084f706f69deec2c7d956f4dcd16dde0e8e27 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -27,6 +27,7 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -302,7 +303,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         readableCheckAndError(false);
 
         application.backgroundUpdateDictionaries(dictionaryUpdater);
@@ -345,6 +346,9 @@ public class DictionaryManagerActivity extends AppCompatActivity {
             }
         });
 
+        /*
+        Disable version update notification, I don't maintain the text really
+        and I don't think it is very useful.
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         final String thanksForUpdatingLatestVersion = getString(R.string.thanksForUpdatingVersion);
         if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(
@@ -354,6 +358,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
             prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion)
             .commit();
         }
+        */
         IntentFilter downloadManagerIntents = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
         downloadManagerIntents.addAction(DownloadManager.ACTION_NOTIFICATION_CLICKED);
         registerReceiver(broadcastReceiver, downloadManagerIntents);
@@ -517,7 +522,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
             public boolean onMenuItemClick(final MenuItem menuItem) {
                 final Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setData(Uri
-                               .parse("https://github.com/rdoeffinger/Dictionary/releases/v0.2-dictionaries"));
+                               .parse("https://github.com/rdoeffinger/Dictionary/releases/v0.3-dictionaries"));
                 startActivity(intent);
                 return false;
             }
@@ -820,8 +825,12 @@ public class DictionaryManagerActivity extends AppCompatActivity {
                          bytes / 1024.0 / 1024.0));
             return;
         }
-        Request request = new Request(
-            Uri.parse(downloadUrl));
+        // API 19 and earlier have issues with github URLs, both http and https.
+        // Really old (~API 10) DownloadManager cannot handle https at all.
+        // Work around both with in one.
+        String altUrl = downloadUrl.replace("https://github.com/rdoeffinger/Dictionary/releases/download/v0.2-dictionaries/", "http://ffmpeg.org/~reimar/dict/");
+        altUrl = altUrl.replace("https://github.com/rdoeffinger/Dictionary/releases/download/v0.3-dictionaries/", "http://ffmpeg.org/~reimar/dict/");
+        Request request = new Request(Uri.parse(Build.VERSION.SDK_INT < 21 ? altUrl : downloadUrl));
 
         String destFile;
         try {