Skip to content
Snippets Groups Projects
Commit 5ac74725 authored by John Carlson's avatar John Carlson
Browse files

Make deleting an issue not fail

parent d907ab5f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -98,12 +98,12 @@ android {
}
 
ext {
supportLibVersion = '26.0.0'
supportLibVersion = '26.0.1'
retrofitVersion = '2.3.0'
okHttpVersion = '3.8.1'
butterknifeVersion = '8.7.0'
parcelerVersion = '1.1.9'
reptarVersion = '2.5.0'
reptarVersion = '2.5.1'
adapterLayout = '1.1.1'
materialDialogsVersion = '0.9.4.5'
leakCanaryVersion = '1.5'
Loading
Loading
@@ -151,7 +151,7 @@ dependencies {
 
implementation 'org.greenrobot:eventbus:3.0.0'
 
implementation 'io.reactivex.rxjava2:rxjava:2.1.2'
implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
Loading
Loading
Loading
Loading
@@ -32,6 +32,7 @@ import com.commit451.gitlab.model.api.Issue
import com.commit451.gitlab.model.api.Note
import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.navigation.Navigator
import com.commit451.gitlab.rx.CustomCompleteObserver
import com.commit451.gitlab.rx.CustomResponseSingleObserver
import com.commit451.gitlab.rx.CustomSingleObserver
import com.commit451.gitlab.util.IntentUtil
Loading
Loading
@@ -122,7 +123,7 @@ class IssueActivity : BaseActivity() {
R.id.action_delete -> {
App.get().gitLab.deleteIssue(project!!.id, issue!!.iid)
.setup(bindToLifecycle())
.subscribe(object : CustomSingleObserver<String>() {
.subscribe(object : CustomCompleteObserver() {
 
override fun error(t: Throwable) {
Timber.e(t)
Loading
Loading
@@ -130,7 +131,7 @@ class IssueActivity : BaseActivity() {
.show()
}
 
override fun success(s: String) {
override fun complete() {
App.bus().post(IssueReloadEvent())
Toast.makeText(this@IssueActivity, R.string.issue_deleted, Toast.LENGTH_SHORT)
.show()
Loading
Loading
@@ -144,7 +145,7 @@ class IssueActivity : BaseActivity() {
}
 
@OnClick(R.id.fab_edit_issue)
fun onEditIssueClick(fab: View) {
fun onEditIssueClick() {
val project = project
val issue = issue
if (project != null && issue != null) {
Loading
Loading
Loading
Loading
@@ -3,6 +3,7 @@ package com.commit451.gitlab.api
import com.commit451.gitlab.api.request.SessionRequest
import com.commit451.gitlab.api.response.FileUploadResponse
import com.commit451.gitlab.model.api.*
import io.reactivex.Completable
import io.reactivex.Single
import okhttp3.MultipartBody
import retrofit2.Response
Loading
Loading
@@ -280,7 +281,7 @@ interface GitLabService {
 
@DELETE(API_VERSION + "/projects/{id}/issues/{issue_iid}")
fun deleteIssue(@Path("id") projectId: Long,
@Path("issue_iid") issueIid: Long): Single<String>
@Path("issue_iid") issueIid: Long): Completable
 
/* --- REPOSITORY --- */
 
Loading
Loading
package com.commit451.gitlab.extension
import com.commit451.reptar.kotlin.fromIoToMainThread
import com.trello.rxlifecycle2.LifecycleTransformer
import io.reactivex.Completable
fun Completable.setup(transformer: LifecycleTransformer<Any>): Completable {
return this.compose(transformer).fromIoToMainThread()
}
package com.commit451.gitlab.rx
import com.commit451.reptar.ComposableCompletableObserver
abstract class CustomCompleteObserver: ComposableCompletableObserver()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment