Unban uses banId

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>

app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -335,7 +335,7 @@ Observable<Unit> registerDeviceForNotificationsWithPushProxy(@Url String url,
  */
  @DELETE
  Observable<Void> unregisterDeviceForNotificationsWithProxy(@Url String url,
- @QueryMap Map<String,String> fields);
+ @QueryMap Map<String, String> fields);
 
  @FormUrlEncoded
  @PUT
@@ -706,11 +706,11 @@ Observable<InvitationOverall> getInvitations(@Header("Authorization") String aut
 
  @POST
  Observable<GenericOverall> acceptInvitation(@Header("Authorization") String authorization,
-  @Url String url);
+ @Url String url);
 
  @DELETE
  Observable<GenericOverall> rejectInvitation(@Header("Authorization") String authorization,
-  @Url String url);
+ @Url String url);
 
  @GET
  Observable<TalkBanOverall> listBans(@Header("Authorization") String authorization,
@@ -726,6 +726,5 @@ Observable<TalkBan> banActor(@Header("Authorization") String authorization,
 
  @DELETE
  Observable<GenericOverall> unbanActor(@Header("Authorization") String authorization,
- @Url String url,
- @Query("banId") int banId);
+ @Url String url);
 }

app/src/main/java/com/nextcloud/talk/chat/data/ChatRepository.kt

@@ -30,6 +30,7 @@ interface ChatRepository {
  timeStamp: Int,
  chatApiVersion: Int
  ): Observable<Reminder>
+
  fun getReminder(user: User, roomToken: String, messageId: String, apiVersion: Int): Observable<Reminder>
  fun deleteReminder(user: User, roomToken: String, messageId: String, apiVersion: Int): Observable<GenericOverall>
  fun shareToNotes(
@@ -38,6 +39,7 @@ interface ChatRepository {
  message: String,
  displayName: String
  ): Observable<GenericOverall> // last two fields are false
+
  fun checkForNoteToSelf(credentials: String, url: String, includeStatus: Boolean): Observable<RoomsOverall>
  fun shareLocationToNotes(
  credentials: String,
@@ -46,6 +48,7 @@ interface ChatRepository {
  objectId: String,
  metadata: String
  ): Observable<GenericOverall>
+
  fun leaveRoom(credentials: String, url: String): Observable<GenericOverall>
  fun sendChatMessage(
  credentials: String,
@@ -55,6 +58,7 @@ interface ChatRepository {
  replyTo: Int,
  sendWithoutNotification: Boolean
  ): Observable<GenericOverall>
+
  fun pullChatMessages(credentials: String, url: String, fieldMap: HashMap<String, Int>): Observable<Response<*>>
  fun deleteChatMessage(credentials: String, url: String): Observable<ChatOverallSingleMessage>
  fun createRoom(credentials: String, url: String, map: Map<String, String>): Observable<RoomOverall>
@@ -68,5 +72,6 @@ interface ChatRepository {
  actorId: String,
  internalNote: String
  ): Observable<TalkBan>
- fun unbanActor(credentials: String, url: String, banId: Int): Observable<GenericOverall>
+
+ fun unbanActor(credentials: String, url: String): Observable<GenericOverall>
 }

app/src/main/java/com/nextcloud/talk/chat/data/network/NetworkChatRepositoryImpl.kt

@@ -195,7 +195,7 @@ class NetworkChatRepositoryImpl(private val ncApi: NcApi) : ChatRepository {
  return ncApi.banActor(credentials, url, actorType, actorId, internalNote)
  }
 
- override fun unbanActor(credentials: String, url: String, banId: Int): Observable<GenericOverall> {
- return ncApi.unbanActor(credentials, url, banId)
+ override fun unbanActor(credentials: String, url: String): Observable<GenericOverall> {
+ return ncApi.unbanActor(credentials, url)
  }
 }

app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt

@@ -177,8 +177,8 @@ class ConversationInfoViewModel @Inject constructor(
  }
 
  fun unbanActor(user: User, token: String, banId: Int) {
- val url = ApiUtils.getUrlForBans(user.baseUrl!!, token)
- chatRepository.unbanActor(user.getCredentials(), url, banId)
+ val url = ApiUtils.getUrlForUnban(user.baseUrl!!, token, banId)
+ chatRepository.unbanActor(user.getCredentials(), url)
  .subscribeOn(Schedulers.io())
  ?.observeOn(AndroidSchedulers.mainThread())
  ?.subscribe(object : Observer<GenericOverall> {

app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt

@@ -576,4 +576,8 @@ object ApiUtils {
  fun getUrlForBans(baseUrl: String, token: String): String {
  return "$baseUrl/ocs/v1.php$SPREED_API_VERSION/ban/$token"
  }
+
+ fun getUrlForUnban(baseUrl: String, token: String, banId: Int): String {
+ return "${getUrlForBans(baseUrl, token)}/$banId"
+ }
 }