Эх сурвалжийг харах

remove hardcoded api version for location sharing

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 3 жил өмнө
parent
commit
f813688a12

+ 3 - 1
app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt

@@ -396,9 +396,11 @@ class LocationPickerController(args: Bundle) :
             "{\"type\":\"geo-location\",\"id\":\"geo:$selectedLat,$selectedLon\",\"latitude\":\"$selectedLat\"," +
                 "\"longitude\":\"$selectedLon\",\"name\":\"$locationNameToShare\"}"
 
+        val apiVersion = ApiUtils.getChatApiVersion(userUtils.currentUser, intArrayOf(1))
+
         ncApi.sendLocation(
             ApiUtils.getCredentials(userUtils.currentUser?.username, userUtils.currentUser?.token),
-            ApiUtils.getUrlToSendLocation(userUtils.currentUser?.baseUrl, roomToken),
+            ApiUtils.getUrlToSendLocation(apiVersion, userUtils.currentUser?.baseUrl, roomToken),
             "geo-location",
             objectId,
             metaData

+ 2 - 2
app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java

@@ -391,7 +391,7 @@ public class ApiUtils {
         return baseUrl + ocsApiVersion + "/cloud/user/fields";
     }
 
-    public static String getUrlToSendLocation(String baseUrl, String roomToken) {
-        return baseUrl + ocsApiVersion + "/apps/spreed/api/v1/chat/" + roomToken + "/share";
+    public static String getUrlToSendLocation(int version, String baseUrl, String roomToken) {
+        return getUrlForChat(version, baseUrl, roomToken) + "/share";
     }
 }