Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6481fad authored by alperozturk's avatar alperozturk Committed by Alper Öztürk
Browse files

Use task processing API

parent efc6e412
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ class CreateTaskRemoteOperation(private val input: String, private val type: Str
    }

    companion object {
        const val TAG_URL = "/ocs/v2.php/textprocessing/schedule"
        const val TAG_URL = "/ocs/v2.php/taskprocessing/schedule"
    }
}
+1 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ class DeleteTaskRemoteOperation(private val appId: Long) : RemoteOperation<Void>

    companion object {
        private val TAG = DeletePrivateKeyRemoteOperation::class.java.simpleName
        private const val DIRECT_ENDPOINT =
            "/ocs/v2.php/textprocessing/task/"
        private const val DIRECT_ENDPOINT = "/ocs/v2.php/taskprocessing/task/"
    }
}
+3 −4
Original line number Diff line number Diff line
@@ -17,15 +17,14 @@ import com.owncloud.android.lib.ocs.ServerResponse
import com.owncloud.android.lib.resources.OCSRemoteOperation
import com.owncloud.android.lib.resources.assistant.model.TaskList
import org.apache.commons.httpclient.HttpStatus

class GetTaskListRemoteOperation(private val appId: String) : OCSRemoteOperation<TaskList>() {
class GetTaskListRemoteOperation(private val taskType: String) : OCSRemoteOperation<TaskList>() {
    @Suppress("TooGenericExceptionCaught")
    override fun run(client: NextcloudClient): RemoteOperationResult<TaskList> {
        var result: RemoteOperationResult<TaskList>
        var getMethod: GetMethod? = null
        try {
            getMethod =
                GetMethod(client.baseUri.toString() + DIRECT_ENDPOINT + JSON_FORMAT, true)
                GetMethod(client.baseUri.toString() + DIRECT_ENDPOINT + taskType + "&format=json", true)
            val status = client.execute(getMethod)
            if (status == HttpStatus.SC_OK) {
                val taskTypes: TaskList? =
@@ -53,6 +52,6 @@ class GetTaskListRemoteOperation(private val appId: String) : OCSRemoteOperation

    companion object {
        private val TAG = GetTaskTypesRemoteOperation::class.java.simpleName
        private const val DIRECT_ENDPOINT = "/ocs/v2.php/apps/assistant/api/v1/tasks"
        private const val DIRECT_ENDPOINT = "/ocs/v2.php/taskprocessing/tasks?taskType="
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ class GetTaskTypesRemoteOperation : OCSRemoteOperation<TaskTypes>() {

    companion object {
        private val TAG = GetTaskTypesRemoteOperation::class.java.simpleName
        private const val DIRECT_ENDPOINT = "/ocs/v2.php/textprocessing/tasktypes"
        private const val DIRECT_ENDPOINT = "/ocs/v2.php/taskprocessing/tasktypes"
    }
}
+30 −6
Original line number Diff line number Diff line
@@ -8,12 +8,36 @@

package com.owncloud.android.lib.resources.assistant.model

data class TaskTypes(
    var types: List<TaskType>
)
import com.google.gson.annotations.SerializedName
data class TaskTypes(val types: TaskType)

data class TaskType(
    val id: String?,
    val name: String?,
    val description: String?
    @SerializedName("core:text2text")
    val coreText2text: CoreText2text,
    @SerializedName("core:text2text:topics")
    val coreText2textTopics: CoreText2textTopics,
    @SerializedName("core:text2text:headline")
    val coreText2textHeadline: CoreText2textHeadline,
    @SerializedName("core:text2text:summary")
    val coreText2textSummary: CoreText2textSummary,
    @SerializedName("core:text2text:translate")
    val coreText2textTranslate: CoreText2textTranslate,
    @SerializedName("core:text2image")
    val coreText2image: CoreText2image,
    @SerializedName("core:audio2text")
    val coreAudio2text: CoreAudio2text,
    @SerializedName("core:contextwrite")
    val coreContextwrite: CoreContextwrite,
    @SerializedName("context_chat:context_chat")
    val contextChatContextChat: ContextChatContextChat
)

data class CoreText2text(val name: String, val description: String)
data class CoreText2textTopics(val name: String, val description: String)
data class CoreText2textHeadline(val name: String, val description: String)
data class CoreText2textSummary(val name: String, val description: String)
data class CoreText2textTranslate(val name: String, val description: String)
data class CoreText2image(val name: String, val description: String)
data class CoreAudio2text(val name: String, val description: String)
data class CoreContextwrite(val name: String, val description: String)
data class ContextChatContextChat(val name: String, val description: String)