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

Make deleting a project member and forking a project also not fail

parent 5ac74725
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -79,7 +79,7 @@ interface GitLabService {
 
@DELETE(API_VERSION + "/groups/{id}/members/{user_id}")
fun removeGroupMember(@Path("id") groupId: Long,
@Path("user_id") userId: Long): Single<String>
@Path("user_id") userId: Long): Completable
 
/* --- PROJECTS --- */
 
Loading
Loading
@@ -126,10 +126,10 @@ interface GitLabService {
 
@DELETE(API_VERSION + "/projects/{id}/members/{user_id}")
fun removeProjectMember(@Path("id") projectId: Long,
@Path("user_id") userId: Long): Single<String>
@Path("user_id") userId: Long): Completable
 
@POST(API_VERSION + "/projects/{id}/fork")
fun forkProject(@Path("id") projectId: Long): Single<String>
fun forkProject(@Path("id") projectId: Long): Completable
 
@POST(API_VERSION + "/projects/{id}/star")
fun starProject(@Path("id") projectId: Long): Single<Response<Project>>
Loading
Loading
Loading
Loading
@@ -24,8 +24,8 @@ import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.api.Group
import com.commit451.gitlab.model.api.User
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.LinkHeaderParser
import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder
import com.trello.rxlifecycle2.android.FragmentEvent
Loading
Loading
@@ -84,7 +84,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
this@GroupMembersFragment.member = member
App.get().gitLab.removeGroupMember(group.id, member.id)
.setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(object : CustomSingleObserver<String>() {
.subscribe(object : CustomCompleteObserver() {
 
override fun error(e: Throwable) {
Timber.e(e)
Loading
Loading
@@ -92,7 +92,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
.show()
}
 
override fun success(value: String) {
override fun complete() {
adapterGroupMembers.removeMember(this@GroupMembersFragment.member!!)
}
})
Loading
Loading
Loading
Loading
@@ -18,6 +18,7 @@ import com.commit451.gitlab.extension.*
import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.model.api.RepositoryFile
import com.commit451.gitlab.navigation.Navigator
import com.commit451.gitlab.rx.CustomCompleteObserver
import com.commit451.gitlab.rx.CustomSingleObserver
import com.commit451.gitlab.util.InternalLinkMovementMethod
import com.trello.rxlifecycle2.android.FragmentEvent
Loading
Loading
@@ -76,14 +77,14 @@ class ProjectFragment : ButterKnifeFragment() {
.setPositiveButton(R.string.ok) { _, _ ->
App.get().gitLab.forkProject(it.id)
.setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(object : CustomSingleObserver<String>() {
.subscribe(object : CustomCompleteObserver() {
 
override fun error(t: Throwable) {
Snackbar.make(swipeRefreshLayout, R.string.fork_failed, Snackbar.LENGTH_SHORT)
.show()
}
 
override fun success(s: String) {
override fun complete() {
Snackbar.make(swipeRefreshLayout, R.string.project_forked, Snackbar.LENGTH_SHORT)
.show()
}
Loading
Loading
Loading
Loading
@@ -25,8 +25,8 @@ import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.model.api.User
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.LinkHeaderParser
import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder
import com.trello.rxlifecycle2.android.FragmentEvent
Loading
Loading
@@ -93,7 +93,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
this@ProjectMembersFragment.member = member
App.get().gitLab.removeProjectMember(project!!.id, member.id)
.setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(object : CustomSingleObserver<String>() {
.subscribe(object : CustomCompleteObserver() {
 
override fun error(t: Throwable) {
Timber.e(t)
Loading
Loading
@@ -101,7 +101,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
.show()
}
 
override fun success(s: String) {
override fun complete() {
adapterProjectMembers.removeMember(this@ProjectMembersFragment.member!!)
}
})
Loading
Loading
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