From ce73007157c71e1dbfaf367c6d874392d48cb598 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 6 Jan 2020 00:51:41 +0100 Subject: [PATCH 1/7] call /join/{roomIdOrAlias} instead of /rooms/{roomId}/join The former endpoint doesn't work for joining over federation, the server_name parameter is ignored. Fixes #697 Signed-off-by: Marcus Hoffmann --- CHANGES.md | 1 + .../vector/matrix/android/internal/session/room/RoomAPI.kt | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4e39b72de7..02a05ce905 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ Bugfix 🐛: - Fix crash when opening room creation screen from the room filtering screen - Fix avatar image disappearing (#777) - Fix read marker banner when permalink + - Fix joining upgraded rooms (#697) Translations 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt index c5b3f03d35..6896788de9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt @@ -212,11 +212,12 @@ internal interface RoomAPI { /** * Join the given room. * - * @param roomId the room id + * @param roomIdOrAlias the room id or alias + * @param server_name the servers to attempt to join the room through * @param params the request body */ - @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/join") - fun join(@Path("roomId") roomId: String, + @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}") + fun join(@Path("roomIdOrAlias") roomIdOrAlias: String, @Query("server_name") viaServers: List, @Body params: Map): Call From 9e8217082c445b2a92ffbb60e149dc5263ec4a85 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 6 Jan 2020 03:45:22 +0100 Subject: [PATCH 2/7] set homeserver field when populating room directory list fixes #807 Signed-off-by: Marcus Hoffmann --- CHANGES.md | 1 + .../features/roomdirectory/picker/RoomDirectoryListCreator.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 4e39b72de7..fc916060f1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ Bugfix 🐛: - Fix crash when opening room creation screen from the room filtering screen - Fix avatar image disappearing (#777) - Fix read marker banner when permalink + - Fix matrix.org room directory not being browsable Translations 🗣: - diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt index 17693d9ad6..4073929a4f 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt @@ -48,6 +48,7 @@ class RoomDirectoryListCreator @Inject constructor(private val stringArrayProvid if (it != userHsName) { // Use the server name as a default display name result.add(RoomDirectoryData( + homeServer = it, displayName = it, includeAllNetworks = true )) From 8ef5c60e2e3b490550e141e19946793bcf034d24 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Jan 2020 11:43:21 +0100 Subject: [PATCH 3/7] RageShake is enabled by default --- vector/src/main/res/xml/vector_settings_advanced_settings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml index 93ff104a81..11ca97870d 100644 --- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml +++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml @@ -32,6 +32,7 @@ android:title="@string/settings_rageshake"> From 7575cb286ed9056469a2962e3e80a29e992f0902 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Jan 2020 14:49:26 +0100 Subject: [PATCH 4/7] Show skip to bottom FAB while scrolling down (#752) --- CHANGES.md | 1 + .../im/vector/riotx/core/utils/Debouncer.kt | 16 +++++--- .../home/room/detail/RoomDetailFragment.kt | 38 +++++++++++++------ 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bb132982d8..3087b7405c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Improvements 🙌: - Improve devices list screen - Add settings for rageshake sensibility - Fix autocompletion issues and add support for rooms, groups, and emoji (#780) + - Show skip to bottom FAB while scrolling down (#752) Other changes: - Change the way RiotX identifies a session to allow the SDK to support several sessions with the same user (#800) diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt index b02e3c9366..2f5db57ccb 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt @@ -24,11 +24,9 @@ internal class Debouncer(private val handler: Handler) { private val runnables = HashMap() fun debounce(identifier: String, millis: Long, r: Runnable): Boolean { - if (runnables.containsKey(identifier)) { - // debounce - val old = runnables[identifier] - handler.removeCallbacks(old) - } + // debounce + cancel(identifier) + insertRunnable(identifier, r, millis) return true } @@ -37,6 +35,14 @@ internal class Debouncer(private val handler: Handler) { handler.removeCallbacksAndMessages(null) } + fun cancel(identifier: String) { + if (runnables.containsKey(identifier)) { + val old = runnables[identifier] + handler.removeCallbacks(old) + runnables.remove(identifier) + } + } + private fun insertRunnable(identifier: String, r: Runnable, millis: Long) { val chained = Runnable { handler.post(r) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 4414c48205..4e29aa2f89 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -474,21 +474,31 @@ class RoomDetailFragment @Inject constructor( it.dispatchTo(scrollOnNewMessageCallback) it.dispatchTo(scrollOnHighlightedEventCallback) updateJumpToReadMarkerViewVisibility() - updateJumpToBottomViewVisibility() + maybeShowJumpToBottomViewVisibilityWithDelay() } timelineEventController.addModelBuildListener(modelBuildListener) recyclerView.adapter = timelineEventController.adapter recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + debouncer.cancel("jump_to_bottom_visibility") + + val scrollingToPast = dy < 0 + + if (scrollingToPast) { + jumpToBottomView.hide() + } else { + maybeShowJumpToBottomViewVisibility() + } + } + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { when (newState) { RecyclerView.SCROLL_STATE_IDLE -> { - updateJumpToBottomViewVisibility() + maybeShowJumpToBottomViewVisibilityWithDelay() } RecyclerView.SCROLL_STATE_DRAGGING, - RecyclerView.SCROLL_STATE_SETTLING -> { - jumpToBottomView.hide() - } + RecyclerView.SCROLL_STATE_SETTLING -> Unit } } }) @@ -547,17 +557,21 @@ class RoomDetailFragment @Inject constructor( } } - private fun updateJumpToBottomViewVisibility() { + private fun maybeShowJumpToBottomViewVisibilityWithDelay() { debouncer.debounce("jump_to_bottom_visibility", 250, Runnable { - Timber.v("First visible: ${layoutManager.findFirstCompletelyVisibleItemPosition()}") - if (layoutManager.findFirstVisibleItemPosition() != 0) { - jumpToBottomView.show() - } else { - jumpToBottomView.hide() - } + maybeShowJumpToBottomViewVisibility() }) } + private fun maybeShowJumpToBottomViewVisibility() { + Timber.v("First visible: ${layoutManager.findFirstCompletelyVisibleItemPosition()}") + if (layoutManager.findFirstVisibleItemPosition() != 0) { + jumpToBottomView.show() + } else { + jumpToBottomView.hide() + } + } + private fun setupComposer() { autoCompleter.setup(composerLayout.composerEditText, this) From 501ac36040d5d1ecf960c6b5ad19ed6b8e8afc75 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Jan 2020 15:03:58 +0100 Subject: [PATCH 5/7] Reduce size of RoomDetailFragment --- .../im/vector/riotx/core/utils/Debouncer.kt | 2 +- .../JumpToBottomViewVisibilityManager.kt | 77 +++++++++++++++++++ .../home/room/detail/RoomDetailFragment.kt | 49 +++--------- 3 files changed, 87 insertions(+), 41 deletions(-) create mode 100644 vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt index 2f5db57ccb..627d757574 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt @@ -19,7 +19,7 @@ package im.vector.riotx.core.utils import android.os.Handler -internal class Debouncer(private val handler: Handler) { +class Debouncer(private val handler: Handler) { private val runnables = HashMap() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt new file mode 100644 index 0000000000..4be5502678 --- /dev/null +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt @@ -0,0 +1,77 @@ +/* + * Copyright 2020 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.riotx.features.home.room.detail + +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.floatingactionbutton.FloatingActionButton +import im.vector.riotx.core.utils.Debouncer +import timber.log.Timber + +/** + * Show or hide the jumpToBottomView, depending on the scrolling and if the timeline is displaying the more recent event + * - When user scrolls up (i.e. going to the past): hide + * - When user scrolls down: show if not displaying last event + * - When user stops scrolling: show if not displaying last event + */ +class JumpToBottomViewVisibilityManager( + private val jumpToBottomView: FloatingActionButton, + private val debouncer: Debouncer, + recyclerView: RecyclerView, + private val layoutManager: LinearLayoutManager) { + + init { + recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + debouncer.cancel("jump_to_bottom_visibility") + + val scrollingToPast = dy < 0 + + if (scrollingToPast) { + jumpToBottomView.hide() + } else { + maybeShowJumpToBottomViewVisibility() + } + } + + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { + when (newState) { + RecyclerView.SCROLL_STATE_IDLE -> { + maybeShowJumpToBottomViewVisibilityWithDelay() + } + RecyclerView.SCROLL_STATE_DRAGGING, + RecyclerView.SCROLL_STATE_SETTLING -> Unit + } + } + }) + } + + fun maybeShowJumpToBottomViewVisibilityWithDelay() { + debouncer.debounce("jump_to_bottom_visibility", 250, Runnable { + maybeShowJumpToBottomViewVisibility() + }) + } + + private fun maybeShowJumpToBottomViewVisibility() { + Timber.v("First visible: ${layoutManager.findFirstCompletelyVisibleItemPosition()}") + if (layoutManager.findFirstVisibleItemPosition() != 0) { + jumpToBottomView.show() + } else { + jumpToBottomView.hide() + } + } +} diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 4e29aa2f89..a956d0e2e9 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -181,6 +181,7 @@ class RoomDetailFragment @Inject constructor( private lateinit var sharedActionViewModel: MessageSharedActionViewModel private lateinit var layoutManager: LinearLayoutManager + private lateinit var jumpToBottomViewVisibilityManager: JumpToBottomViewVisibilityManager private var modelBuildListener: OnModelBuildFinishedListener? = null private lateinit var attachmentsHelper: AttachmentsHelper @@ -312,6 +313,13 @@ class RoomDetailFragment @Inject constructor( } } } + + jumpToBottomViewVisibilityManager = JumpToBottomViewVisibilityManager( + jumpToBottomView, + debouncer, + recyclerView, + layoutManager + ) } private fun setupJumpToReadMarkerView() { @@ -474,35 +482,11 @@ class RoomDetailFragment @Inject constructor( it.dispatchTo(scrollOnNewMessageCallback) it.dispatchTo(scrollOnHighlightedEventCallback) updateJumpToReadMarkerViewVisibility() - maybeShowJumpToBottomViewVisibilityWithDelay() + jumpToBottomViewVisibilityManager.maybeShowJumpToBottomViewVisibilityWithDelay() } timelineEventController.addModelBuildListener(modelBuildListener) recyclerView.adapter = timelineEventController.adapter - recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { - debouncer.cancel("jump_to_bottom_visibility") - - val scrollingToPast = dy < 0 - - if (scrollingToPast) { - jumpToBottomView.hide() - } else { - maybeShowJumpToBottomViewVisibility() - } - } - - override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { - when (newState) { - RecyclerView.SCROLL_STATE_IDLE -> { - maybeShowJumpToBottomViewVisibilityWithDelay() - } - RecyclerView.SCROLL_STATE_DRAGGING, - RecyclerView.SCROLL_STATE_SETTLING -> Unit - } - } - }) - timelineEventController.callback = this if (vectorPreferences.swipeToReplyIsEnabled()) { @@ -557,21 +541,6 @@ class RoomDetailFragment @Inject constructor( } } - private fun maybeShowJumpToBottomViewVisibilityWithDelay() { - debouncer.debounce("jump_to_bottom_visibility", 250, Runnable { - maybeShowJumpToBottomViewVisibility() - }) - } - - private fun maybeShowJumpToBottomViewVisibility() { - Timber.v("First visible: ${layoutManager.findFirstCompletelyVisibleItemPosition()}") - if (layoutManager.findFirstVisibleItemPosition() != 0) { - jumpToBottomView.show() - } else { - jumpToBottomView.hide() - } - } - private fun setupComposer() { autoCompleter.setup(composerLayout.composerEditText, this) From d662b4a9b4358b38e0ae97f78bb4492070e4d130 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Jan 2020 15:57:35 +0100 Subject: [PATCH 6/7] Exclude play-services-oss-licenses library from F-Droid build (#814) --- CHANGES.md | 1 + vector/build.gradle | 8 ++++--- .../fdroid/java/im/vector/riotx/FlavorCode.kt | 22 +++++++++++++++++ .../gplay/java/im/vector/riotx/FlavorCode.kt | 24 +++++++++++++++++++ .../VectorSettingsHelpAboutFragment.kt | 5 ++-- .../res/xml/vector_settings_help_about.xml | 4 +++- 6 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt create mode 100644 vector/src/gplay/java/im/vector/riotx/FlavorCode.kt diff --git a/CHANGES.md b/CHANGES.md index bb132982d8..49f2c33fdf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,7 @@ Improvements 🙌: Other changes: - Change the way RiotX identifies a session to allow the SDK to support several sessions with the same user (#800) + - Exclude play-services-oss-licenses library from F-Droid build (#814) Bugfix 🐛: - Fix crash when opening room creation screen from the room filtering screen diff --git a/vector/build.gradle b/vector/build.gradle index c8d474088f..513449db51 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -186,6 +186,7 @@ android { gplay { dimension "store" + resValue "bool", "isGplay", "true" buildConfigField "boolean", "ALLOW_FCM_USE", "true" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"" @@ -194,6 +195,7 @@ android { fdroid { dimension "store" + resValue "bool", "isGplay", "false" buildConfigField "boolean", "ALLOW_FCM_USE", "false" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" @@ -249,9 +251,6 @@ dependencies { implementation "com.squareup.moshi:moshi-adapters:$moshi_version" kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" - // OSS License - implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' - // Log implementation 'com.jakewharton.timber:timber:4.7.1' @@ -343,6 +342,9 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' } + // OSS License, gplay flavor only + gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' + implementation "androidx.emoji:emoji-appcompat:1.0.0" // TESTS diff --git a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt b/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt new file mode 100644 index 0000000000..d6c9b9fd1d --- /dev/null +++ b/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2020 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.riotx + +import android.content.Context + +// No op +fun openOssLicensesMenuActivity(context: Context) = Unit diff --git a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt b/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt new file mode 100644 index 0000000000..7166cd5ed3 --- /dev/null +++ b/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt @@ -0,0 +1,24 @@ +/* + * Copyright 2020 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.riotx + +import android.content.Context +import android.content.Intent +import com.google.android.gms.oss.licenses.OssLicensesMenuActivity + +fun openOssLicensesMenuActivity(context: Context) = context.startActivity(Intent(context, OssLicensesMenuActivity::class.java)) + diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt index 6ce928c05d..6c10b8695d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt @@ -20,13 +20,13 @@ import android.content.Intent import android.net.Uri import android.provider.Settings import androidx.preference.Preference -import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import im.vector.matrix.android.api.Matrix import im.vector.riotx.R import im.vector.riotx.core.preference.VectorPreference import im.vector.riotx.core.utils.copyToClipboard import im.vector.riotx.core.utils.displayInWebView import im.vector.riotx.features.version.VersionProvider +import im.vector.riotx.openOssLicensesMenuActivity import javax.inject.Inject class VectorSettingsHelpAboutFragment @Inject constructor( @@ -107,10 +107,11 @@ class VectorSettingsHelpAboutFragment @Inject constructor( false } + // Note: preference is not visible on F-Droid build findPreference(VectorPreferences.SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!! .onPreferenceClickListener = Preference.OnPreferenceClickListener { // See https://developers.google.com/android/guides/opensource - startActivity(Intent(requireActivity(), OssLicensesMenuActivity::class.java)) + openOssLicensesMenuActivity(requireActivity()) false } } diff --git a/vector/src/main/res/xml/vector_settings_help_about.xml b/vector/src/main/res/xml/vector_settings_help_about.xml index 4aec87c123..2720a19533 100644 --- a/vector/src/main/res/xml/vector_settings_help_about.xml +++ b/vector/src/main/res/xml/vector_settings_help_about.xml @@ -1,5 +1,6 @@ + android:title="@string/settings_other_third_party_notices" + app:isPreferenceVisible="@bool/isGplay" /> \ No newline at end of file From 2b8ecae8e344e2a7753f30f0318d40a3f59daf96 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 8 Jan 2020 18:05:26 +0100 Subject: [PATCH 7/7] Fix CI --- vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt | 2 +- vector/src/gplay/java/im/vector/riotx/FlavorCode.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt b/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt index d6c9b9fd1d..de1ee2290b 100644 --- a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt +++ b/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt @@ -19,4 +19,4 @@ package im.vector.riotx import android.content.Context // No op -fun openOssLicensesMenuActivity(context: Context) = Unit +fun openOssLicensesMenuActivity(@Suppress("UNUSED_PARAMETER") context: Context) = Unit diff --git a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt b/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt index 7166cd5ed3..109e9bc978 100644 --- a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt +++ b/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt @@ -21,4 +21,3 @@ import android.content.Intent import com.google.android.gms.oss.licenses.OssLicensesMenuActivity fun openOssLicensesMenuActivity(context: Context) = context.startActivity(Intent(context, OssLicensesMenuActivity::class.java)) -