jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-review

This commit is contained in:
Benoit Marty 2020-01-02 18:45:44 +01:00
parent de1d79b637
commit 1bd85082c3
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
View File

@ -227,7 +227,7 @@ interface FragmentModule {
@Binds
@IntoMap
@FragmentKey(VectorSettingsIgnoredUsersFragment::class)
fun bindVectorSettingsIgnoredUsersFragment(fragment: VectorSettingsIgnoredUsersFragment): Fragment
fun bindVectorSettingsIgnoredUsersFragment(fragment: VectorSettingsIgnoredUsersFragment): Fragment
@Binds
@IntoMap

3
vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt
View File

@ -61,9 +61,6 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
listener { callback?.retry() }
}
is Success ->
// Build the devices portion of the settings.
// Each row correspond to a device ID and its corresponding device name. Clicking on the row
// display a dialog containing: the device ID, the device name and the "last seen" information.
devices()
// sort before display: most recent first
.sortByLastSeen()

4
vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
View File

@ -80,8 +80,8 @@ class DevicesViewModel @AssistedInject constructor(@Assisted initialState: Devic
/**
* Force the refresh of the devices list.
* The devices list is the list of the devices where the user as logged in.
* It can be any mobile device, as any browser.
* The devices list is the list of the devices where the user is logged in.
* It can be any mobile devices, and any browsers.
*/
private fun refreshDevicesList() {
if (session.isCryptoEnabled() && !session.sessionParams.credentials.deviceId.isNullOrEmpty()) {

15
vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt
View File

@ -91,13 +91,6 @@ class VectorSettingsDevicesFragment @Inject constructor(
.show()
}
/**
* Display a dialog containing the device ID, the device name and the "last seen" information.
* This dialog allow to delete the corresponding device (see [.displayDeviceDeletionDialog])
*
* @param deviceInfo the device information
* @param isCurrentDevice true if this is the current device
*/
override fun onDeviceClicked(deviceInfo: DeviceInfo) {
devicesViewModel.handle(DevicesAction.ToggleDevice(deviceInfo))
}
@ -117,14 +110,14 @@ class VectorSettingsDevicesFragment @Inject constructor(
/**
* Display an alert dialog to rename a device
*
* @param aDeviceInfoToRename device info
* @param deviceInfo device info
*/
private fun displayDeviceRenameDialog(aDeviceInfoToRename: DeviceInfo) {
private fun displayDeviceRenameDialog(deviceInfo: DeviceInfo) {
val inflater = requireActivity().layoutInflater
val layout = inflater.inflate(R.layout.dialog_base_edit_text, null)
val input = layout.findViewById<EditText>(R.id.edit_text)
input.setText(aDeviceInfoToRename.displayName)
input.setText(deviceInfo.displayName)
AlertDialog.Builder(requireActivity())
.setTitle(R.string.devices_details_device_name)
@ -132,7 +125,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
.setPositiveButton(R.string.ok) { _, _ ->
val newName = input.text.toString()
devicesViewModel.handle(DevicesAction.Rename(aDeviceInfoToRename, newName))
devicesViewModel.handle(DevicesAction.Rename(deviceInfo, newName))
}
.setNegativeButton(R.string.cancel, null)
.show()

2
vector/src/main/res/xml/vector_settings_developer_mode.xml
View File

@ -10,7 +10,7 @@
android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
android:title="@string/send_bug_report_rage_shake" />
<SeekBarPreference
<androidx.preference.SeekBarPreference
android:defaultValue="13"
android:dependency="SETTINGS_USE_RAGE_SHAKE_KEY"
android:key="SETTINGS_RAGE_SHAKE_DETECTION_THRESHOLD_KEY"