From 8de07698d9130a001a325ee39a9ad64cf3b9b191 Mon Sep 17 00:00:00 2001
From: Luke Owncloud <owncloud@ohrt.org>
Date: Thu, 20 Nov 2014 13:46:54 +0100
Subject: [PATCH] integrating @davivels remarks

---
 res/values/strings.xml                                  |  2 +-
 .../android/ui/activity/LogHistoryActivity.java         | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 665b114b..d62aed34 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -297,7 +297,7 @@
 	<string name="actionbar_logger">Logs</string>
 	<string name="log_send_history_button">Send History</string>
 	<string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
-	<string name="log_send_mail_subject">ownCloud Android app logs</string>
+	<string name="log_send_mail_subject">%1$s Android app logs</string>
 	<string name="log_progress_dialog_text">Loading data&#8230;</string>
 
 	<string name="saml_authentication_required_text">Authentication required</string>
diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index bfb433a9..ce2d0ce0 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 
 import android.content.ActivityNotFoundException;
@@ -126,7 +127,18 @@ public class LogHistoryActivity extends SherlockFragmentActivity  {
      */
     private void sendMail() {
 
-        String emailAddress = getString(R.string.mail_logger);
+        // For the moment we need to consider the possibility that setup.xml
+        // does not include the "mail_logger" entry. This block prevents that
+        // compilation fails in this case.
+        String emailAddress;
+        try {
+            Class<?> stringClass = R.string.class;
+            Field mailLoggerField = stringClass.getField("mail_logger");
+            int emailAddressId = (Integer) mailLoggerField.get(null);
+            emailAddress = getString(emailAddressId);
+        } catch (Exception e) {
+            emailAddress = "";
+        }
         
         ArrayList<Uri> uris = new ArrayList<Uri>();
 
@@ -142,7 +154,8 @@ public class LogHistoryActivity extends SherlockFragmentActivity  {
         Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
 
         intent.putExtra(Intent.EXTRA_EMAIL, emailAddress);
-        intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_send_mail_subject));
+        String subject = String.format(getString(R.string.log_send_mail_subject), getString(R.string.app_name));
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setType(MAIL_ATTACHMENT_TYPE);
         intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-- 
2.11.0