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 8a08fdf96..553504e5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java @@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.emoji.EmojiFiles; import org.thoughtcrime.securesms.keyvalue.SignalStore; +import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.AppSignatureUtil; import org.thoughtcrime.securesms.util.ByteUnit; @@ -52,9 +53,10 @@ public class LogSectionSystemInfo implements LogSection { .append(ScreenDensity.get(context)).append(", ") .append(getScreenRefreshRate(context)).append("\n"); builder.append("Font Scale : ").append(context.getResources().getConfiguration().fontScale).append("\n"); - builder.append("Android : ").append(Build.VERSION.RELEASE).append(" (") - .append(Build.VERSION.INCREMENTAL).append(", ") - .append(Build.DISPLAY).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"); @@ -72,6 +74,7 @@ public class LogSectionSystemInfo implements LogSection { 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("User-Agent : ").append(StandardUserAgentInterceptor.USER_AGENT).append("\n"); builder.append("App : "); try { builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0))) diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/StandardUserAgentInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/StandardUserAgentInterceptor.java index 7b17fa1a8..d4484e2ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/StandardUserAgentInterceptor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/StandardUserAgentInterceptor.java @@ -9,7 +9,9 @@ import org.thoughtcrime.securesms.BuildConfig; */ public class StandardUserAgentInterceptor extends UserAgentInterceptor { + public static final String USER_AGENT = "Signal-Android/" + BuildConfig.VERSION_NAME + " Android/" + Build.VERSION.SDK_INT; + public StandardUserAgentInterceptor() { - super("Signal-Android/" + BuildConfig.VERSION_NAME + " Android/" + Build.VERSION.SDK_INT); + super(USER_AGENT); } }