From aae206befa986e11f29b61d8761b1cf7b6599fa3 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Wed, 8 Apr 2020 09:58:58 +0200
Subject: Improve ExceptionUtil

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 .../nextcloud/deck/util/ExceptionUtil.java         | 26 +++++++++-------------
 .../metadata/android/en-US/changelogs/6000.txt     | 13 +++++++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExceptionUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExceptionUtil.java
index c8774eac1..c84cf1221 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExceptionUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExceptionUtil.java
@@ -2,9 +2,9 @@ package it.niedermann.nextcloud.deck.util;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.view.View;
 import android.widget.TextView;
 
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import it.niedermann.nextcloud.deck.BuildConfig;
 import it.niedermann.nextcloud.deck.R;
 
 import static it.niedermann.nextcloud.deck.util.ClipboardUtil.copyToClipboard;
@@ -50,16 +51,10 @@ public class ExceptionUtil {
     }
 
     private static String getAppVersions(Context context) {
-        String versions = "";
-        try {
-            PackageInfo pInfo = context.getApplicationContext().getPackageManager().getPackageInfo(context.getApplicationContext().getPackageName(), 0);
-            versions += "App Version: " + pInfo.versionName;
-            versions += "\nApp Version Code: " + pInfo.versionCode;
-            versions += "\nApp ID: " + context.getPackageName();
-        } catch (PackageManager.NameNotFoundException e) {
-            versions += "\nApp Version: " + e.getMessage();
-            e.printStackTrace();
-        }
+        String versions = ""
+                + "App Version: " + BuildConfig.VERSION_NAME + "\n"
+                + "App Version Code: " + BuildConfig.VERSION_CODE + "\n"
+                + "App Flavor: " + BuildConfig.FLAVOR + "\n";
 
         try {
             versions += "\nFiles App Version Code: " + VersionCheckHelper.getNextcloudFilesVersionCode(context);
@@ -72,10 +67,11 @@ public class ExceptionUtil {
 
     private static String getDeviceInfos() {
         return ""
-                + "\nOS Version: " + System.getProperty("os.version") + "(" + android.os.Build.VERSION.INCREMENTAL + ")"
-                + "\nOS API Level: " + android.os.Build.VERSION.SDK_INT
-                + "\nDevice: " + android.os.Build.DEVICE
-                + "\nModel (and Product): " + android.os.Build.MODEL + " (" + android.os.Build.PRODUCT + ")";
+                + "\nOS Version: " + System.getProperty("os.version") + "(" + Build.VERSION.INCREMENTAL + ")"
+                + "\nOS API Level: " + Build.VERSION.SDK_INT
+                + "\nDevice: " + Build.DEVICE
+                + "\nManufacturer: " + Build.MANUFACTURER
+                + "\nModel (and Product): " + Build.MODEL + " (" + Build.PRODUCT + ")";
     }
 
     private static String getStacktraceOf(Throwable e) {
diff --git a/fastlane/metadata/android/en-US/changelogs/6000.txt b/fastlane/metadata/android/en-US/changelogs/6000.txt
index 006be82dc..a39917eae 100644
--- a/fastlane/metadata/android/en-US/changelogs/6000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/6000.txt
@@ -1,7 +1,12 @@
 - ⚡ Copy activity to clipboard (#343)
-- 💬 Copy comments to clipboard (#342)
-- 💬 Delete comments (#341)
-- 💬 Display sync icon on not yet synced comments (#346)
 - 🌎 Wording of column and stack confusing (#292)
 - 🐞 Crash when opening unsynchronised card (#363)
-- 🔧 Rewrite main view and drag and drop
\ No newline at end of file
+- 🔧 Rewrite main view and drag'n'drop
+
+
+The following changes require at least server version 1.0.0-alpha1
+
+- 💬 Copy comments to clipboard (#342)
+- 💬 Delete comments (#341)
+- 💬 Edit comments (#340)
+- 💬 Display sync icon on not yet synced comments (#346)
\ No newline at end of file
-- 
cgit v1.2.3