Skip to content
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

CATROID-1093 Refactored ListProjectFilesTask.kt to kotlin functions #5053

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

CATROID-1093 Refactored ListProjectFilesTask.kt to kotlin functions #5053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbb61dd
CATROID-1093 Refactored ListProjectFilesTask.kt to kotlin functions
khaledelnaggar Nov 8, 2024
e01f72f
Merge remote-tracking branch 'origin/develop' into CATROID-1093
khaledelnaggar Dec 12, 2024
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
5 changes: 4 additions & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/filepicker/FilePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ import androidx.appcompat.widget.Toolbar
import org.catrobat.catroid.ui.recyclerview.adapter.multiselection.MultiSelectionManager
import java.io.File
import java.util.ArrayList
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers

class FilePickerActivity : BaseCastActivity(), OnListProjectFilesListener, ActionModeClickListener,
ProjectImportFinishedListener {
Expand Down Expand Up @@ -78,7 +80,8 @@ class FilePickerActivity : BaseCastActivity(), OnListProjectFilesListener, Actio
) {
@SuppressWarnings("SpreadOperator")
override fun task() {
ListProjectFilesTask(this@FilePickerActivity).execute(*storageRoots.toTypedArray())
ListProjectFilesTask(this@FilePickerActivity, CoroutineScope(Dispatchers.IO))
.execute(*storageRoots.toTypedArray())
}
}.execute(this)
}
Expand Down
46 changes: 26 additions & 20 deletions catroid/src/main/java/org/catrobat/catroid/ui/filepicker/ListProjectFilesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catroid: An on-device visual programming system for Android devices
* Copyright (C) 2010-2022 The Catrobat Team
* Copyright (C) 2010-2024 The Catrobat Team
* (<http://developer.catrobat.org/credits>)
*
* This program is free software: you can redistribute it and/or modify
Expand All @@ -21,23 +21,26 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.catrobat.catroid.ui.filepicker

import android.os.AsyncTask
import org.catrobat.catroid.common.Constants
import org.catrobat.catroid.common.FlavoredConstants
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
import java.lang.ref.WeakReference
import org.catrobat.catroid.common.Constants
import org.catrobat.catroid.common.FlavoredConstants
import java.util.ArrayList

class ListProjectFilesTask(listener: OnListProjectFilesListener) :
AsyncTask<File?, Void?, List<File>>() {
class ListProjectFilesTask(listener: OnListProjectFilesListener, coroutineScope: CoroutineScope) {
private val weakListenerReference: WeakReference<OnListProjectFilesListener> = WeakReference(listener)
@SuppressWarnings("SpreadOperator")
override fun doInBackground(vararg params: File?): List<File> = task(*params as Array<out File>)

override fun onPostExecute(files: List<File>) {
val listener = weakListenerReference.get()
listener?.onListProjectFilesComplete(files)
private var scope: CoroutineScope = coroutineScope
fun execute(files: Array<File>) {
scope.launch {
val resultFiles = withContext(Dispatchers.IO) {
task(*files)
}
weakListenerReference.get()?.onListProjectFilesComplete(resultFiles)
}
}

interface OnListProjectFilesListener {
Expand All @@ -46,10 +49,12 @@ class ListProjectFilesTask(listener: OnListProjectFilesListener) :

companion object {
@JvmStatic
fun task(vararg startDir: File): List<File> {
fun task(vararg startDir: File?): List<File> {
val files: MutableList<File> = ArrayList()
for (dir in startDir) {
findProjectFiles(dir, files)
startDir.forEach { dir ->
dir?.let {
findProjectFiles(dir, files)
}
}
getAllProjectsFromPocketCodeFolder(files)
return files
Expand All @@ -70,11 +75,12 @@ class ListProjectFilesTask(listener: OnListProjectFilesListener) :
}
@SuppressWarnings("ComplexCondition")
private fun getAllProjectsFromPocketCodeFolder(projectFiles: MutableList<File>) {
if (FlavoredConstants.EXTERNAL_STORAGE_ROOT_DIRECTORY.listFiles() == null) {
return
}
FlavoredConstants.EXTERNAL_STORAGE_ROOT_DIRECTORY.listFiles()?.forEach { dir ->
if (dir.name != Constants.BACKPACK_DIRECTORY_NAME && dir.name != Constants.TMP_DIRECTORY_NAME && dir.isDirectory && File(dir, Constants.CODE_XML_FILE_NAME).exists()) {
if (dir.name != Constants.BACKPACK_DIRECTORY_NAME &&
dir.name != Constants.TMP_DIRECTORY_NAME &&
dir.isDirectory &&
File(dir, Constants.CODE_XML_FILE_NAME).exists())
{
projectFiles.add(dir)
}
}
Expand Down