Null check cursors and DownloadManager instance

MozillaReality · Jun 2, 2020 · e13f749 · e13f749
1 parent f9edcd6
commit e13f749
Showing 1 changed file with 41 additions and 22 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/downloads/DownloadsManager.java b/app/src/common/shared/org/mozilla/vrbrowser/downloads/DownloadsManager.java
@@ -57,7 +57,8 @@ public  void init() {
         mContext.registerReceiver(mDownloadReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
         List<Download> downloads = getDownloads();
         downloads.forEach(download -> {
-            if (!new File(UrlUtils.stripProtocol(download.getOutputFile())).exists()) {
+            if (mDownloadManager != null &&
+                    !new File(UrlUtils.stripProtocol(download.getOutputFile())).exists()) {
                 mDownloadManager.remove(download.getId());
             }
         });
@@ -121,8 +122,10 @@ public void startDownload(@NonNull DownloadJob job) {
             request.setDestinationUri(Uri.parse(outputPath));
         }
 
-        mDownloadManager.enqueue(request);
-        scheduleUpdates();
+        if (mDownloadManager != null) {
+            mDownloadManager.enqueue(request);
+            scheduleUpdates();
+        }
     }
 
     @Nullable
@@ -144,15 +147,21 @@ public void removeDownload(long downloadId, boolean deleteFiles) {
                 if (file.exists()) {
                     File newFile = new File(UrlUtils.stripProtocol(download.getOutputFile().concat(".bak")));
                     file.renameTo(newFile);
-                    mDownloadManager.remove(downloadId);
+                    if (mDownloadManager != null) {
+                        mDownloadManager.remove(downloadId);
+                    }
                     newFile.renameTo(file);
 
                 } else {
-                    mDownloadManager.remove(downloadId);
+                    if (mDownloadManager != null) {
+                        mDownloadManager.remove(downloadId);
+                    }
                 }
 
             } else {
-                mDownloadManager.remove(downloadId);
+                if (mDownloadManager != null) {
+                    mDownloadManager.remove(downloadId);
+                }
             }
         }
         notifyDownloadsUpdate();
@@ -166,26 +175,34 @@ public void removeAllDownloads(boolean deleteFiles) {
     public Download getDownload(long downloadId) {
         Download download = null;
 
-        DownloadManager.Query query = new DownloadManager.Query();
-        query.setFilterById(downloadId);
-        Cursor c = mDownloadManager.query(query);
-        if (c.moveToFirst()) {
-            download = Download.from(c);
+        if (mDownloadManager != null) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            query.setFilterById(downloadId);
+            Cursor c = mDownloadManager.query(query);
+            if (c != null) {
+                if (c.moveToFirst()) {
+                    download = Download.from(c);
+                }
+                c.close();
+            }
         }
-        c.close();
 
         return download;
     }
 
     public List<Download> getDownloads() {
         List<Download> downloads = new ArrayList<>();
 
-        DownloadManager.Query query = new DownloadManager.Query();
-        Cursor c = mDownloadManager.query(query);
-        while (c.moveToNext()) {
-            downloads.add(Download.from(c));
+        if (mDownloadManager != null) {
+            DownloadManager.Query query = new DownloadManager.Query();
+            Cursor c = mDownloadManager.query(query);
+            if (c != null) {
+                while (c.moveToNext()) {
+                    downloads.add(Download.from(c));
+                }
+                c.close();
+            }
         }
-        c.close();
 
         return downloads;
     }
@@ -196,15 +213,17 @@ public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             long downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0);
 
-            if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
+            if (mDownloadManager != null && DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
                 DownloadManager.Query query = new DownloadManager.Query();
                 query.setFilterById(downloadId);
                 Cursor c = mDownloadManager.query(query);
-                if (c.moveToFirst()) {
-                    notifyDownloadsUpdate();
-                    notifyDownloadCompleted(Download.from(c));
+                if (c != null) {
+                    if (c.moveToFirst()) {
+                        notifyDownloadsUpdate();
+                        notifyDownloadCompleted(Download.from(c));
+                    }
+                    c.close();
                 }
-                c.close();
             }
         }
     };