gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-23 05:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Throw the exception up

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-05-04 14:05:00 +02:00
parent fb2fbf3152
commit ee3dc43530
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
19 changed files with 38 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

@ -305,11 +305,6 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
val apiVersion = ApiUtils.getConversationApiVersion(signatureVerification.userEntity, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(signatureVerification.userEntity, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi.getPeersForCall( ncApi.getPeersForCall(
ApiUtils.getCredentials(signatureVerification.userEntity.username, signatureVerification.userEntity.token), ApiUtils.getCredentials(signatureVerification.userEntity.username, signatureVerification.userEntity.token),
ApiUtils.getUrlForCall( ApiUtils.getUrlForCall(

13
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -231,12 +231,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
val currentUser = userUtils.currentUser ?: return val currentUser = userUtils.currentUser ?: return
val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
val credentials = ApiUtils.getCredentials(currentUser.username, currentUser.token) val credentials = ApiUtils.getCredentials(currentUser.username, currentUser.token)
val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom( val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
apiVersion, currentUser.baseUrl, roomType, apiVersion, currentUser.baseUrl, roomType,
@ -257,13 +251,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
bundle.putString(KEY_ROOM_TOKEN, roomOverall.ocs.data.token) bundle.putString(KEY_ROOM_TOKEN, roomOverall.ocs.data.token)
bundle.putString(KEY_ROOM_ID, roomOverall.ocs.data.roomId) bundle.putString(KEY_ROOM_ID, roomOverall.ocs.data.roomId)
if (currentUser.hasSpreedFeatureCapability("chat-v2")) { if (currentUser.hasSpreedFeatureCapability("chat-v2")) {
val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi.getRoom( ncApi.getRoom(
credentials, credentials,
ApiUtils.getUrlForRoom( ApiUtils.getUrlForRoom(

61
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -441,12 +441,7 @@ public class CallController extends BaseController {
} }
private void handleFromNotification() { private void handleFromNotification() {
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, baseUrl)) ncApi.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, baseUrl))
.retry(3) .retry(3)
@ -1104,12 +1099,7 @@ public class CallController extends BaseController {
} }
private void fetchSignalingSettings() { private void fetchSignalingSettings() {
Integer apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, baseUrl)) ncApi.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, baseUrl))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -1248,11 +1238,7 @@ public class CallController extends BaseController {
private void joinRoomAndCall() { private void joinRoomAndCall() {
callSession = ApplicationWideCurrentRoomHolder.getInstance().getSession(); callSession = ApplicationWideCurrentRoomHolder.getInstance().getSession();
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
if (TextUtils.isEmpty(callSession)) { if (TextUtils.isEmpty(callSession)) {
ncApi.joinRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken), ncApi.joinRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken),
@ -1308,12 +1294,7 @@ public class CallController extends BaseController {
inCallFlag = (int) Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue(); inCallFlag = (int) Participant.ParticipantFlags.IN_CALL_WITH_AUDIO_AND_VIDEO.getValue();
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.joinCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken), inCallFlag) ncApi.joinCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken), inCallFlag)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -1375,12 +1356,7 @@ public class CallController extends BaseController {
} }
if (!hasExternalSignalingServer) { if (!hasExternalSignalingServer) {
Integer apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.pullSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion, ncApi.pullSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion,
baseUrl, urlToken)) baseUrl, urlToken))
@ -1647,12 +1623,7 @@ public class CallController extends BaseController {
} }
private void hangupNetworkCalls(boolean shutDownView) { private void hangupNetworkCalls(boolean shutDownView) {
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken)) ncApi.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -1689,11 +1660,7 @@ public class CallController extends BaseController {
} }
private void leaveRoom(boolean shutDownView) { private void leaveRoom(boolean shutDownView) {
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.leaveRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken)) ncApi.leaveRoom(credentials, ApiUtils.getUrlForParticipantsActive(apiVersion, baseUrl, roomToken))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -1788,12 +1755,7 @@ public class CallController extends BaseController {
private void getPeersForCall() { private void getPeersForCall() {
Log.d(TAG, "getPeersForCall"); Log.d(TAG, "getPeersForCall");
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken)) ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -2099,12 +2061,7 @@ public class CallController extends BaseController {
urlToken = roomToken; urlToken = roomToken;
} }
Integer apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, new int[] {2, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.sendSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion, baseUrl, urlToken), ncApi.sendSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion, baseUrl, urlToken),
strings.toString()) strings.toString())

