Include whether a user has a linked device in the debug log.

Author: greyson-signal

Diff for: app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java

@@ -39,38 +39,41 @@ 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(getScreenDensityClass(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(" (")
+    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("ABIs         : ").append(TextUtils.join(", ", getSupportedAbis())).append("\n");
-    builder.append("Memory       : ").append(getMemoryUsage()).append("\n");
-    builder.append("Memclass     : ").append(getMemoryClass(context)).append("\n");
-    builder.append("OS Host      : ").append(Build.HOST).append("\n");
-    builder.append("Censored     : ").append(CensorshipUtil.isCensored(context)).append("\n");
-    builder.append("Play Services: ").append(getPlayServicesString(context)).append("\n");
-    builder.append("FCM          : ").append(!TextSecurePreferences.isFcmDisabled(context)).append("\n");
-    builder.append("Locale       : ").append(Locale.getDefault().toString()).append("\n");
-    builder.append("First Version: ").append(TextSecurePreferences.getFirstInstallVersion(context)).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("OS Host       : ").append(Build.HOST).append("\n");
+    builder.append("Censored      : ").append(CensorshipUtil.isCensored(context)).append("\n");
+    builder.append("Play Services : ").append(getPlayServicesString(context)).append("\n");
+    builder.append("FCM           : ").append(!TextSecurePreferences.isFcmDisabled(context)).append("\n");
+    builder.append("Locale        : ").append(Locale.getDefault().toString()).append("\n");
+    builder.append("Linked Devices: ").append(TextSecurePreferences.isMultiDevice(context)).append("\n");
+    builder.append("First Version : ").append(TextSecurePreferences.getFirstInstallVersion(context)).append("\n");
+    builder.append("App           : ");
     try {
       builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0)))
              .append(" ")
              .append(pm.getPackageInfo(context.getPackageName(), 0).versionName)
              .append(" (")
+             .append(BuildConfig.CANONICAL_VERSION_CODE)
+             .append(", ")
              .append(Util.getManifestApkVersion(context))
              .append(")\n");
     } 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;
   }