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

Fix #611

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 жил өмнө
parent
commit
6bd36e408c

+ 2 - 2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java

@@ -228,8 +228,8 @@ public class EntryMenuController extends BaseController {
                             proceedButton.setAlpha(1.0f);
                         }
                         textInputLayout.setErrorEnabled(false);
-                    } else if (editText.getText().toString().startsWith("http://") ||
-                            editText.getText().toString().startsWith("https://") &&
+                    } else if ((editText.getText().toString().startsWith("http://") ||
+                            editText.getText().toString().startsWith("https://")) &&
                                     editText.getText().toString().contains("/call/")) {
                         // operation code 10
                         if (!proceedButton.isEnabled()) {

+ 2 - 2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java

@@ -171,8 +171,8 @@ public class OperationsMenuController extends BaseController {
         currentUser = userUtils.getCurrentUser();
         OperationsObserver operationsObserver = new OperationsObserver();
 
-        if (!TextUtils.isEmpty(callUrl)) {
-            conversationToken = callUrl.substring(callUrl.lastIndexOf("/") + 1, callUrl.length());
+        if (!TextUtils.isEmpty(callUrl) && callUrl.contains("/call")) {
+            conversationToken = callUrl.substring(callUrl.lastIndexOf("/") + 1);
             if (callUrl.contains("/index.php")) {
                 baseUrl = callUrl.substring(0, callUrl.indexOf("/index.php"));
             } else {