X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryManagerActivity.java;h=faf507da40dca60fd84a5ab53b1f551da1c4c5e1;hp=b046a604dc1856af0d4d127eaa66a2969ef10a52;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=2414e08d22e254cdd884080d765c91da76d86c98 diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index b046a60..faf507d 100644 --- 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); @@ -688,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(); } @@ -851,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;