Merge pull request #4165 from nextcloud/bugfix/4134/fixNpeBaseUrl

fix NPE when baseUrl is missing
nextcloud · Sep 6, 2024 · 0d96a15 · 0d96a15
2 parents 06f5c0b + 6858b32
commit 0d96a15
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
@@ -237,7 +237,7 @@ open class BaseActivity : AppCompatActivity() {
         val user = currentUserProvider.currentUser.blockingGet()
         if (intent.data != null && TextUtils.equals(intent.action, Intent.ACTION_VIEW)) {
             val uri = intent.data.toString()
-            if (uri.startsWith(user.baseUrl!!)) {
+            if (user?.baseUrl != null && uri.startsWith(user.baseUrl!!)) {
                 if (UriUtils.isInstanceInternalFileShareUrl(user.baseUrl!!, uri)) {
                     // https://cloud.nextcloud.com/f/41
                     val fileViewerUtils = FileViewerUtils(applicationContext, user)