gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #611

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-03 09:52:14 +02:00
parent ba868c682d
commit 6bd36e408c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
View File

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

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

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