Merge pull request #12852 from Florin9doi/android_12846

Update <Share> dialog on Android 10; Fixes #12846
This commit is contained in:
Henrik Rydgård 2020-04-25 15:23:14 +02:00 committed by GitHub
commit 259ae2862c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

1
.gitignore vendored
View File

@ -19,6 +19,7 @@
*.exp
*.qdact
controls.ini
desktop.ini
Debug
Release
Windows/.vs

View File

@ -585,7 +585,7 @@ UI::EventReturn CreditsScreen::OnDiscord(UI::EventParams &e) {
UI::EventReturn CreditsScreen::OnShare(UI::EventParams &e) {
auto cr = GetI18NCategory("PSPCredits");
System_SendMessage("sharetext", cr->T("CheckOutPPSSPP", "Check out PPSSPP, the awesome PSP emulator: http://www.ppsspp.org/"));
System_SendMessage("sharetext", cr->T("CheckOutPPSSPP", "Check out PPSSPP, the awesome PSP emulator: https://www.ppsspp.org/"));
return UI::EVENT_DONE;
}

View File

@ -1307,7 +1307,8 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
sendIntent.setType("text/plain");
sendIntent.putExtra(Intent.EXTRA_TEXT, params);
sendIntent.setAction(Intent.ACTION_SEND);
startActivity(sendIntent);
Intent shareIntent = Intent.createChooser(sendIntent, null);
startActivity(shareIntent);
return true;
} catch (Exception e) { // For example, android.content.ActivityNotFoundException
Log.e(TAG, e.toString());