From ae020fe1cce70a15013d0a592cd15dedb81d9494 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 16 Dec 2020 08:19:33 +0100
Subject: [PATCH] Automatically paste the app id to the website form + finish
 activity when dismissing the dialog (Analysis from stores).

---
 .../eu/exodus_privacy/exodusprivacy/CheckAppActivity.java    | 5 +++--
 app/src/main/res/values/strings.xml                          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
index cc320bf..38afc73 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
@@ -114,9 +114,9 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
                     ClipData clip = ClipData.newPlainText(getString(R.string.app_name), app_id);
                     clipboard.setPrimaryClip(clip);
                     if (BuildConfig.FLAVOR.equals("exodus")) {
-                        uri = Uri.parse("https://reports.exodus-privacy.eu.org/analysis/submit/");
+                        uri = Uri.parse("https://reports.exodus-privacy.eu.org/analysis/submit/#" + app_id);
                     } else {
-                        uri = Uri.parse("https://exodus.phm.education.gouv.fr/analysis/submit/");
+                        uri = Uri.parse("https://exodus.phm.education.gouv.fr/analysis/submit/#" + app_id);
                     }
                     Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
                     startActivity(browserIntent);
@@ -127,6 +127,7 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
                     dialog.dismiss();
                     finish();
                 });
+                dialogBuilder.setOnDismissListener(dialogInterface -> finish());
                 AlertDialog alertDialog = dialogBuilder.create();
                 alertDialog.show();
                 return;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aeeaea3..447bac9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,7 +60,7 @@
     <string name="having_most_permissions">Having most permissions</string>
     <string name="having_less_permissions">Having less permissions</string>
     <string name="submit">Submit</string>
-    <string name="app_not_analyzed">Would you like to analyze the app?\n\nThe app id will be automatically copied in your clipboard, you will only have to past it in website form.</string>
+    <string name="app_not_analyzed">Would you like to analyze the app?\n\nThe app id will be automatically pasted to the website form. You will only need to submit the form.</string>
     <string name="app_not_analyzed_title">This app has not been analyzed!</string>