From: Reimar Döffinger <rdoeffinger@users.noreply.github.com>
Date: Sat, 30 Jan 2016 09:11:33 +0000 (+0100)
Subject: Merge pull request #27 from spinclick/master
X-Git-Url: http://gitweb.fperrin.net/?a=commitdiff_plain;h=72c8aad3e927a1b931684a7b581a95b7eb97de1e;hp=0adbb75efab07a92e3ebbb751af1b48469dd88cd;p=Dictionary.git

Merge pull request #27 from spinclick/master

Prevent crash when DownloadManager is disabled
---

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 159a7f0..4b1723f 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -616,6 +616,14 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         final DownloadManager.Query query = new DownloadManager.Query();
         query.setFilterByStatus(DownloadManager.STATUS_PAUSED | DownloadManager.STATUS_PENDING | DownloadManager.STATUS_RUNNING);
         final Cursor cursor = downloadManager.query(query);
+
+        if (cursor == null) {
+            new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+                    .setMessage(getString(R.string.downloadFailed, "Couldn't query Download Manager"))
+                    .setNeutralButton("Close", null).show();
+            return;
+        }
+
         while (cursor.moveToNext()) {
             if (downloadUrl.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_URI))))
                 break;