Rebase master

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt

@@ -36,6 +36,8 @@ import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.notifications.download.DownloadNotificationManager
 import com.nextcloud.java.util.Optional
+import com.nextcloud.model.WorkerState
+import com.nextcloud.model.WorkerStateLiveData
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
@@ -138,6 +140,7 @@ class FileDownloadWorker(
         val behaviour = inputData.keyValueMap[BEHAVIOUR] as String
         val activityName = inputData.keyValueMap[ACTIVITY_NAME] as String
         val packageName = inputData.keyValueMap[PACKAGE_NAME] as String
+        setWorkerState(user, file)
 
         val requestedDownloads: AbstractList<String> = Vector()
 
@@ -173,6 +176,10 @@ class FileDownloadWorker(
         }
     }
 
+    private fun setWorkerState(user: User, file: OCFile) {
+        WorkerStateLiveData.instance?.setWorkState(WorkerState.Download(user, file))
+    }
+
     private fun addAccountUpdateListener() {
         val am = AccountManager.get(context)
         am.addOnAccountsUpdatedListener(this, null, false)

app/src/main/java/com/nextcloud/model/WorkerState.kt

@@ -22,9 +22,9 @@
 package com.nextcloud.model
 
 import com.nextcloud.client.account.User
-import com.owncloud.android.operations.DownloadFileOperation
+import com.owncloud.android.datamodel.OCFile
 
 sealed class WorkerState {
-    object Idle : WorkerState()
-    class Download(var user: User?, var currentDownload: DownloadFileOperation?) : WorkerState()
+    object Idle
+    class Download(var user: User, var file: OCFile): WorkerState()
 }

app/src/main/java/com/nextcloud/model/WorkerStateLiveData.kt

@@ -30,12 +30,13 @@ class WorkerStateLiveData private constructor() : LiveData<WorkerState>() {
     }
 
     companion object {
-        private var instance: WorkerStateLiveData? = null
-
-        fun instance(): WorkerStateLiveData {
-            return instance ?: synchronized(this) {
-                instance ?: WorkerStateLiveData().also { instance = it }
+        var instance: WorkerStateLiveData? = null
+            get() {
+                if (field == null) {
+                    field = WorkerStateLiveData()
+                }
+                return field
             }
-        }
+            private set
     }
 }

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -73,6 +73,8 @@ import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.client.utils.IntentUtil;
 import com.nextcloud.java.util.Optional;
+import com.nextcloud.model.WorkerState;
+import com.nextcloud.model.WorkerStateLiveData;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
 import com.nextcloud.utils.view.FastScrollUtils;
@@ -160,6 +162,7 @@ import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Observer;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import kotlin.Unit;
@@ -285,6 +288,7 @@ public class FileDisplayActivity extends FileActivity
         checkStoragePath();
 
         initSyncBroadcastReceiver();
+        observeWorkerState();
     }
 
     @SuppressWarnings("unchecked")
@@ -1559,6 +1563,24 @@ public class FileDisplayActivity extends FileActivity
         return isRoot(getCurrentDir());
     }
 
+    private void observeWorkerState() {
+        WorkerStateLiveData.Companion.getInstance().observe(this, state -> {
+            if (state instanceof WorkerState.Download) {
+                Log_OC.d(TAG, "Download worker started");
+                handleDownloadWorkerState();
+            }
+        });
+    }
+
+    private void handleDownloadWorkerState() {
+        if (mWaitingToPreview != null && getStorageManager() != null) {
+            mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId());
+            if (mWaitingToPreview != null && !mWaitingToPreview.isDown()) {
+                requestForDownload();
+            }
+        }
+    }
+
     @Override
     protected ServiceConnection newTransferenceServiceConnection() {
         return new ListServiceConnection();
@@ -1572,17 +1594,7 @@ public class FileDisplayActivity extends FileActivity
 
         @Override
         public void onServiceConnected(ComponentName component, IBinder service) {
-            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloadWorker.class))) {
-                Log_OC.d(TAG, "Download service connected");
-                mDownloaderBinder = (FileDownloadWorker.FileDownloaderBinder) service;
-                if (mWaitingToPreview != null && getStorageManager() != null) {
-                    // update the file
-                    mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId());
-                    if (mWaitingToPreview != null && !mWaitingToPreview.isDown()) {
-                        requestForDownload();
-                    }
-                }
-            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
+            if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
                 Log_OC.d(TAG, "Upload service connected");
                 mUploaderBinder = (FileUploaderBinder) service;
             } else {