From 9d979217fa5bd188a08cf09ae33f8265de831a75 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 23 Jun 2023 12:09:36 -0400 Subject: [PATCH] Include 'dont keep activities' setting in debuglog. --- .../logsubmit/LogSectionSystemInfo.java | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java index edbca7feb9..d410c04eaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java @@ -4,6 +4,7 @@ import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; +import android.provider.Settings; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.WindowManager; @@ -49,43 +50,44 @@ public class LogSectionSystemInfo implements LogSection { final PackageManager pm = context.getPackageManager(); final StringBuilder builder = new StringBuilder(); - builder.append("Time : ").append(System.currentTimeMillis()).append('\n'); - builder.append("Manufacturer : ").append(Build.MANUFACTURER).append("\n"); - builder.append("Model : ").append(Build.MODEL).append("\n"); - builder.append("Product : ").append(Build.PRODUCT).append("\n"); - builder.append("Screen : ").append(getScreenResolution(context)).append(", ") + builder.append("Time : ").append(System.currentTimeMillis()).append('\n'); + builder.append("Manufacturer : ").append(Build.MANUFACTURER).append("\n"); + builder.append("Model : ").append(Build.MODEL).append("\n"); + builder.append("Product : ").append(Build.PRODUCT).append("\n"); + builder.append("Screen : ").append(getScreenResolution(context)).append(", ") .append(ScreenDensity.get(context)).append(", ") .append(getScreenRefreshRate(context)).append("\n"); - builder.append("Font Scale : ").append(context.getResources().getConfiguration().fontScale).append("\n"); - builder.append("Animation Scale: ").append(ContextUtil.getAnimationScale(context)).append("\n"); - builder.append("Android : ").append(Build.VERSION.RELEASE).append(", API ") + builder.append("Font Scale : ").append(context.getResources().getConfiguration().fontScale).append("\n"); + builder.append("Animation Scale : ").append(ContextUtil.getAnimationScale(context)).append("\n"); + builder.append("Android : ").append(Build.VERSION.RELEASE).append(", API ") .append(Build.VERSION.SDK_INT).append(" (") .append(Build.VERSION.INCREMENTAL).append(", ") .append(Build.DISPLAY).append(")\n"); - builder.append("ABIs : ").append(TextUtils.join(", ", getSupportedAbis())).append("\n"); - builder.append("Memory : ").append(getMemoryUsage()).append("\n"); - builder.append("Memclass : ").append(getMemoryClass(context)).append("\n"); - builder.append("MemInfo : ").append(getMemoryInfo(context)).append("\n"); - builder.append("OS Host : ").append(Build.HOST).append("\n"); - builder.append("RecipientId : ").append(SignalStore.registrationValues().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n"); - builder.append("ACI : ").append(getCensoredAci(context)).append("\n"); - builder.append("Device ID : ").append(SignalStore.account().getDeviceId()).append("\n"); - builder.append("Censored : ").append(ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n"); - builder.append("Network Status : ").append(NetworkUtil.getNetworkStatus(context)).append("\n"); - builder.append("Data Saver : ").append(DeviceProperties.getDataSaverState(context)).append("\n"); - builder.append("Play Services : ").append(getPlayServicesString(context)).append("\n"); - builder.append("FCM : ").append(SignalStore.account().isFcmEnabled()).append("\n"); - builder.append("BkgRestricted : ").append(Build.VERSION.SDK_INT >= 28 ? DeviceProperties.isBackgroundRestricted(context) : "N/A").append("\n"); - builder.append("Locale : ").append(Locale.getDefault()).append("\n"); - builder.append("Linked Devices : ").append(TextSecurePreferences.isMultiDevice(context)).append("\n"); - builder.append("First Version : ").append(TextSecurePreferences.getFirstInstallVersion(context)).append("\n"); - builder.append("Days Installed : ").append(VersionTracker.getDaysSinceFirstInstalled(context)).append("\n"); - builder.append("Build Variant : ").append(BuildConfig.BUILD_DISTRIBUTION_TYPE).append(BuildConfig.BUILD_ENVIRONMENT_TYPE).append(BuildConfig.BUILD_VARIANT_TYPE).append("\n"); - builder.append("Emoji Version : ").append(getEmojiVersionString(context)).append("\n"); - builder.append("RenderBigEmoji : ").append(FontUtil.canRenderEmojiAtFontSize(1024)).append("\n"); - builder.append("Telecom : ").append(AndroidTelecomUtil.getTelecomSupported()).append("\n"); - builder.append("User-Agent : ").append(StandardUserAgentInterceptor.USER_AGENT).append("\n"); - builder.append("App : "); + builder.append("ABIs : ").append(TextUtils.join(", ", getSupportedAbis())).append("\n"); + builder.append("Memory : ").append(getMemoryUsage()).append("\n"); + builder.append("Memclass : ").append(getMemoryClass(context)).append("\n"); + builder.append("MemInfo : ").append(getMemoryInfo(context)).append("\n"); + builder.append("OS Host : ").append(Build.HOST).append("\n"); + builder.append("RecipientId : ").append(SignalStore.registrationValues().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n"); + builder.append("ACI : ").append(getCensoredAci(context)).append("\n"); + builder.append("Device ID : ").append(SignalStore.account().getDeviceId()).append("\n"); + builder.append("Censored : ").append(ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n"); + builder.append("Network Status : ").append(NetworkUtil.getNetworkStatus(context)).append("\n"); + builder.append("Data Saver : ").append(DeviceProperties.getDataSaverState(context)).append("\n"); + builder.append("Play Services : ").append(getPlayServicesString(context)).append("\n"); + builder.append("FCM : ").append(SignalStore.account().isFcmEnabled()).append("\n"); + builder.append("BkgRestricted : ").append(Build.VERSION.SDK_INT >= 28 ? DeviceProperties.isBackgroundRestricted(context) : "N/A").append("\n"); + builder.append("Locale : ").append(Locale.getDefault()).append("\n"); + builder.append("Linked Devices : ").append(TextSecurePreferences.isMultiDevice(context)).append("\n"); + builder.append("First Version : ").append(TextSecurePreferences.getFirstInstallVersion(context)).append("\n"); + builder.append("Days Installed : ").append(VersionTracker.getDaysSinceFirstInstalled(context)).append("\n"); + builder.append("Build Variant : ").append(BuildConfig.BUILD_DISTRIBUTION_TYPE).append(BuildConfig.BUILD_ENVIRONMENT_TYPE).append(BuildConfig.BUILD_VARIANT_TYPE).append("\n"); + builder.append("Emoji Version : ").append(getEmojiVersionString(context)).append("\n"); + builder.append("RenderBigEmoji : ").append(FontUtil.canRenderEmojiAtFontSize(1024)).append("\n"); + builder.append("DontKeepActivities: ").append(getDontKeepActivities(context)).append("\n"); + builder.append("Telecom : ").append(AndroidTelecomUtil.getTelecomSupported()).append("\n"); + builder.append("User-Agent : ").append(StandardUserAgentInterceptor.USER_AGENT).append("\n"); + builder.append("App : "); try { builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0))) .append(" ") @@ -99,7 +101,7 @@ public class LogSectionSystemInfo implements LogSection { } catch (PackageManager.NameNotFoundException nnfe) { builder.append("Unknown\n"); } - builder.append("Package : ").append(BuildConfig.APPLICATION_ID).append(" (").append(getSigningString(context)).append(")"); + builder.append("Package : ").append(BuildConfig.APPLICATION_ID).append(" (").append(getSigningString(context)).append(")"); return builder; } @@ -188,4 +190,9 @@ public class LogSectionSystemInfo implements LogSection { return "N/A"; } } + + private static String getDontKeepActivities(@NonNull Context context) { + int setting = Settings.Global.getInt(context.getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0); + return setting == 0 ? "false" : "true"; + } }