From 9d3a8e7c40535765c89c022ae270bc13ca77d833 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Jun 2019 17:42:07 +0200 Subject: [PATCH] Add usage of com.google.android.gms:oss-licenses-plugin to list open source licenses --- build.gradle | 1 + vector/build.gradle | 4 ++++ .../riotredesign/features/settings/PreferencesManager.java | 1 + .../features/settings/VectorSettingsPreferencesFragment.kt | 7 +++++++ vector/src/main/res/values/strings_riotX.xml | 1 + vector/src/main/res/xml/vector_settings_preferences.xml | 4 ++++ 6 files changed, 18 insertions(+) diff --git a/build.gradle b/build.gradle index 14d07f07..605bccbb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { classpath "com.airbnb.okreplay:gradle-plugin:1.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2' + classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/vector/build.gradle b/vector/build.gradle index 2f49297b..e2b4f5ac 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'com.google.android.gms.oss-licenses-plugin' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' @@ -162,6 +163,9 @@ 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' diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java b/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java index c695d4cd..4a917592 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java @@ -54,6 +54,7 @@ public class PreferencesManager { public static final String SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"; public static final String SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"; public static final String SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY = "SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"; + public static final String SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY = "SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"; public static final String SETTINGS_COPYRIGHT_PREFERENCE_KEY = "SETTINGS_COPYRIGHT_PREFERENCE_KEY"; public static final String SETTINGS_CLEAR_CACHE_PREFERENCE_KEY = "SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"; public static final String SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY = "SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"; diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt index e386eaa9..10c06bc7 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt @@ -41,6 +41,7 @@ import androidx.core.content.ContextCompat import androidx.core.content.edit import androidx.core.view.isVisible import androidx.preference.* +import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import im.vector.matrix.android.api.Matrix @@ -693,6 +694,12 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref false } + findPreference(PreferencesManager.SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY) + .onPreferenceClickListener = Preference.OnPreferenceClickListener { + startActivity(Intent(requireActivity(), OssLicensesMenuActivity::class.java)) + false + } + // update keep medias period findPreference(PreferencesManager.SETTINGS_MEDIA_SAVING_PERIOD_KEY).let { it.summary = PreferencesManager.getSelectedMediasSavingPeriodString(activity) diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml index 3293c4cf..30a2c7ec 100644 --- a/vector/src/main/res/values/strings_riotX.xml +++ b/vector/src/main/res/values/strings_riotX.xml @@ -7,5 +7,6 @@ "Import e2e keys from file \"%1$s\"." Matrix SDK Version + Other third party notices \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml index e891b121..70489cff 100755 --- a/vector/src/main/res/xml/vector_settings_preferences.xml +++ b/vector/src/main/res/xml/vector_settings_preferences.xml @@ -480,6 +480,10 @@ android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY" android:title="@string/settings_third_party_notices" /> + +