Skip to content

fix(file-data-storage-manager): save file with parent network on main thread #17316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −8
Open

fix(file-data-storage-manager): save file with parent network on main thread #17316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,9 @@ class FileDisplayActivity :
)
}
} else {
fileDataStorageManager.addCreateFileOfflineOperation(filePaths, decryptedRemotePaths)
lifecycleScope.launch(Dispatchers.IO) {
fileDataStorageManager.addCreateFileOfflineOperation(filePaths, decryptedRemotePaths)
}
}
}
} else {
Expand Down
22 changes: 15 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import android.view.View
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import com.google.android.material.button.MaterialButton
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.common.collect.Sets
Expand All @@ -40,6 +41,9 @@ import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.KeyboardUtils
import com.owncloud.android.utils.theme.ViewThemeUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject

/**
Expand Down Expand Up @@ -198,13 +202,17 @@ class CreateFolderDialogFragment :
componentGetter?.fileOperationsHelper?.createFolder(path, encrypted)
} else {
Log_OC.d(TAG, "Network not available, creating offline operation")
fileDataStorageManager.addCreateFolderOfflineOperation(
path,
newFolderName,
parentFolder?.fileId
)

fda?.refreshCurrentDirectory()
lifecycleScope.launch(Dispatchers.IO) {
fileDataStorageManager.addCreateFolderOfflineOperation(
path,
newFolderName,
parentFolder?.fileId
)

withContext(Dispatchers.Main) {
fda?.refreshCurrentDirectory()
}
}
}
}
}
Expand Down
Loading