13
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -210,12 +210,7 @@ public class CallNotificationController extends BaseController {
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
private void checkIfAnyParticipantsRemainInRoom() { private void checkIfAnyParticipantsRemainInRoom() {
Integer apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, userBeingCalled.getBaseUrl(), ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, userBeingCalled.getBaseUrl(),
currentConversation.getToken())) currentConversation.getToken()))
@ -267,11 +262,7 @@ public class CallNotificationController extends BaseController {
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
private void handleFromNotification() { private void handleFromNotification() {
Integer apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {4, 3, 1}); int apiVersion = ApiUtils.getConversationApiVersion(userBeingCalled, new int[] {4, 3, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, userBeingCalled.getBaseUrl(), roomId)) ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, userBeingCalled.getBaseUrl(), roomId))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())

44
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -82,7 +82,6 @@ import com.facebook.imagepipeline.image.CloseableImage
import com.google.android.flexbox.FlexboxLayout import com.google.android.flexbox.FlexboxLayout
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.MagicCallActivity import com.nextcloud.talk.activities.MagicCallActivity
import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.adapters.messages.MagicIncomingTextMessageViewHolder import com.nextcloud.talk.adapters.messages.MagicIncomingTextMessageViewHolder
import com.nextcloud.talk.adapters.messages.MagicOutcomingTextMessageViewHolder import com.nextcloud.talk.adapters.messages.MagicOutcomingTextMessageViewHolder
import com.nextcloud.talk.adapters.messages.MagicPreviewMessageViewHolder import com.nextcloud.talk.adapters.messages.MagicPreviewMessageViewHolder
@ -116,6 +115,7 @@ import com.nextcloud.talk.utils.DateUtils
import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.KeyboardUtils import com.nextcloud.talk.utils.KeyboardUtils
import com.nextcloud.talk.utils.MagicCharPolicy import com.nextcloud.talk.utils.MagicCharPolicy
import com.nextcloud.talk.utils.NoSupportedApiException
import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.NotificationUtils
import com.nextcloud.talk.utils.UriUtils import com.nextcloud.talk.utils.UriUtils
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
@ -296,11 +296,6 @@ class ChatController(args: Bundle) :
if (conversationUser != null) { if (conversationUser != null) {
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi?.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, conversationUser.baseUrl, roomToken)) ncApi?.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, conversationUser.baseUrl, roomToken))
?.subscribeOn(Schedulers.io()) ?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread()) ?.observeOn(AndroidSchedulers.mainThread())
@ -346,11 +341,6 @@ class ChatController(args: Bundle) :
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi?.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, conversationUser?.baseUrl)) ncApi?.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, conversationUser?.baseUrl))
?.subscribeOn(Schedulers.io())?.observeOn(AndroidSchedulers.mainThread()) ?.subscribeOn(Schedulers.io())?.observeOn(AndroidSchedulers.mainThread())
?.subscribe(object : Observer<RoomsOverall> { ?.subscribe(object : Observer<RoomsOverall> {
@ -979,11 +969,6 @@ class ChatController(args: Bundle) :
) { ) {
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi?.joinRoom( ncApi?.joinRoom(
credentials, credentials,
ApiUtils.getUrlForParticipantsActive(apiVersion, conversationUser?.baseUrl, roomToken), ApiUtils.getUrlForParticipantsActive(apiVersion, conversationUser?.baseUrl, roomToken),
@ -1053,11 +1038,6 @@ class ChatController(args: Bundle) :
private fun leaveRoom() { private fun leaveRoom() {
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi?.leaveRoom( ncApi?.leaveRoom(
credentials, credentials,
ApiUtils.getUrlForParticipantsActive( ApiUtils.getUrlForParticipantsActive(
@ -1144,11 +1124,6 @@ class ChatController(args: Bundle) :
if (conversationUser != null) { if (conversationUser != null) {
val apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi!!.sendChatMessage( ncApi!!.sendChatMessage(
credentials, credentials,
ApiUtils.getUrlForChat(apiVersion, conversationUser.baseUrl, roomToken), ApiUtils.getUrlForChat(apiVersion, conversationUser.baseUrl, roomToken),
@ -1251,16 +1226,11 @@ class ChatController(args: Bundle) :
} }
if (!wasDetached) { if (!wasDetached) {
var apiVersion: Int? var apiVersion: Int
// FIXME this is a best guess, guests would need to get the capabilities themselves // FIXME this is a best guess, guests would need to get the capabilities themselves
apiVersion = 1 apiVersion = 1
if (conversationUser != null) { if (conversationUser != null) {
apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1)) apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
} }
if (lookIntoFuture > 0) { if (lookIntoFuture > 0) {
@ -1687,11 +1657,6 @@ class ChatController(args: Bundle) :
} }
R.id.action_delete_message -> { R.id.action_delete_message -> {
val apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getChatApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
}
ncApi?.deleteChatMessage( ncApi?.deleteChatMessage(
credentials, credentials,
ApiUtils.getUrlForChatMessage(apiVersion, conversationUser?.baseUrl, roomToken, ApiUtils.getUrlForChatMessage(apiVersion, conversationUser?.baseUrl, roomToken,
@ -1807,11 +1772,6 @@ class ChatController(args: Bundle) :
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom( val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
apiVersion, conversationUser?.baseUrl, "1", apiVersion, conversationUser?.baseUrl, "1",
userMentionClickEvent.userId, null userMentionClickEvent.userId, null

19
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -288,13 +288,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
userId = selectedUserIds.iterator().next(); userId = selectedUserIds.iterator().next();
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(apiVersion, RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(apiVersion,
currentUser.getBaseUrl(), currentUser.getBaseUrl(),
roomType, roomType,
@ -318,8 +312,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ
bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), roomOverall.getOcs().getData().getToken()); bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), roomOverall.getOcs().getData().getToken());
bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), roomOverall.getOcs().getData().getRoomId()); bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), roomOverall.getOcs().getData().getRoomId());
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion != null && currentUser.hasSpreedFeatureCapability("chat-v2")) { if (currentUser.hasSpreedFeatureCapability("chat-v2")) {
ncApi.getRoom(credentials, ncApi.getRoom(credentials,
ApiUtils.getUrlForRoom(apiVersion, currentUser.getBaseUrl(), ApiUtils.getUrlForRoom(apiVersion, currentUser.getBaseUrl(),
@ -860,12 +854,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
roomType = "2"; roomType = "2";
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return false;
}
RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(apiVersion, RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(apiVersion,
currentUser.getBaseUrl(), currentUser.getBaseUrl(),

19
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -312,11 +312,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi.setLobbyForConversation( ncApi.setLobbyForConversation(
ApiUtils.getCredentials(conversationUser!!.username, conversationUser.token), ApiUtils.getCredentials(conversationUser!!.username, conversationUser.token),
ApiUtils.getUrlForRoomWebinaryLobby(apiVersion, conversationUser.baseUrl, conversation!!.token), ApiUtils.getUrlForRoomWebinaryLobby(apiVersion, conversationUser.baseUrl, conversation!!.token),
@ -452,11 +447,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
private fun getListOfParticipants() { private fun getListOfParticipants() {
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi.getPeersForCall( ncApi.getPeersForCall(
credentials, credentials,
ApiUtils.getUrlForParticipants(apiVersion, conversationUser!!.baseUrl, conversationToken) ApiUtils.getUrlForParticipants(apiVersion, conversationUser!!.baseUrl, conversationToken)
@ -549,11 +539,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
private fun fetchRoomInfo() { private fun fetchRoomInfo() {
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
return
}
ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, conversationUser!!.baseUrl, conversationToken)) ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, conversationUser!!.baseUrl, conversationToken))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -731,10 +716,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(1))
if (apiVersion == null) {
Log.e(TAG, "No supported API version found")
}
if (index == 0) { if (index == 0) {
if (participant.type == Participant.ParticipantType.MODERATOR) { if (participant.type == Participant.ParticipantType.MODERATOR) {
ncApi.demoteModeratorToUser( ncApi.demoteModeratorToUser(

7
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -418,12 +418,7 @@ public class ConversationsListController extends BaseController implements Searc
callItems = new ArrayList<>(); callItems = new ArrayList<>();
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {4, 1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {4, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
roomsQueryDisposable = ncApi.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion, roomsQueryDisposable = ncApi.getRooms(credentials, ApiUtils.getUrlForRooms(apiVersion,
currentUser.getBaseUrl())) currentUser.getBaseUrl()))

21
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -193,12 +193,7 @@ public class OperationsMenuController extends BaseController {
credentials = null; credentials = null;
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
switch (operationCode) { switch (operationCode) {
case 2: case 2:
@ -401,12 +396,7 @@ public class OperationsMenuController extends BaseController {
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
private void performGroupCallWorkaround(String credentials) { private void performGroupCallWorkaround(String credentials) {
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.makeRoomPrivate(credentials, ApiUtils.getUrlForRoomPublic(apiVersion, currentUser.getBaseUrl(), ncApi.makeRoomPrivate(credentials, ApiUtils.getUrlForRoomPublic(apiVersion, currentUser.getBaseUrl(),
conversation.getToken())) conversation.getToken()))
@ -565,12 +555,7 @@ public class OperationsMenuController extends BaseController {
localInvitedGroups.remove(0); localInvitedGroups.remove(0);
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
if (localInvitedUsers.size() > 0 || (localInvitedGroups.size() > 0 && currentUser.hasSpreedFeatureCapability("invite-groups-and-mails"))) { if (localInvitedUsers.size() > 0 || (localInvitedGroups.size() > 0 && currentUser.hasSpreedFeatureCapability("invite-groups-and-mails"))) {
if ((localInvitedGroups.size() > 0 && currentUser.hasSpreedFeatureCapability("invite-groups-and-mails"))) { if ((localInvitedGroups.size() > 0 && currentUser.hasSpreedFeatureCapability("invite-groups-and-mails"))) {

7
app/src/main/java/com/nextcloud/talk/jobs/AddParticipantsToConversation.java
View File

@ -73,12 +73,7 @@ public class AddParticipantsToConversation extends Worker {
String[] selectedGroupIds = data.getStringArray(BundleKeys.INSTANCE.getKEY_SELECTED_GROUPS()); String[] selectedGroupIds = data.getStringArray(BundleKeys.INSTANCE.getKEY_SELECTED_GROUPS());
UserEntity user = userUtils.getUserWithInternalId(data.getLong(BundleKeys.INSTANCE.getKEY_INTERNAL_USER_ID(), -1)); UserEntity user = userUtils.getUserWithInternalId(data.getLong(BundleKeys.INSTANCE.getKEY_INTERNAL_USER_ID(), -1));
Integer apiVersion = ApiUtils.getConversationApiVersion(user, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(user, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return Result.failure();
}
String conversationToken = data.getString(BundleKeys.INSTANCE.getKEY_TOKEN()); String conversationToken = data.getString(BundleKeys.INSTANCE.getKEY_TOKEN());
String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken()); String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken());

7
app/src/main/java/com/nextcloud/talk/jobs/DeleteConversationWorker.java
View File

@ -80,12 +80,7 @@ public class DeleteConversationWorker extends Worker {
UserEntity operationUser = userUtils.getUserWithId(operationUserId); UserEntity operationUser = userUtils.getUserWithId(operationUserId);
if (operationUser != null) { if (operationUser != null) {
Integer apiVersion = ApiUtils.getConversationApiVersion(operationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(operationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return Result.failure();
}
String credentials = ApiUtils.getCredentials(operationUser.getUsername(), operationUser.getToken()); String credentials = ApiUtils.getCredentials(operationUser.getUsername(), operationUser.getToken());
ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new

7
app/src/main/java/com/nextcloud/talk/jobs/LeaveConversationWorker.java
View File

@ -87,12 +87,7 @@ public class LeaveConversationWorker extends Worker {
EventStatus eventStatus = new EventStatus(operationUser.getId(), EventStatus eventStatus = new EventStatus(operationUser.getId(),
EventStatus.EventType.CONVERSATION_UPDATE, true); EventStatus.EventType.CONVERSATION_UPDATE, true);
Integer apiVersion = ApiUtils.getConversationApiVersion(operationUser, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(operationUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return Result.failure();
}
ncApi.removeSelfFromRoom(credentials, ApiUtils.getUrlForParticipantsSelf(apiVersion, ncApi.removeSelfFromRoom(credentials, ApiUtils.getUrlForParticipantsSelf(apiVersion,
operationUser.getBaseUrl(), operationUser.getBaseUrl(),

8
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -152,13 +152,7 @@ public class NotificationWorker extends Worker {
importantConversation = Boolean.parseBoolean(arbitraryStorageEntity.getValue()); importantConversation = Boolean.parseBoolean(arbitraryStorageEntity.getValue());
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(userEntity, new int[] {1}); int apiVersion = ApiUtils.getConversationApiVersion(userEntity, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, userEntity.getBaseUrl(), ncApi.getRoom(credentials, ApiUtils.getUrlForRoom(apiVersion, userEntity.getBaseUrl(),
intent.getExtras().getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN()))) intent.getExtras().getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN())))

7
app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java
View File

@ -82,12 +82,7 @@ public class SignalingSettingsWorker extends Worker {
userEntity = userEntityList.get(i); userEntity = userEntityList.get(i);
UserEntity finalUserEntity = userEntity; UserEntity finalUserEntity = userEntity;
Integer apiVersion = ApiUtils.getSignalingApiVersion(finalUserEntity, new int[] {2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(finalUserEntity, new int[] {2, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
continue;
}
ncApi.getSignalingSettings(ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()), ncApi.getSignalingSettings(ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()),
ApiUtils.getUrlForSignalingSettings(apiVersion, userEntity.getBaseUrl())) ApiUtils.getUrlForSignalingSettings(apiVersion, userEntity.getBaseUrl()))

7
app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
View File

@ -95,12 +95,7 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
queryString = ""; queryString = "";
} }
Integer apiVersion = ApiUtils.getChatApiVersion(currentUser, new int[] {1}); int apiVersion = ApiUtils.getChatApiVersion(currentUser, new int[] {1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return;
}
adapter.setFilter(queryString); adapter.setFilter(queryString);
ncApi.getMentionAutocompleteSuggestions( ncApi.getMentionAutocompleteSuggestions(

12
app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
View File

@ -109,7 +109,7 @@ public class ApiUtils {
return baseUrl + ocsApiVersion + "/cloud/capabilities"; return baseUrl + ocsApiVersion + "/cloud/capabilities";
} }
public static Integer getConversationApiVersion(UserEntity capabilities, int[] versions) { public static int getConversationApiVersion(UserEntity capabilities, int[] versions) throws NoSupportedApiException {
boolean hasApiV4 = false; boolean hasApiV4 = false;
for (int version : versions) { for (int version : versions) {
hasApiV4 |= version == 4; hasApiV4 |= version == 4;
@ -135,10 +135,10 @@ public class ApiUtils {
} }
} }
} }
return null; throw new NoSupportedApiException();
} }
public static Integer getSignalingApiVersion(UserEntity capabilities, int[] versions) { public static int getSignalingApiVersion(UserEntity capabilities, int[] versions) throws NoSupportedApiException {
for (int version : versions) { for (int version : versions) {
if (version == 2 && capabilities.hasSpreedFeatureCapability("sip-support")) { if (version == 2 && capabilities.hasSpreedFeatureCapability("sip-support")) {
return version; return version;
@ -149,17 +149,17 @@ public class ApiUtils {
return version; return version;
} }
} }
return null; throw new NoSupportedApiException();
} }
public static Integer getChatApiVersion(UserEntity capabilities, int[] versions) { public static int getChatApiVersion(UserEntity capabilities, int[] versions) throws NoSupportedApiException {
for (int version : versions) { for (int version : versions) {
if (version == 1 && capabilities.hasSpreedFeatureCapability("chat-v2")) { if (version == 1 && capabilities.hasSpreedFeatureCapability("chat-v2")) {
// Do not question that chat-v2 capability shows the availability of api/v1/ endpoint *see no evil* // Do not question that chat-v2 capability shows the availability of api/v1/ endpoint *see no evil*
return version; return version;
} }
} }
return null; throw new NoSupportedApiException();
} }
protected static String getUrlForApi(int version, String baseUrl) { protected static String getUrlForApi(int version, String baseUrl) {

3
app/src/main/java/com/nextcloud/talk/utils/NoSupportedApiException.kt Normal file
View File

@ -0,0 +1,3 @@
package com.nextcloud.talk.utils
class NoSupportedApiException : RuntimeException("No supported API version found")

5
app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.java
View File

@ -97,10 +97,7 @@ public class DatabaseStorageModule implements StorageModule {
intValue = 0; intValue = 0;
} }
Integer apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {4, 1}); int apiVersion = ApiUtils.getConversationApiVersion(conversationUser, new int[] {4, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
}
ncApi.setNotificationLevel(ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken()), ncApi.setNotificationLevel(ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken()),
ApiUtils.getUrlForRoomNotificationLevel(apiVersion, conversationUser.getBaseUrl(), ApiUtils.getUrlForRoomNotificationLevel(apiVersion, conversationUser.getBaseUrl(),

7
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
View File

@ -94,12 +94,7 @@ public class WebSocketConnectionHelper {
@SuppressLint("LongLogTag") @SuppressLint("LongLogTag")
HelloOverallWebSocketMessage getAssembledHelloModel(UserEntity userEntity, String ticket) { HelloOverallWebSocketMessage getAssembledHelloModel(UserEntity userEntity, String ticket) {
Integer apiVersion = ApiUtils.getSignalingApiVersion(userEntity, new int[] {2, 1}); int apiVersion = ApiUtils.getSignalingApiVersion(userEntity, new int[] {2, 1});
if (apiVersion == null) {
Log.e(TAG, "No supported API version found", new Exception("No supported API version found"));
return null;
}
HelloOverallWebSocketMessage helloOverallWebSocketMessage = new HelloOverallWebSocketMessage(); HelloOverallWebSocketMessage helloOverallWebSocketMessage = new HelloOverallWebSocketMessage();
helloOverallWebSocketMessage.setType("hello"); helloOverallWebSocketMessage.setType("hello");