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

Code review fixes.

Browse Source
This commit is contained in:
Onuray Sahin 2022-09-21 14:16:51 +03:00
parent 45cf7dcd63
commit 4ab798f88d
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
View File

@ -78,19 +78,24 @@ class OtherSessionsController @Inject constructor(
} }
private fun calculateDescription(device: DeviceFullInfo, formattedLastActivityDate: String): String { private fun calculateDescription(device: DeviceFullInfo, formattedLastActivityDate: String): String {
return if (device.isInactive) { return when {
stringProvider.getQuantityString( device.isInactive -> {
R.plurals.device_manager_other_sessions_description_inactive, stringProvider.getQuantityString(
SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS, R.plurals.device_manager_other_sessions_description_inactive,
SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS, SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
formattedLastActivityDate SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
) formattedLastActivityDate
} else if (device.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Trusted) { )
stringProvider.getString(R.string.device_manager_other_sessions_description_verified, formattedLastActivityDate) }
} else if (device.isCurrentDevice) { device.roomEncryptionTrustLevel == RoomEncryptionTrustLevel.Trusted -> {
stringProvider.getString(R.string.device_manager_other_sessions_description_unverified_current_session) stringProvider.getString(R.string.device_manager_other_sessions_description_verified, formattedLastActivityDate)
} else { }
stringProvider.getString(R.string.device_manager_other_sessions_description_unverified, formattedLastActivityDate) device.isCurrentDevice -> {
stringProvider.getString(R.string.device_manager_other_sessions_description_unverified_current_session)
}
else -> {
stringProvider.getString(R.string.device_manager_other_sessions_description_unverified, formattedLastActivityDate)
}
} }
} }
} }

5
vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SecurityRecommendationView.kt
View File

@ -87,4 +87,9 @@ class SecurityRecommendationView @JvmOverloads constructor(
setDescription(viewState.description) setDescription(viewState.description)
setCount(viewState.sessionsCount) setCount(viewState.sessionsCount)
} }
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
callback = null
}
} }

2
vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsActivity.kt
View File

@ -20,6 +20,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.annotation.StringRes
import com.airbnb.mvrx.Mavericks import com.airbnb.mvrx.Mavericks
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.core.extensions.addFragment import im.vector.app.core.extensions.addFragment
@ -46,6 +47,7 @@ class OtherSessionsActivity : SimpleFragmentActivity() {
companion object { companion object {
fun newIntent( fun newIntent(
context: Context, context: Context,
@StringRes
titleResourceId: Int, titleResourceId: Int,
defaultFilter: DeviceManagerFilterType, defaultFilter: DeviceManagerFilterType,
includeCurrentSession: Boolean, includeCurrentSession: Boolean,

3
vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
View File

@ -59,8 +59,7 @@ class OtherSessionsFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
views.otherSessionsToolbar.title = getString(args.titleResourceId) setupToolbar(views.otherSessionsToolbar).setTitle(args.titleResourceId).allowBack()
setupToolbar(views.otherSessionsToolbar).allowBack()
observeViewEvents() observeViewEvents()
initFilterView() initFilterView()
} }