Merge remote-tracking branch 'origin/master'

This commit is contained in:
Austin Huang 2020-11-17 20:08:47 -05:00
commit 957c34b39f
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
3 changed files with 8 additions and 7 deletions

View File

@ -1,6 +1,6 @@
**THERE ARE CURRENTLY NO OFFICIAL GOOGLE PLAY RELEASES. PLEASE REPORT ANY OCCURRENCES TO US.**
<img src="./app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" alt="InstaGrabber" align="right" width="20%/>
<img src="./app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png" alt="InstaGrabber" align="right" width="20%"/>
# Barinsta
@ -35,7 +35,7 @@ Version status: ![F-Droid](https://img.shields.io/f-droid/v/me.austinhuang.insta
## Contact us
* Use [GitHub issues](https://github.com/austinhuang0131/instagrabber/issues) when possible.
* Email: [Barinsta@AustinHuang.me](mailto:barinsta@austinhuang.me) (Synced to GitHub issues)
* Email: [Barinsta@AustinHuang.me](mailto:barinsta@austinhuang.me?body=Please%20note%20that%20your%20email%20address%20and%20the%20entire%20content%20will%20be%20published%20onto%20GitHub%20issues.%20If%20you%20do%20not%20wish%20to%20do%20that%2C%20use%20other%20contact%20methods%20instead.) (Synced to GitHub issues)
* Reddit: [r/Barinsta](https://reddit.com/r/barinsta)
* Chat (Bridged to each other): [![Matrix](https://img.shields.io/badge/Matrix-@Barinsta:matrix.org-000000?logo=matrix)](https://matrix.to/#/#barinsta:matrix.org) [![Telegram](https://img.shields.io/badge/Telegram-@Grabber__App-2CA5E0?logo=telegram)](https://t.me/grabber_app) [![Discord](https://img.shields.io/badge/Discord-YtEDzN2-7289da?logo=discord&logoColor=white)](https://discord.gg/YtEDzN2) [![Gitter](https://img.shields.io/badge/Gitter-InstaGrabber/General-ed1965?logo=gitter)](https://gitter.im/instagrabber/general)

View File

@ -89,7 +89,8 @@ public class AboutFragment extends BasePreferencesFragment {
preference.setIconSpaceReserved(false);
preference.setOnPreferenceClickListener(p -> {
final Intent intent = new Intent(Intent.ACTION_SENDTO);
intent.setData(Uri.parse(getString(R.string.about_feedback_summary)));
intent.setData(Uri.parse(getString(R.string.about_feedback_summary)
+ "?body=Please%20note%20that%20your%20email%20address%20and%20the%20entire%20content%20will%20be%20published%20onto%20GitHub%20issues.%20If%20you%20do%20not%20wish%20to%20do%20that%2C%20use%20other%20contact%20methods%20instead."));
if (intent.resolveActivity(context.getPackageManager()) != null) startActivity(intent);
return true;
});

View File

@ -53,10 +53,12 @@ public final class CrashReporter implements Thread.UncaughtExceptionHandler {
@Override
public void uncaughtException(@NonNull final Thread t, @NonNull final Throwable exception) {
final StringBuilder reportBuilder = new StringBuilder();
reportBuilder.append("Error report collected on: ").append(new Date().toString());
reportBuilder.append("\r\n\r\nInformation:\r\n==============");
reportBuilder.append("IMPORTANT: If sending by email, your email address and the entire content will be made public on GitHub issues.");
reportBuilder.append("IMPORTANT: When possible, please describe the steps leading to this crash. Thank you for your cooperation.");
reportBuilder.append("\r\n\r\nError report collected on: ").append(new Date().toString());
reportBuilder
.append("\r\n\r\nInformation:\r\n==============")
.append("\r\nVERSION : ").append(BuildConfig.VERSION_NAME)
.append("\r\nVERSION_CODE : ").append(BuildConfig.VERSION_CODE)
.append("\r\nPHONE-MODEL : ").append(Build.MODEL)
@ -69,8 +71,6 @@ public final class CrashReporter implements Thread.UncaughtExceptionHandler {
.append("\r\nPRODUCT : ").append(Build.PRODUCT)
.append("\r\nHOST : ").append(Build.HOST)
.append("\r\nTAGS : ").append(Build.TAGS)
.append("\r\nINSTRUCTION : Please attach details on how to produce this crash. Your help is appreciated.")
.append("\r\nPRIVACY : Your email address and crash report will be made PUBLIC on the GitHub repository.");
reportBuilder.append("\r\n\r\nStack:\r\n==============\r\n");
final Writer result = new StringWriter();