Add additional Info to request

schlan · Jun 6, 2015 · 0967a0b · 0967a0b
1 parent ca85866
commit 0967a0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -94,9 +94,9 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="jackson-core-2.4.4" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="okhttp-urlconnection-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.1.3" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
@@ -106,7 +106,7 @@
     <orderEntry type="library" exported="" name="jackson-databind-2.4.4" level="project" />
     <orderEntry type="library" exported="" name="java-common-1.2" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
-    <orderEntry type="library" exported="" name="timber-3.0.1" level="project" />
+    <orderEntry type="library" exported="" name="timber-3.1.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
     <orderEntry type="library" exported="" name="sdk-1.3.0.1" level="project" />

diff --git a/app/src/main/java/at/droelf/clippy/HelpActivity.java b/app/src/main/java/at/droelf/clippy/HelpActivity.java
@@ -19,9 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import at.droelf.clippy.fragments.FeedBackHelpFragment;
 import at.droelf.clippy.fragments.UserHelpFragment;
+import at.droelf.clippy.utils.StringUtils;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 import timber.log.Timber;
@@ -99,7 +101,14 @@ public List<String> getTags() {
             }
 
             @Override
-            public String getAdditionalInfo() { return null; }
+            public String getAdditionalInfo() {
+                final Map<String, String> deviceInfoAsMap = deviceInfo.getDeviceInfoAsMap();
+                final StringBuilder info = new StringBuilder();
+                for(Map.Entry<String, String> entry : deviceInfoAsMap.entrySet()){
+                    info.append(String.format(Locale.US, "%s: %s%s",entry.getKey(), entry.getValue(), com.zendesk.util.StringUtils.LINE_SEPARATOR));
+                }
+                return info.toString();
+            }
 
             @Override
             public String getRequestSubject() {