From b38b4586667133bc0c9e82bff8837e037466a287 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 27 Dec 2019 19:02:53 +0100
Subject: [PATCH] Added report issue to review dialog

---
 .../java/eu/faircode/email/FragmentMessages.java   | 13 +++++++++++++
 app/src/main/java/eu/faircode/email/Helper.java    |  6 +++++-
 app/src/main/res/layout/dialog_review.xml          | 14 +++++++++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4bb0dd55dd..4963cb68c5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5502,8 +5502,21 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_review, null);
+            Button btnIssue = dview.findViewById(R.id.btnIssue);
             CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
+            final Intent issue = Helper.getIntentIssue(getContext(), true);
+            btnIssue.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    startActivity(issue);
+                    dismiss();
+                }
+            });
+
+            PackageManager pm = getContext().getPackageManager();
+            btnIssue.setVisibility(issue.resolveActivity(pm) == null ? View.GONE : View.VISIBLE);
+
             cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7aeb299723..4bd5b389de 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -304,7 +304,11 @@ public class Helper {
     }
 
     static Intent getIntentIssue(Context context) {
-        if (ActivityBilling.isPro(context)) {
+        return getIntentIssue(context, ActivityBilling.isPro(context));
+    }
+
+    static Intent getIntentIssue(Context context, boolean pro) {
+        if (pro) {
             String version = BuildConfig.VERSION_NAME + "/" +
                     (Helper.hasValidFingerprint(context) ? "1" : "3") +
                     (BuildConfig.PLAY_STORE_RELEASE ? "p" : "") +
diff --git a/app/src/main/res/layout/dialog_review.xml b/app/src/main/res/layout/dialog_review.xml
index e8c58f00eb..983e897bf1 100644
--- a/app/src/main/res/layout/dialog_review.xml
+++ b/app/src/main/res/layout/dialog_review.xml
@@ -31,6 +31,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
+        <Button
+            android:id="@+id/btnIssue"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/menu_issue"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
+
         <CheckBox
             android:id="@+id/cbNotAgain"
             android:layout_width="wrap_content"
@@ -39,6 +51,6 @@
             android:text="@string/title_no_ask_again"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
+            app:layout_constraintTop_toBottomOf="@id/btnIssue" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file