Fixes for database update

Author: adamzkover

app/src/main/java/net/hunnor/dict/android/activity/database/DatabaseActivity.java

@@ -87,15 +87,17 @@ public void onReceive(Context context, Intent intent) {
             }
         };
 
+        Log.d(TAG, "Registering broadcast receiver");
         ContextCompat.registerReceiver(this, receiver,
                 new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-                ContextCompat.RECEIVER_NOT_EXPORTED);
+                ContextCompat.RECEIVER_EXPORTED);
 
     }
 
     private void receiveBroadcast(Intent intent) {
 
         String action = intent.getAction();
+        Log.d(TAG, "Broadcast received: " + action);
         if (!DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
             return;
         }
@@ -115,15 +117,24 @@ private void receiveBroadcast(Intent intent) {
         try (Cursor cursor = downloadManager.query(query)) {
             if (cursor.moveToFirst()) {
                 int statusColumnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS);
-                if (DownloadManager.STATUS_SUCCESSFUL == cursor.getInt(statusColumnIndex)) {
+                int status = cursor.getInt(statusColumnIndex);
+                Log.d(TAG, "Download status: " + status);
+                if (DownloadManager.STATUS_SUCCESSFUL == status) {
                     int localUriColumnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI);
                     if (localUriColumnIndex >= 0) {
                         String uriString = cursor.getString(localUriColumnIndex);
                         Uri uri = Uri.parse(uriString);
+                        Log.d(TAG, "Download successful, URI: " + uriString);
                         getViewModel().setProgressReport(getString(R.string.database_update_extract_start));
                         startExtractTask(uri);
                     }
+                } else if (DownloadManager.STATUS_FAILED == status) {
+                    int reasonColumnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_REASON);
+                    int reason = cursor.getInt(reasonColumnIndex);
+                    Log.e(TAG, "Download failed, reason: " + reason);
                 }
+            } else {
+                Log.w(TAG, "Download cursor empty for ID: " + activeDownloadId);
             }
         } catch (Exception e) {
             Log.e(TAG, e.getMessage(), e);
@@ -306,8 +317,10 @@ public void checkLocalFilesCallback(Long localDate, Long localSize) {
 
     public void doDownload(View view) {
 
+        Log.d(TAG, "doDownload called");
         String externalStorageState = Environment.getExternalStorageState();
         if (!Environment.MEDIA_MOUNTED.equals(externalStorageState)) {
+            Log.e(TAG, "External storage not mounted: " + externalStorageState);
             return;
         }
 
@@ -332,13 +345,10 @@ public void doDownload(View view) {
             }
         }
 
-        File externalFilesDir = getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-        File downloadFile = new File(externalFilesDir, INDEX_FILE);
-        Uri uri = Uri.fromFile(downloadFile);
-
         Request request = new Request(Uri.parse(INDEX_URL));
-        request.setDestinationUri(uri);
+        request.setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, INDEX_FILE);
         long queueId = downloadManager.enqueue(request);
+        Log.d(TAG, "Download enqueued, ID: " + queueId);
         model.setActiveDownloadId(queueId);
 
         AppCompatImageView icon = findViewById(R.id.database_block_progress_icon);

app/src/main/java/net/hunnor/dict/android/task/ExtractTask.java

@@ -5,6 +5,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
+import android.util.Log;
 
 import net.hunnor.dict.android.activity.database.DatabaseActivity;
 import net.hunnor.dict.android.activity.main.MainActivity;
@@ -33,6 +34,7 @@ public ExtractTask(Activity activity, StorageService storageService) {
     @Override
     protected ExtractTaskStatus doInBackground(Uri... uris) {
 
+        Log.d("ExtractTask", "Starting extraction");
         ExtractTaskStatus status = ExtractTaskStatus.E_EXCEPTION_IO;
 
         if (uris == null || uris.length == 0) {
@@ -75,6 +77,7 @@ protected ExtractTaskStatus doInBackground(Uri... uris) {
     @Override
     protected void onPostExecute(ExtractTaskStatus status) {
 
+        Log.d("ExtractTask", "Extraction finished with status: " + status);
         final Activity activity = activityWeakReference.get();
 
         if (MainActivity.class.isAssignableFrom(activity.getClass())) {