Merge tag 'v1.3.5' into sc
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
This commit is contained in:
SpiritCroc
commit
65bc997acc
13
CHANGES.md
13
CHANGES.md
|
|
@ -1,3 +1,15 @@
|
|||
Changes in Element v1.3.5 (2021-10-25)
|
||||
======================================
|
||||
|
||||
Bugfixes 🐛
|
||||
----------
|
||||
- Fixing malformed link pop up when tapping on notifications ([#4267](https://github.com/vector-im/element-android/issues/4267))
|
||||
- Fix Broken EditText when using FromEditTextItem ([#4276](https://github.com/vector-im/element-android/issues/4276))
|
||||
- Fix crash when clicking on ViewEvent source actions ([#4279](https://github.com/vector-im/element-android/issues/4279))
|
||||
- Fix voice message record button wrong visibility ([#4283](https://github.com/vector-im/element-android/issues/4283))
|
||||
- Fix unread marker not showing ([#4313](https://github.com/vector-im/element-android/issues/4313))
|
||||
|
||||
|
||||
Changes in Element v1.3.4 (2021-10-20)
|
||||
======================================
|
||||
|
||||
|
|
@ -5,6 +17,7 @@ Features ✨
|
|||
----------
|
||||
- Implement /part command, with or without parameter ([#2909](https://github.com/vector-im/element-android/issues/2909))
|
||||
- Handle Presence support, for Direct Message room ([#4090](https://github.com/vector-im/element-android/issues/4090))
|
||||
- Priority conversations for Android 11+ ([#3313](https://github.com/vector-im/element-android/issues/3313))
|
||||
|
||||
Bugfixes 🐛
|
||||
----------
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Fix Broken EditText when using FromEditTextItem
|
||||
|
|
@ -1 +0,0 @@
|
|||
Fix crash when clicking on ViewEvent source actions
|
||||
|
|
@ -1 +0,0 @@
|
|||
Fix voice message record button wrong visibility
|
||||
|
|
@ -1 +0,0 @@
|
|||
Fix unread marker not showing
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
Main changes in this version: Add Presence support, for Direct Message room (note: presence is disabled on matrix.org. Add again Android Auto support.
|
||||
Main changes in this version: Add Presence support, for Direct Message room (note: presence is disabled on matrix.org). Add again Android Auto support.
|
||||
Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.4
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
Main changes in this version: Add Presence support, for Direct Message room (note: presence is disabled on matrix.org). Add again Android Auto support.
|
||||
Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.5
|
||||
|
|
@ -1 +0,0 @@
|
|||
Priority conversations for Android 11+
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Copyright (c) 2021 New Vector Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.core.extensions
|
||||
|
||||
import android.net.Uri
|
||||
|
||||
const val IGNORED_SCHEMA = "ignored"
|
||||
|
||||
fun Uri.isIgnored() = scheme == IGNORED_SCHEMA
|
||||
|
||||
fun createIgnoredUri(path: String): Uri = Uri.parse("$IGNORED_SCHEMA://$path")
|
||||
|
|
@ -46,6 +46,7 @@ import androidx.core.graphics.drawable.IconCompat
|
|||
import androidx.fragment.app.Fragment
|
||||
import im.vector.app.BuildConfig
|
||||
import im.vector.app.R
|
||||
import im.vector.app.core.extensions.createIgnoredUri
|
||||
import im.vector.app.core.resources.StringProvider
|
||||
import im.vector.app.core.services.CallService
|
||||
import im.vector.app.core.utils.startNotificationChannelSettingsIntent
|
||||
|
|
@ -316,7 +317,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
mode = VectorCallActivity.INCOMING_RINGING
|
||||
).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
data = Uri.parse("foobar://${call.callId}")
|
||||
data = createIgnoredUri(call.callId)
|
||||
}
|
||||
val contentPendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), contentIntent, 0)
|
||||
|
||||
|
|
@ -377,7 +378,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
call = call,
|
||||
mode = null).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
data = Uri.parse("foobar://$call.callId")
|
||||
data = createIgnoredUri(call.callId)
|
||||
}
|
||||
val contentPendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), contentIntent, 0)
|
||||
|
||||
|
|
@ -585,7 +586,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
// Mark room as read
|
||||
val markRoomReadIntent = Intent(context, NotificationBroadcastReceiver::class.java)
|
||||
markRoomReadIntent.action = MARK_ROOM_READ_ACTION
|
||||
markRoomReadIntent.data = Uri.parse("foobar://${roomInfo.roomId}")
|
||||
markRoomReadIntent.data = createIgnoredUri(roomInfo.roomId)
|
||||
markRoomReadIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId)
|
||||
val markRoomReadPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(), markRoomReadIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
|
@ -653,7 +654,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
// offer to type a quick reject button
|
||||
val rejectIntent = Intent(context, NotificationBroadcastReceiver::class.java)
|
||||
rejectIntent.action = REJECT_ACTION
|
||||
rejectIntent.data = Uri.parse("foobar://$roomId&$matrixId")
|
||||
rejectIntent.data = createIgnoredUri("$roomId&$matrixId")
|
||||
rejectIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
|
||||
val rejectIntentPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(), rejectIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
|
@ -666,7 +667,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
// offer to type a quick accept button
|
||||
val joinIntent = Intent(context, NotificationBroadcastReceiver::class.java)
|
||||
joinIntent.action = JOIN_ACTION
|
||||
joinIntent.data = Uri.parse("foobar://$roomId&$matrixId")
|
||||
joinIntent.data = createIgnoredUri("$roomId&$matrixId")
|
||||
joinIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
|
||||
val joinIntentPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(), joinIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
|
@ -678,7 +679,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
val contentIntent = HomeActivity.newIntent(context, inviteNotificationRoomId = inviteNotifiableEvent.roomId)
|
||||
contentIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
// pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
|
||||
contentIntent.data = Uri.parse("foobar://" + inviteNotifiableEvent.eventId)
|
||||
contentIntent.data = createIgnoredUri(inviteNotifiableEvent.eventId)
|
||||
setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, 0))
|
||||
|
||||
if (inviteNotifiableEvent.noisy) {
|
||||
|
|
@ -717,7 +718,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
val contentIntent = HomeActivity.newIntent(context)
|
||||
contentIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
// pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
|
||||
contentIntent.data = Uri.parse("foobar://" + simpleNotifiableEvent.eventId)
|
||||
contentIntent.data = createIgnoredUri(simpleNotifiableEvent.eventId)
|
||||
setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, 0))
|
||||
|
||||
if (simpleNotifiableEvent.noisy) {
|
||||
|
|
@ -739,7 +740,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
val roomIntentTap = RoomDetailActivity.newIntent(context, RoomDetailArgs(roomId))
|
||||
roomIntentTap.action = TAP_TO_VIEW_ACTION
|
||||
// pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
|
||||
roomIntentTap.data = Uri.parse("foobar://openRoom?$roomId")
|
||||
roomIntentTap.data = createIgnoredUri("openRoom?$roomId")
|
||||
|
||||
// Recreate the back stack
|
||||
return TaskStackBuilder.create(context)
|
||||
|
|
@ -751,7 +752,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
private fun buildOpenHomePendingIntentForSummary(): PendingIntent {
|
||||
val intent = HomeActivity.newIntent(context, clearNotification = true)
|
||||
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
intent.data = Uri.parse("foobar://tapSummary")
|
||||
intent.data = createIgnoredUri("tapSummary")
|
||||
return PendingIntent.getActivity(context, Random.nextInt(1000), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
}
|
||||
|
||||
|
|
@ -767,7 +768,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
intent = Intent(context, NotificationBroadcastReceiver::class.java)
|
||||
intent.action = SMART_REPLY_ACTION
|
||||
intent.data = Uri.parse("foobar://$roomId")
|
||||
intent.data = createIgnoredUri(roomId)
|
||||
intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
|
||||
return PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(), intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
|
@ -782,7 +783,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
|
||||
// the action must be unique else the parameters are ignored
|
||||
quickReplyIntent.action = QUICK_LAUNCH_ACTION
|
||||
quickReplyIntent.data = Uri.parse("foobar://$roomId")
|
||||
quickReplyIntent.data = createIgnoredUri($roomId")
|
||||
return PendingIntent.getActivity(context, 0, quickReplyIntent, 0)
|
||||
}
|
||||
*/
|
||||
|
|
@ -836,7 +837,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
|
|||
private fun getDismissSummaryPendingIntent(): PendingIntent {
|
||||
val intent = Intent(context, NotificationBroadcastReceiver::class.java)
|
||||
intent.action = DISMISS_SUMMARY_ACTION
|
||||
intent.data = Uri.parse("foobar://deleteSummary")
|
||||
intent.data = createIgnoredUri("deleteSummary")
|
||||
return PendingIntent.getBroadcast(context.applicationContext,
|
||||
0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import android.content.Context
|
|||
import android.net.Uri
|
||||
import im.vector.app.R
|
||||
import im.vector.app.core.di.ActiveSessionHolder
|
||||
import im.vector.app.core.extensions.isIgnored
|
||||
import im.vector.app.core.utils.toast
|
||||
import im.vector.app.features.navigation.Navigator
|
||||
import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
|
||||
|
|
@ -53,16 +54,20 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
|
|||
navigationInterceptor: NavigationInterceptor? = null,
|
||||
buildTask: Boolean = false
|
||||
): Boolean {
|
||||
if (deepLink == null || !isPermalinkSupported(context, deepLink.toString())) {
|
||||
return false
|
||||
}
|
||||
return tryOrNull {
|
||||
return when {
|
||||
deepLink == null -> false
|
||||
deepLink.isIgnored() -> true
|
||||
!isPermalinkSupported(context, deepLink.toString()) -> false
|
||||
else -> {
|
||||
tryOrNull {
|
||||
withContext(Dispatchers.Default) {
|
||||
val permalinkData = PermalinkParser.parse(deepLink)
|
||||
handlePermalink(permalinkData, deepLink, context, navigationInterceptor, buildTask)
|
||||
}
|
||||
} ?: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun handlePermalink(
|
||||
permalinkData: PermalinkData,
|
||||
|
|
|
|||
Loading…
Reference in New Issue