mirror of
https://github.com/nextcloud/talk-android
synced 2025-03-06 22:29:09 +00:00
Merge pull request #4165 from nextcloud/bugfix/4134/fixNpeBaseUrl
fix NPE when baseUrl is missing
This commit is contained in:
commit
0d96a15906
@ -237,7 +237,7 @@ open class BaseActivity : AppCompatActivity() {
|
|||||||
val user = currentUserProvider.currentUser.blockingGet()
|
val user = currentUserProvider.currentUser.blockingGet()
|
||||||
if (intent.data != null && TextUtils.equals(intent.action, Intent.ACTION_VIEW)) {
|
if (intent.data != null && TextUtils.equals(intent.action, Intent.ACTION_VIEW)) {
|
||||||
val uri = intent.data.toString()
|
val uri = intent.data.toString()
|
||||||
if (uri.startsWith(user.baseUrl!!)) {
|
if (user?.baseUrl != null && uri.startsWith(user.baseUrl!!)) {
|
||||||
if (UriUtils.isInstanceInternalFileShareUrl(user.baseUrl!!, uri)) {
|
if (UriUtils.isInstanceInternalFileShareUrl(user.baseUrl!!, uri)) {
|
||||||
// https://cloud.nextcloud.com/f/41
|
// https://cloud.nextcloud.com/f/41
|
||||||
val fileViewerUtils = FileViewerUtils(applicationContext, user)
|
val fileViewerUtils = FileViewerUtils(applicationContext, user)
|
||||||
|
Loading…
Reference in New Issue
Block a user