From d76541ceec9e290557bb22ef2738ea4972aafcc9 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 10 Apr 2013 00:16:53 +0530
Subject: [PATCH] Add way to send feedback via email

---
 commons/res/menu/fragment_contributions_list.xml           | 4 ++++
 commons/res/values/strings.xml                             | 1 +
 .../java/org/wikimedia/commons/CommonsApplication.java     | 3 +++
 .../commons/contributions/ContributionsListFragment.java   | 7 +++++++
 4 files changed, 15 insertions(+)

diff --git a/commons/res/menu/fragment_contributions_list.xml b/commons/res/menu/fragment_contributions_list.xml
index b9e7d23ed..5011df92e 100644
--- a/commons/res/menu/fragment_contributions_list.xml
+++ b/commons/res/menu/fragment_contributions_list.xml
@@ -20,6 +20,10 @@
           android:title="@string/menu_about"
           android:showAsAction="never"
           />
+    <item android:id="@+id/menu_feedback"
+          android:title="@string/menu_feedback"
+          android:showAsAction="never"
+            />
 
 
 </menu>
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index 25ba95b5e..24a747661 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -80,4 +80,5 @@
     <string name="about_improve">Source on <a href="https://github.com/wikimedia/android-commons">GitHub</a>. Bugs at <a href="https://bugzilla.wikimedia.org/enter_bug.cgi?product=Commons%20App">Bugzilla</a>.</string>
     <string name="about_privacy_policy"><a href="https://wikimediafoundation.org/wiki/Privacy_policy">Privacy policy</a></string>
     <string name="title_activity_about">About</string>
+    <string name="menu_feedback">Send Feedback (via Email)</string>
 </resources>
diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
index 3a3d0a1df..3fe594da2 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
@@ -59,6 +59,9 @@ public class CommonsApplication extends Application {
 
     public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app";
 
+    public static final String FEEDBACK_EMAIL = "mobile-feedback-l@lists.wikimedia.org";
+    public static final String FEEDBACK_EMAIL_SUBJECT = "Commons Android App (%s) Feedback";
+
 
     public static AbstractHttpClient createHttpClient() {
         DefaultHttpClient client = new DefaultHttpClient();
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
index 6336e4006..a111fccff 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -225,6 +225,13 @@ public class ContributionsListFragment extends SherlockFragment {
                 Intent aboutIntent = new Intent(getActivity(),  AboutActivity.class);
                 startActivity(aboutIntent);
                 return true;
+            case R.id.menu_feedback:
+                Intent feedbackIntent = new Intent(Intent.ACTION_SEND);
+                feedbackIntent.setType("message/rfc822");
+                feedbackIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { CommonsApplication.FEEDBACK_EMAIL });
+                feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(CommonsApplication.FEEDBACK_EMAIL_SUBJECT, CommonsApplication.APPLICATION_VERSION));
+                startActivity(feedbackIntent);
+
             default:
                 return super.onOptionsItemSelected(item);
         }