devol
/
exodus-privacy-android-app
mirror of https://github.com/stom79/exodus-android-app
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'stom79_baseline' 

# Conflicts:
#	app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
This commit is contained in:
Thomas 2020-12-16 08:22:49 +01:00
parent 20f2e8412f ae020fe1cc
commit c40afdf348
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/eu/exodus_privacy/exodusprivacy/CheckAppActivity.java
View File

@ -112,10 +112,10 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(getString(R.string.app_name), app_id); ClipData clip = ClipData.newPlainText(getString(R.string.app_name), app_id);
clipboard.setPrimaryClip(clip); clipboard.setPrimaryClip(clip);
if (BuildConfig.FLAVOR.equals("amal")) { if (BuildConfig.FLAVOR.equals("exodus")) {
uri = Uri.parse("https://exodus.phm.education.gouv.fr/analysis/submit/"); uri = Uri.parse("https://reports.exodus-privacy.eu.org/analysis/submit/#" + app_id);
} else { } else {
uri = Uri.parse("https://reports.exodus-privacy.eu.org/analysis/submit/"); uri = Uri.parse("https://exodus.phm.education.gouv.fr/analysis/submit/#" + app_id);
} }
Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri); Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(browserIntent); startActivity(browserIntent);
@ -126,6 +126,7 @@ public class CheckAppActivity extends AppCompatActivity implements NetworkListen
dialog.dismiss(); dialog.dismiss();
finish(); finish();
}); });
dialogBuilder.setOnDismissListener(dialogInterface -> finish());
AlertDialog alertDialog = dialogBuilder.create(); AlertDialog alertDialog = dialogBuilder.create();
alertDialog.show(); alertDialog.show();
return; return;

2
app/src/main/res/values/strings.xml
View File

@ -60,7 +60,7 @@
<string name="having_most_permissions">Having most permissions</string> <string name="having_most_permissions">Having most permissions</string>
<string name="having_less_permissions">Having less permissions</string> <string name="having_less_permissions">Having less permissions</string>
<string name="submit">Submit</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> <string name="app_not_analyzed_title">This app has not been analyzed!</string>
<string name="title_apps">My apps</string> <string name="title_apps">My apps</string>
<string name="title_trackers">Trackers</string> <string name="title_trackers">Trackers</string>