mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

integrating @davivels remarks

Browse source
This commit is contained in:
Luke Owncloud 2014-11-20 13:46:54 +01:00
parent 035fc24a17
commit 8de07698d9
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -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>

17
src/com/owncloud/android/ui/activity/LogHistoryActivity.java
View file

@ -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);