Skip to content

Commit d7154a4

Browse files
committed
fix(slideshow) Dependency-inject ConnectivityService
Towards a better decoupling of the RemoveFilesDialogFragment from any expectations about activities currently running. Signed-off-by: Philipp Hasper <vcs@hasper.info>
1 parent a07e3ad commit d7154a4

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import android.view.ActionMode
1717
import androidx.appcompat.app.AlertDialog
1818
import com.google.android.material.button.MaterialButton
1919
import com.nextcloud.client.di.Injectable
20+
import com.nextcloud.client.network.ConnectivityService
2021
import com.nextcloud.utils.extensions.getTypedActivity
2122
import com.owncloud.android.R
2223
import com.owncloud.android.datamodel.FileDataStorageManager
@@ -41,6 +42,8 @@ class RemoveFilesDialogFragment :
4142
@Inject
4243
lateinit var fileDataStorageManager: FileDataStorageManager
4344

45+
@Inject
46+
lateinit var connectivityService: ConnectivityService
4447
private var positiveButton: MaterialButton? = null
4548

4649
override fun onStart() {
@@ -98,27 +101,27 @@ class RemoveFilesDialogFragment :
98101
val fileActivity = getTypedActivity(FileActivity::class.java)
99102
val fda = getTypedActivity(FileDisplayActivity::class.java)
100103
val pia = getTypedActivity(PreviewImageActivity::class.java)
101-
fileActivity?.connectivityService?.isNetworkAndServerAvailable { result ->
102-
if (result) {
103-
fileActivity.showLoadingDialog(fileActivity.getString(R.string.wait_a_moment))
104+
connectivityService.isNetworkAndServerAvailable { isAvailable ->
105+
if (isAvailable) {
106+
fileActivity?.showLoadingDialog(fileActivity.getString(R.string.wait_a_moment))
104107

105108
fda?.deleteBatchTracker?.startBatchDelete(files.size)
106109

107110
if (files.isNotEmpty()) {
108111
// Display the snackbar message only when a single file is deleted.
109112
val inBackground = (files.size != 1)
110-
fileActivity.fileOperationsHelper?.removeFiles(files, onlyLocalCopy, inBackground)
113+
fileActivity?.fileOperationsHelper?.removeFiles(files, onlyLocalCopy, inBackground)
111114
}
112115

113116
if (offlineFiles.isNotEmpty()) {
114117
fda?.refreshCurrentDirectory()
115118
pia?.initViewPager()
116119
}
117120

118-
fileActivity.dismissLoadingDialog()
121+
fileActivity?.dismissLoadingDialog()
119122
} else {
120123
if (onlyLocalCopy) {
121-
fileActivity.fileOperationsHelper?.removeFiles(files, true, true)
124+
fileActivity?.fileOperationsHelper?.removeFiles(files, true, true)
122125
} else {
123126
files.forEach { file ->
124127
fileDataStorageManager.addRemoveFileOfflineOperation(file)

0 commit comments

Comments
 (0)