Shortcut fixes #4354
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Do not show shortcuts if a PIN code is set |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,51 +22,87 @@ import android.os.Build | |
| import androidx.core.content.getSystemService | ||
| import androidx.core.content.pm.ShortcutManagerCompat | ||
| import im.vector.app.core.di.ActiveSessionHolder | ||
| import im.vector.app.features.pin.PinCodeStore | ||
| import im.vector.app.features.pin.PinCodeStoreListener | ||
| import io.reactivex.disposables.Disposable | ||
| import io.reactivex.disposables.Disposables | ||
| import org.matrix.android.sdk.api.session.room.RoomSortOrder | ||
| import org.matrix.android.sdk.api.session.room.model.Membership | ||
| import org.matrix.android.sdk.api.session.room.model.RoomSummary | ||
| import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams | ||
| import org.matrix.android.sdk.rx.asObservable | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| class ShortcutsHandler @Inject constructor( | ||
| private val context: Context, | ||
| private val shortcutCreator: ShortcutCreator, | ||
| private val activeSessionHolder: ActiveSessionHolder, | ||
| private val pinCodeStore: PinCodeStore | ||
| ) : PinCodeStoreListener { | ||
| private val isRequestPinShortcutSupported = ShortcutManagerCompat.isRequestPinShortcutSupported(context) | ||
|
|
||
| // Value will be set correctly if necessary | ||
| private var hasPinCode = true | ||
|
|
||
| fun observeRoomsAndBuildShortcuts(): Disposable { | ||
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) { | ||
| // No op | ||
| return Disposables.empty() | ||
| } | ||
|
|
||
| hasPinCode = pinCodeStore.getEncodedPin() != null | ||
|
|
||
| val session = activeSessionHolder.getSafeActiveSession() ?: return Disposables.empty() | ||
| pinCodeStore.addListener(this) | ||
| return session.getRoomSummariesLive( | ||
| roomSummaryQueryParams { | ||
| memberships = listOf(Membership.JOIN) | ||
| }, | ||
| sortOrder = RoomSortOrder.PRIORITY_AND_ACTIVITY | ||
| ) | ||
| .asObservable() | ||
| .doOnDispose { | ||
|
Contributor
There was a problem hiding this comment. NIT: it could be easier to follow the listeners flow if they're added and removed within the pipeline .doOnSubscribe { pinCodeStore.addListener(this) }
.doFinally { pinCodeStore.removeListener(this) } // finally catches error, completes and disposed
Member
There was a problem hiding this comment. Please be aware the code will change with the Rx-Flow migration
Member
Author
There was a problem hiding this comment. OK, I can do this small change.
Member
Author
There was a problem hiding this comment. (Not so small since doOnDispose -> doFinally) 34e8cf8 |
||
| pinCodeStore.removeListener(this) | ||
| } | ||
| .subscribe { rooms -> | ||
| // Remove dead shortcuts (i.e. deleted rooms) | ||
|
Member
Author
There was a problem hiding this comment.
|
||
| removeDeadShortcut(rooms.map { it.roomId }) | ||
|
|
||
| // Create shortcuts | ||
| createShortcuts(rooms) | ||
| } | ||
| } | ||
|
|
||
| private fun removeDeadShortcut(roomIds: List<String>) { | ||
| val deadShortcutIds = ShortcutManagerCompat.getShortcuts(context, ShortcutManagerCompat.FLAG_MATCH_DYNAMIC) | ||
| .map { it.id } | ||
| .filter { !roomIds.contains(it) } | ||
|
|
||
| if (deadShortcutIds.isNotEmpty()) { | ||
| Timber.d("Removing shortcut(s) $deadShortcutIds") | ||
| ShortcutManagerCompat.removeLongLivedShortcuts(context, deadShortcutIds) | ||
| if (isRequestPinShortcutSupported) { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { | ||
| context.getSystemService<ShortcutManager>()?.disableShortcuts(deadShortcutIds) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun createShortcuts(rooms: List<RoomSummary>) { | ||
| if (hasPinCode) { | ||
| // No shortcut in this case (privacy) | ||
| ShortcutManagerCompat.removeAllDynamicShortcuts(context) | ||
|
Contributor
There was a problem hiding this comment. to double check my understanding, if there's a pin code set we don't allow shortcuts?
Member
Author
There was a problem hiding this comment. That's not exactly true. So a PIN code prevent a few rooms (5 on my phone) to be disclosed without having to enter the PIN code.
Contributor
There was a problem hiding this comment. ah thanks for explaining! |
||
| } else { | ||
| val shortcuts = rooms.mapIndexed { index, room -> | ||
| shortcutCreator.create(room, index) | ||
| } | ||
|
|
||
| shortcuts.forEach { shortcut -> | ||
| ShortcutManagerCompat.pushDynamicShortcut(context, shortcut) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun clearShortcuts() { | ||
|
|
@@ -82,7 +118,7 @@ class ShortcutsHandler @Inject constructor( | |
| ShortcutManagerCompat.removeLongLivedShortcuts(context, shortcuts) | ||
|
|
||
| // We can only disabled pinned shortcuts with the API, but at least it will prevent the crash | ||
| if (isRequestPinShortcutSupported) { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { | ||
| context.getSystemService<ShortcutManager>() | ||
| ?.let { | ||
|
|
@@ -91,4 +127,14 @@ class ShortcutsHandler @Inject constructor( | |
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onPinSetUpChange(isConfigured: Boolean) { | ||
| hasPinCode = isConfigured | ||
| if (isConfigured) { | ||
| // Remove shortcuts immediately | ||
| ShortcutManagerCompat.removeAllDynamicShortcuts(context) | ||
| } | ||
| // Else shortcut will be created next time any room summary is updated, or | ||
| // next time the app is started which is acceptable | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getPagedRoomSummariesLivewas used before, which was not correct, only the first 20 rooms was returnedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need to know about all the rooms? the shortcut menu only holds a few entries~
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, because we have to check if a room has been left (so not in the list anymore) to disable any related shortcuts pinned to the home