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

use chooser for sendmail (remove explicit gmail) in LogHistory

Browse source
This commit is contained in:
Luke Owncloud 2014-10-29 12:39:44 +01:00
parent 068b826b32
commit 5caa8d25a0
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/values/strings.xml
View file

@ -296,8 +296,9 @@
<string name="actionbar_logger">Logs</string>
<string name="log_send_history_button">Send History</string>
<string name="log_send_chooser_title">Send log history to&#8230;</string>
<string name="log_mail_subject">ownCloud Android app logs</string>
<string name="log_progress_dialog_text">Loading data...</string>
<string name="log_progress_dialog_text">Loading data&#8230;</string>
<string name="saml_authentication_required_text">Authentication required</string>
<string name="saml_authentication_wrong_pass">Wrong password</string>

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

@ -22,7 +22,6 @@ 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.Intent;
@ -125,41 +124,28 @@ public class LogHistoryActivity extends SherlockFragmentActivity {
*/
private void sendMail() {
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 = "";
}
String emailAddress = getString(R.string.mail_logger);
ArrayList<Uri> uris = new ArrayList<Uri>();
// Convert from paths to Android friendly Parcelable Uri's
for (String file : Log_OC.getLogFileNames())
{
if (new File(mLogPath + File.separator, file).exists()) {
Uri u = Uri.parse("file://" + mLogPath + File.separator + file);
uris.add(u);
File logFile = new File(mLogPath, file);
if (logFile.exists()) {
uris.add(Uri.fromFile(logFile));
}
}
Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
// Explicitly only use Gmail to send
intent.setClassName("com.google.android.gm","com.google.android.gm.ComposeActivityGmail");
intent.putExtra(Intent.EXTRA_EMAIL, new String[]{ emailAddress });
intent.putExtra(Intent.EXTRA_EMAIL, emailAddress);
intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_mail_subject));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setType(MAIL_ATTACHMENT_TYPE);
intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
if (intent.resolveActivity(getPackageManager()) != null) {
startActivity(intent);
}
startActivity(Intent.createChooser(intent, getString(R.string.log_send_chooser_title)));
}
/**