Add options to clear the cache and recent emojis

DerTyp7214 · Mar 20, 2022 · 579bcad · 579bcad
1 parent 0856b2e
commit 579bcad
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 11 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,20 +11,20 @@ plugins {
     kotlin("kapt")
 }
 
-val libsuVersion = "4.0.0"
+val libsuVersion = "4.0.2"
 val kotlinVersion: String = project.getKotlinPluginVersion()
 
 android {
     compileSdkPreview = "Tiramisu"
-    buildToolsVersion = "33.0.0-rc1"
+    buildToolsVersion = "33.0.0-rc2"
     buildFeatures.dataBinding = true
     buildFeatures.viewBinding = true
 
     defaultConfig {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 23
         targetSdk = 32
-        versionCode = 346000
+        versionCode = 346001
         versionName = "3.4.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -90,8 +90,8 @@ android {
 
 dependencies {
     implementation(platform("com.google.firebase:firebase-bom:29.2.0"))
-    implementation("com.google.firebase:firebase-messaging-ktx:23.0.1")
-    implementation("com.google.firebase:firebase-analytics-ktx:20.1.0")
+    implementation("com.google.firebase:firebase-messaging-ktx:23.0.2")
+    implementation("com.google.firebase:firebase-analytics-ktx:20.1.1")
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.5.0-alpha03")
@@ -112,8 +112,8 @@ dependencies {
     implementation("androidx.activity:activity-ktx:1.5.0-alpha03")
     implementation("androidx.fragment:fragment-ktx:1.5.0-alpha03")
     implementation("com.jaredrummler:android-shell:1.0.0")
-    implementation("com.google.firebase:firebase-analytics:20.1.0")
-    implementation("com.google.firebase:firebase-messaging:23.0.1")
+    implementation("com.google.firebase:firebase-analytics:20.1.1")
+    implementation("com.google.firebase:firebase-messaging:23.0.2")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation("com.bignerdranch.android:simple-item-decoration:1.0.0")
     implementation("de.dertyp7214:PRDownloader:v0.6.0")
@@ -128,7 +128,7 @@ dependencies {
     implementation("com.github.murgupluoglu:flagkit-android:1.0.2")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-alpha04")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-alpha05")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.20-RC")
 
     /*var grpc_version = "1.44.1"

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
@@ -1,6 +1,7 @@
 package de.dertyp7214.rboardthememanager.preferences
 
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -30,6 +31,14 @@ import de.dertyp7214.rboardthememanager.utils.GboardUtils
 import de.dertyp7214.rboardthememanager.utils.MagiskUtils
 
 class Settings(private val activity: Activity, private val args: SafeJSON) : AbstractPreference() {
+    enum class FILES(val Path: String) {
+        @SuppressLint("SdCardPath")
+        CACHE("/data/${if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) "user_de" else "data"}/0/${Config.GBOARD_PACKAGE_NAME}/cache/auto_clean/"),
+        @SuppressLint("SdCardPath")
+        EMOJIS("/data/data/${Config.GBOARD_PACKAGE_NAME}/databases/expression-history.db")
+
+    }
+
     enum class TYPE {
         BOOLEAN,
         STRING,
@@ -186,6 +195,38 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
                 Toast.makeText(this, R.string.flags_fixed, Toast.LENGTH_LONG).show()
             }
         ),
+        GBOARD_CACHE_CLEAR(
+            "gboard_cache_clear",
+            R.string.gboard_cache_clear,
+            R.string.gboard_cache_clear_long,
+            R.drawable.ic_keyboard_theme,
+            "",
+            TYPE.STRING,
+            listOf(),
+            {
+                listOf(
+                    "rm -r \"${FILES.CACHE.Path}\"",
+                    "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
+                ).runAsCommand()
+                Toast.makeText(this, R.string.gboard_cache_cleared, Toast.LENGTH_LONG).show()
+            }
+        ),
+        CLEAR_RECENT_EMOJIS(
+            "clear_recent_emojis",
+            R.string.clear_recent_emojis,
+            R.string.clear_recent_emojis_long,
+            R.drawable.ic_emoji_compat,
+            "",
+            TYPE.STRING,
+            listOf(),
+            {
+                listOf(
+                    "rm \"${FILES.EMOJIS.Path}\"",
+                    "am force-stop ${Config.GBOARD_PACKAGE_NAME}"
+                ).runAsCommand()
+                Toast.makeText(this, R.string.recent_emojis_cleared, Toast.LENGTH_LONG).show()
+            }
+        ),
         DEEP_LINK(
             "deep_link",
             R.string.deep_link,

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -231,4 +231,10 @@
     <string name="silk">Silk Popup</string>
     <string name="silk_details">Silk Popup</string>
     <string name="keyboard_redesign_google_sans">Keyboard Redesign Google Sans</string>
+    <string name="gboard_cache_cleared">Gboard cache cleared</string>
+    <string name="gboard_cache_clear">Gboard cache clear</string>
+    <string name="gboard_cache_clear_long">Deletes cache and force closed gboard.</string>
+    <string name="clear_recent_emojis">Clear recent used emojis</string>
+    <string name="clear_recent_emojis_long">Deletes recent used emojis and force closed gboard.</string>
+    <string name="recent_emojis_cleared">Recent used emojis cleared</string>
 </resources>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.0-alpha06")
+        classpath("com.android.tools.build:gradle:7.3.0-alpha07")
         //noinspection DifferentKotlinGradleVersion
         classpath(kotlin("gradle-plugin", version = "1.6.20-RC"))
         classpath("com.google.gms:google-services:4.3.10")

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx8192m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Dec 07 07:49:33 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.5-20220312232108+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.5-20220318231621+0000-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME