Switch to app compat preferences.

[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 be02da3c329cbefc10b215055bca65378e590ab6..faf507da40dca60fd84a5ab53b1f551da1c4c5e1 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -31,7 +31,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
@@ -144,7 +144,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
             final String action = intent.getAction();
 
             if (DownloadManager.ACTION_NOTIFICATION_CLICKED.equals(action)) {
-                startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP));
+                startActivity(getLaunchIntent(getApplicationContext()).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP));
             }
             if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
                 final long downloadId = intent.getLongExtra(
@@ -303,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);
@@ -346,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(
@@ -355,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);
@@ -518,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;
             }
@@ -684,7 +688,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
         if (cursor == null) {
             if (cancel) {
                 String msg = getString(R.string.downloadManagerQueryFailed);
-                new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+                new AlertDialog.Builder(this).setTitle(getString(R.string.error))
                 .setMessage(getString(R.string.downloadFailed, msg))
                 .setNeutralButton("Close", null).show();
             }
@@ -825,6 +829,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
         // 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;
@@ -846,7 +851,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
 
         if (downloadManager == null) {
             String msg = getString(R.string.downloadManagerQueryFailed);
-            new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+            new AlertDialog.Builder(this).setTitle(getString(R.string.error))
                     .setMessage(getString(R.string.downloadFailed, msg))
                     .setNeutralButton("Close", null).show();
             return;