From bfb4a7dad3278ff01bdca5a69c21f4dcd766b1ca Mon Sep 17 00:00:00 2001
From: Igor Popov <dedepete@mail.ru>
Date: Tue, 11 Jul 2017 21:15:35 +0300
Subject: [PATCH] Updated issue template; Changed MANUFACTURER into BRAND.

---
 .../java/com/fastaccess/helper/AppHelper.java | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/fastaccess/helper/AppHelper.java b/app/src/main/java/com/fastaccess/helper/AppHelper.java
index 616a63ea..466b6629 100644
--- a/app/src/main/java/com/fastaccess/helper/AppHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/AppHelper.java
@@ -63,20 +63,31 @@ public class AppHelper {
     }
 
     @SuppressWarnings("StringBufferReplaceableByString") public static String getFastHubIssueTemplate() {
+        String brand = (!isEmulator()) ? Build.BRAND : "Android Emulator";
+        String model = (!isEmulator()) ? Build.MODEL : "Android Emulator";
         return new StringBuilder()
-                .append("**App Version: ")
+                .append("**FastHub Version: ")
                 .append(BuildConfig.VERSION_NAME)
                 .append("**")
-                .append("\n\n")
-                .append("**OS Version: ")
+                .append("  \n")
+                .append("**Android Version: ")
+                .append(String.valueOf(Build.VERSION.RELEASE))
+                .append(" (SDK: ")
                 .append(String.valueOf(Build.VERSION.SDK_INT))
-                .append("**")
-                .append("\n\n")
-                .append("**Model: ")
+                .append(")**")
+                .append("  \n")
+                .append("**Device information:**")
+                .append("  \n")
+                .append("- ")
                 .append(Build.MANUFACTURER)
-                .append("-")
-                .append(Build.MODEL)
-                .append("**")
+                .append("  \n")
+                .append("- ")
+                .append(brand)
+                .append("  \n")
+                .append("- ")
+                .append(model)
+                .append("\n\n")
+                .append("---")
                 .append("\n\n")
                 .toString();
     }
@@ -120,15 +131,14 @@ public class AppHelper {
     }
 
     public static String getDeviceName() {
-        String manufacturer = Build.MANUFACTURER;
+        String brand = Build.BRAND;
         String model = Build.MODEL;
         if (model.startsWith(manufacturer)) {
             return InputHelper.capitalizeFirstLetter(model);
         } else if (isEmulator()){
             return "Android Emulator";
-        } else {
-            return InputHelper.capitalizeFirstLetter(manufacturer) + " " + model;
         }
+        return InputHelper.capitalizeFirstLetter(manufacturer) + " " + model;
     }
 
     private static boolean isEmulator() {