From: Luke Owncloud <owncloud@ohrt.org>
Date: Thu, 30 Oct 2014 08:53:24 +0000 (+0100)
Subject: allow user to save choice of app for sending log
X-Git-Tag: oc-android-1.7.0_signed~80^2^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/035fc24a178cee28c9527c95e465d41ac09bf431?ds=inline;hp=--cc

allow user to save choice of app for sending log
warn user if no app for sending log available
---

035fc24a178cee28c9527c95e465d41ac09bf431
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5fe8032..665b114b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -296,8 +296,8 @@
 
 	<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_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_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 23d2c42f..bfb433a9 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -35,6 +36,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -140,12 +142,17 @@ 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_mail_subject));
+        intent.putExtra(Intent.EXTRA_SUBJECT, getText(R.string.log_send_mail_subject));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setType(MAIL_ATTACHMENT_TYPE);
         intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, getString(R.string.log_send_no_mail_app), Toast.LENGTH_LONG).show();
+            Log_OC.i(TAG, "Could not find app for sending log history.");
+        }
 
-        startActivity(Intent.createChooser(intent, getString(R.string.log_send_chooser_title)));     
     }
 
     /**