mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-27 07:20:49 +00:00
Merge pull request #12852 from Florin9doi/android_12846
Update <Share> dialog on Android 10; Fixes #12846
This commit is contained in:
commit
259ae2862c
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,6 +19,7 @@
|
||||
*.exp
|
||||
*.qdact
|
||||
controls.ini
|
||||
desktop.ini
|
||||
Debug
|
||||
Release
|
||||
Windows/.vs
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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());
|
||||
|
Loading…
Reference in New Issue
Block a user