v2024.8

cioccarellia · Aug 21, 2024 · 33c7e4f · 33c7e4f
1 parent d8d595c
commit 33c7e4f
Show file tree

Hide file tree

Showing 19 changed files with 383 additions and 329 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,10 +19,10 @@ android {
 
     defaultConfig {
         applicationId "com.andreacioccarelli.androoster"
-        minSdkVersion 21
+        minSdkVersion 16
         targetSdkVersion 35
         versionCode 56
-        versionName "1.5.3"
+        versionName "1.5.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt
@@ -149,7 +149,7 @@ class HardwareCore {
                         .forName(POWER_PROFILE_CLASS)
                         .getMethod("getAveragePower", java.lang.String::class.java)
                         .invoke(mPowerProfile_, "battery.capacity") as Double
-                batteryCapacity.toString() + " MAh"
+                batteryCapacity.toString() + " MA/h"
             } catch (e: Exception) {
                 e.printStackTrace()
                 "Unknown"

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt
@@ -64,7 +64,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
 
     lateinit var UI: UI
     lateinit var DRAWER_SETTINGS: PrimaryDrawerItem
-    lateinit var DRAWER_BACKUP: PrimaryDrawerItem
     lateinit var drawer: Drawer
     var menu: Menu? = null
 
@@ -483,7 +482,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
 
             if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) {
                 drawer.removeItem(19)
-                drawer.addItemAtPosition(DRAWER_BACKUP, 16)
             } else {
                 drawer.removeItem(19)
             }
@@ -555,11 +553,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             LicenseManager.startProActivity(this@UIBattery, this@UIBattery, drawer)
             false
         }
-        DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ ->
-            startActivity(Intent(this@UIBattery, UIBackup::class.java))
-            false
-        }
-
         DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ ->
             handleIntent(LaunchStruct.SETTINGS_ACTIVITY)
             false
@@ -581,7 +574,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about)
         } else {
             DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard)
@@ -598,7 +590,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about)
         }
 
@@ -627,7 +618,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )
@@ -652,7 +642,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt
@@ -50,7 +50,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
 
     lateinit var UI: UI
     lateinit var DRAWER_SETTINGS: PrimaryDrawerItem
-    lateinit var DRAWER_BACKUP: PrimaryDrawerItem
     lateinit var drawer: Drawer
     var menu: Menu? = null
 
@@ -186,7 +185,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
             }
             if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) {
                 drawer.removeItem(19)
-                drawer.addItemAtPosition(DRAWER_BACKUP, 16)
             } else {
                 drawer.removeItem(19)
             }
@@ -260,12 +258,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
         }
 
 
-        DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ ->
-            startActivity(Intent(this@UICpu, UIBackup::class.java))
-            false
-        }
-
-
         DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ ->
             handleIntent(LaunchStruct.SETTINGS_ACTIVITY)
             false
@@ -288,7 +280,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about)
         } else {
             DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard)
@@ -305,7 +296,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about)
         }
 
@@ -334,7 +324,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )
@@ -359,7 +348,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt
@@ -52,7 +52,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
 
     lateinit var UI: UI
     lateinit var DRAWER_SETTINGS: PrimaryDrawerItem
-    lateinit var DRAWER_BACKUP: PrimaryDrawerItem
     lateinit var drawer: Drawer
     var menu: Menu? = null
 
@@ -234,7 +233,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
             }
             if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) {
                 drawer.removeItem(19)
-                drawer.addItemAtPosition(DRAWER_BACKUP, 16)
             } else {
                 drawer.removeItem(19)
             }
@@ -335,11 +333,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
             }
         }
 
-        DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ ->
-            startActivity(Intent(this@UIDebug, UIBackup::class.java))
-            false
-        }
-
         DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ ->
             handleIntent(LaunchStruct.SETTINGS_ACTIVITY)
             false
@@ -362,7 +355,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about)
         } else {
             DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard)
@@ -379,7 +371,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about)
         }
 
@@ -408,7 +399,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )
@@ -433,7 +423,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt
@@ -45,7 +45,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
 
     lateinit var UI: UI
     lateinit var DRAWER_SETTINGS: PrimaryDrawerItem
-    lateinit var DRAWER_BACKUP: PrimaryDrawerItem
     lateinit var drawer: Drawer
     var menu: Menu? = null
 
@@ -184,7 +183,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
 
             if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) {
                 drawer.removeItem(19)
-                drawer.addItemAtPosition(DRAWER_BACKUP, 16)
             } else {
                 drawer.removeItem(19)
             }
@@ -254,11 +252,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             false
         }
 
-        DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ ->
-            startActivity(Intent(this@UIGeneral, UIBackup::class.java))
-            false
-        }
-
         DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ ->
             handleIntent(LaunchStruct.SETTINGS_ACTIVITY)
             false
@@ -279,7 +272,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about)
         } else {
             DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard)
@@ -296,7 +288,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about)
         }
 
@@ -325,7 +316,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )
@@ -350,7 +340,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )

diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt
@@ -54,7 +54,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
 
     lateinit var UI: UI
     lateinit var DRAWER_SETTINGS: PrimaryDrawerItem
-    lateinit var DRAWER_BACKUP: PrimaryDrawerItem
     lateinit var drawer: Drawer
     var menu: Menu? = null
 
@@ -191,7 +190,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
 
             if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) {
                 drawer.removeItem(19)
-                drawer.addItemAtPosition(DRAWER_BACKUP, 16)
             } else {
                 drawer.removeItem(19)
             }
@@ -262,12 +260,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
         }
 
 
-        DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ ->
-            startActivity(Intent(this@UIGps, UIBackup::class.java))
-            false
-        }
-
-
         DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ ->
             handleIntent(LaunchStruct.SETTINGS_ACTIVITY)
             false
@@ -290,7 +282,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about)
         } else {
             DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard)
@@ -307,7 +298,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
             DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic)
             DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings)
             DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy)
-            DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white)
             DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about)
         }
 
@@ -336,7 +326,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )
@@ -361,7 +350,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G
                             DRAWER_HARDWARE,
                             DRAWER_GRAPHICS,
                             DividerDrawerItem(),
-                            DRAWER_BACKUP,
                             DRAWER_ABOUT,
                             DRAWER_SETTINGS
                     )