From caf9b05ba789b1d76ff4a269cb837c423cbcc6c9 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Tue, 1 Aug 2023 12:44:07 +0600 Subject: [PATCH] 1429-Remove_about_page issue: https://gitlab.e.foundation/e/os/backlog/-/issues/1429 It is reported that this app contains google trackers. But we found no tracker here. One possible cause is `aboutlibraries` library may redirect to library page, which contains tracker. So we have decided to remove the library dependency all-together. --- app/build.gradle | 2 - app/src/main/AndroidManifest.xml | 4 -- .../icsdroid/ui/CalendarListActivity.kt | 4 -- .../at/bitfire/icsdroid/ui/InfoActivity.kt | 64 ------------------- .../main/res/menu/activity_calendar_list.xml | 4 -- build.gradle | 2 - 6 files changed, 80 deletions(-) delete mode 100644 app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt diff --git a/app/build.gradle b/app/build.gradle index 5caefd9..6dcd82a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 32 @@ -88,7 +87,6 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'com.jaredrummler:colorpicker:1.1.0' - implementation "com.mikepenz:aboutlibraries:${versions.aboutLibs}" implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}" implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}" implementation "com.squareup.okhttp3:okhttp-coroutines:${versions.okhttp}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a62320..206c460 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -115,10 +115,6 @@ android:parentActivityName=".ui.CalendarListActivity" android:windowSoftInputMode="stateHidden" /> - \ No newline at end of file diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt index c36b64d..36d2f7c 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt @@ -166,10 +166,6 @@ class CalendarListActivity: AppCompatActivity(), SwipeRefreshLayout.OnRefreshLis SyncWorker.run(this, true) } - fun onShowInfo(item: MenuItem) { - startActivity(Intent(this, InfoActivity::class.java)) - } - fun onSetSyncInterval(item: MenuItem) { SyncIntervalDialogFragment().show(supportFragmentManager, "sync_interval") } diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt deleted file mode 100644 index 43c4cf2..0000000 --- a/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt +++ /dev/null @@ -1,64 +0,0 @@ -/*************************************************************************************************** - * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details. - **************************************************************************************************/ - -package at.bitfire.icsdroid.ui - -import android.content.ActivityNotFoundException -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.util.Log -import android.view.Menu -import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity -import at.bitfire.icsdroid.BuildConfig -import at.bitfire.icsdroid.Constants -import at.bitfire.icsdroid.R -import com.mikepenz.aboutlibraries.Libs -import com.mikepenz.aboutlibraries.LibsBuilder - -class InfoActivity: AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - if (savedInstanceState == null) { - val builder = LibsBuilder() - .withAboutIconShown(true) - .withAboutAppName(getString(R.string.app_name)) - .withAboutDescription(getString(R.string.app_info_description)) - .withAboutVersionShownName(true) - .withAboutVersionString(getString(R.string.app_info_version, BuildConfig.VERSION_NAME, BuildConfig.FLAVOR)) - .withAboutSpecial1(getString(R.string.app_info_gplv3)) - .withAboutSpecial1Description(getString(R.string.app_info_gplv3_note)) - .withLicenseShown(true) - - .withFields(R.string::class.java.fields) - .withLibraryModification("org_brotli__dec", Libs.LibraryFields.LIBRARY_NAME, "Brotli") - .withLibraryModification("org_brotli__dec", Libs.LibraryFields.AUTHOR_NAME, "Google") - - supportFragmentManager.beginTransaction() - .replace(android.R.id.content, builder.supportFragment()) - .commit() - } - } - - fun showWebSite(item: MenuItem) { - launchUri(Uri.parse("https://icsx5.bitfire.at/?pk_campaign=icsx5-app&pk_kwd=info-activity")) - } - - fun showTwitter(item: MenuItem) { - launchUri(Uri.parse("https://twitter.com/icsx5app")) - } - - private fun launchUri(uri: Uri) { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/icsx5app")) - try { - startActivity(intent) - } catch (e: ActivityNotFoundException) { - Log.w(Constants.TAG, "No browser installed") - } - } - -} diff --git a/app/src/main/res/menu/activity_calendar_list.xml b/app/src/main/res/menu/activity_calendar_list.xml index 38d67d5..c389a73 100644 --- a/app/src/main/res/menu/activity_calendar_list.xml +++ b/app/src/main/res/menu/activity_calendar_list.xml @@ -13,8 +13,4 @@ android:onClick="onToggleDarkMode" app:showAsAction="never" /> - - diff --git a/build.gradle b/build.gradle index 2dac876..c427724 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { ext.versions = [ - aboutLibs: '8.9.4', kotlin: '1.7.10', okhttp: '5.0.0-alpha.10' ] @@ -15,7 +14,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" - classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibs}" } } -- GitLab