From 68586ba90156783ab01c655c80c3828bf066c6ca Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 31 Mar 2019 17:50:29 +0200 Subject: [PATCH] Fixes to url handling in settings & notification Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/SettingsController.java | 2 +- .../main/java/com/nextcloud/talk/jobs/NotificationWorker.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index dc4aaaaf6..22b3ce9c6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -522,7 +522,7 @@ public class SettingsController extends BaseController { if (currentUser != null) { - baseUrlTextView.setText(currentUser.getBaseUrl()); + baseUrlTextView.setText(Uri.parse(currentUser.getBaseUrl()).getHost()); reauthorizeButton.addPreferenceClickListener(view14 -> { getRouter().pushController(RouterTransaction.with( diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 49e789456..e653214bc 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -266,8 +266,8 @@ public class NotificationWorker extends Worker { CRC32 crc32 = new CRC32(); - String baseUrl = - signatureVerification.getUserEntity().getBaseUrl().substring(signatureVerification.getUserEntity().getBaseUrl().indexOf("://") + 3); + Uri uri = Uri.parse(signatureVerification.getUserEntity().getBaseUrl()); + String baseUrl = uri.getHost(); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, "1") .setLargeIcon(largeIcon)