Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be99cb0a authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Debug info: show app standby bucket; update AndroidX dependencies

parent 3545cf30

app/build.gradle

+4 −4
Original line number Original line Diff line number Diff line
@@ -122,15 +122,15 @@ dependencies { 
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'





    implementation 'androidx.appcompat:appcompat:1.2.0'

    implementation 'androidx.appcompat:appcompat:1.3.0'

    implementation 'androidx.browser:browser:1.3.0'

    implementation 'androidx.browser:browser:1.3.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

    implementation 'androidx.core:core-ktx:1.3.2'

    implementation 'androidx.core:core-ktx:1.5.0'

    implementation 'androidx.fragment:fragment-ktx:1.3.3'

    implementation 'androidx.fragment:fragment-ktx:1.3.4'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'

    implementation 'androidx.paging:paging-runtime-ktx:2.1.2'

    implementation 'androidx.paging:paging-runtime-ktx:3.0.0'

    implementation 'androidx.preference:preference-ktx:1.1.1'

    implementation 'androidx.preference:preference-ktx:1.1.1'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'com.google.android:flexbox:2.0.1'

    implementation 'com.google.android:flexbox:2.0.1'

app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt

+9 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ package at.bitfire.davdroid.ui 
import android.accounts.Account

import android.accounts.Account

import android.accounts.AccountManager

import android.accounts.AccountManager

import android.app.Application

import android.app.Application

import android.app.usage.UsageStatsManager

import android.content.*

import android.content.*

import android.content.pm.ApplicationInfo

import android.content.pm.ApplicationInfo

import android.content.pm.PackageManager

import android.content.pm.PackageManager
@@ -377,6 +378,14 @@ class DebugInfoActivity: AppCompatActivity() { 




                writer.append("\nCONFIGURATION\n\n")

                writer.append("\nCONFIGURATION\n\n")

                // power saving

                // power saving

                if (Build.VERSION.SDK_INT >= 28)

                    context.getSystemService<UsageStatsManager>()?.let { statsManager ->

                        val bucket = statsManager.appStandbyBucket

                        writer.append("App standby bucket: $bucket")

                            if (bucket > UsageStatsManager.STANDBY_BUCKET_ACTIVE)

                                writer.append(" (RESTRICTED!)")

                        writer.append('\n')

                    }

                if (Build.VERSION.SDK_INT >= 23)

                if (Build.VERSION.SDK_INT >= 23)

                    context.getSystemService<PowerManager>()?.let { powerManager ->

                    context.getSystemService<PowerManager>()?.let { powerManager ->

                        writer.append("Power saving disabled: ")

                        writer.append("Power saving disabled: ")

app/src/main/res/layout/activity_debug_info.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ 
                    android:visibility="@{model.debugInfo == null ? View.VISIBLE : View.GONE}"

                    android:visibility="@{model.debugInfo == null ? View.VISIBLE : View.GONE}"

                    tools:visibility="visible" />

                    tools:visibility="visible" />







                    <TextView

                    <TextView

                        android:layout_width="match_parent"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_height="wrap_content"
@@ -51,7 +50,7 @@ 
                        app:drawableLeftCompat="@drawable/ic_share"

                        app:drawableLeftCompat="@drawable/ic_share"

                        android:drawablePadding="8dp"

                        android:drawablePadding="8dp"

                        android:layout_marginBottom="8dp"

                        android:layout_marginBottom="8dp"

                        app:drawableTint="@color/primaryTextColor"

                        app:drawableTint="?attr/colorControlNormal"

                        android:text="@string/debug_info_use_share1"/>

                        android:text="@string/debug_info_use_share1"/>





                    <com.google.android.material.card.MaterialCardView

                    <com.google.android.material.card.MaterialCardView

build.gradle

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ buildscript { 
    }

    }





    dependencies {

    dependencies {

        classpath 'com.android.tools.build:gradle:4.2.0'

        classpath 'com.android.tools.build:gradle:4.2.1'

        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"

        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"

        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"