Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

klint

Browse Source
This commit is contained in:
Valere 2020-08-13 17:49:06 +02:00
parent c911d9c7ff
commit 8c150aa3e8
6 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
View File

@ -54,7 +54,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
} }
} }
private fun migrateTo3(realm: DynamicRealm) { private fun migrateTo3(realm: DynamicRealm) {
Timber.d("Step 1 -> 2") Timber.d("Step 1 -> 2")
realm.schema.get("HomeServerCapabilitiesEntity") realm.schema.get("HomeServerCapabilitiesEntity")

1
vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
View File

@ -86,7 +86,6 @@ class ActiveConferenceView @JvmOverloads constructor(
findViewById<TextView>(R.id.deleteWidgetButton).setOnClickListener { findViewById<TextView>(R.id.deleteWidgetButton).setOnClickListener {
jitsiWidget?.let { callback?.onDelete(it) } jitsiWidget?.let { callback?.onDelete(it) }
} }
} }
fun render(state: RoomDetailViewState) { fun render(state: RoomDetailViewState) {

1
vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
View File

@ -35,4 +35,3 @@ class JitsiWidgetProperties(private val uriString: String, val stringProvider: S
?: mapOf() ?: mapOf()
} }
} }

3
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -226,7 +226,7 @@ class RoomDetailFragment @Inject constructor(
AttachmentTypeSelectorView.Callback, AttachmentTypeSelectorView.Callback,
AttachmentsHelper.Callback, AttachmentsHelper.Callback,
// RoomWidgetsBannerView.Callback, // RoomWidgetsBannerView.Callback,
ActiveCallView.Callback{ ActiveCallView.Callback {
companion object { companion object {
@ -698,7 +698,6 @@ class RoomDetailFragment @Inject constructor(
// A conference is already in progress! // A conference is already in progress!
showDialogWithMessage(getString(R.string.conference_call_in_progress)) showDialogWithMessage(getString(R.string.conference_call_in_progress))
} else { } else {
AlertDialog.Builder(requireContext()) AlertDialog.Builder(requireContext())
.setTitle(if (isVideoCall) R.string.video_meeting else R.string.audio_meeting) .setTitle(if (isVideoCall) R.string.video_meeting else R.string.audio_meeting)
.setMessage(R.string.audio_video_meeting_description) .setMessage(R.string.audio_video_meeting_description)

1
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
View File

@ -44,7 +44,6 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
object ShowWaitingView: RoomDetailViewEvents() object ShowWaitingView: RoomDetailViewEvents()
object HideWaitingView: RoomDetailViewEvents() object HideWaitingView: RoomDetailViewEvents()
data class FileTooBigError( data class FileTooBigError(
val filename: String, val filename: String,
val fileSizeInBytes: Long, val fileSizeInBytes: Long,

3
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -352,7 +352,7 @@ class RoomDetailViewModel @AssistedInject constructor(
val roomId: String = room.roomId val roomId: String = room.roomId
val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale) val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale)
//DO NOT COMMIT // DO NOT COMMIT
val jitsiDomain = session.getHomeServerCapabilities().preferredJitsiDomain ?: stringProvider.getString(R.string.preferred_jitsi_domain) val jitsiDomain = session.getHomeServerCapabilities().preferredJitsiDomain ?: stringProvider.getString(R.string.preferred_jitsi_domain)
// We use the default element wrapper for this widget // We use the default element wrapper for this widget
@ -384,7 +384,6 @@ class RoomDetailViewModel @AssistedInject constructor(
} finally { } finally {
_viewEvents.post(RoomDetailViewEvents.HideWaitingView) _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
} }
} }
} }