Merge remote-tracking branch 'upstream/main' into 12.x

This commit is contained in:
Miku AuahDark
2024-02-13 12:56:05 +08:00
2 changed files with 51 additions and 51 deletions
@@ -1,50 +1,50 @@
/* /**
* Copyright (c) 2006-2024 LOVE Development Team * Copyright (c) 2006-2024 LOVE Development Team
* *
* This software is provided 'as-is', without any express or implied * This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages * warranty. In no event will the authors be held liable for any damages
* arising from the use of this software. * arising from the use of this software.
* *
* Permission is granted to anyone to use this software for any purpose, * Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it * including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions: * freely, subject to the following restrictions:
* *
* 1. The origin of this software must not be misrepresented; you must not * 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software * claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be * in a product, an acknowledgment in the product documentation would be
* appreciated but is not required. * appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be * 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software. * misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution. * 3. This notice may not be removed or altered from any source distribution.
*/ */
package org.love2d.android; package org.love2d.android;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Objects; import java.util.Objects;
public class IntentReceiverActivity extends Activity { public class IntentReceiverActivity extends Activity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Intent mainIntent = getIntent(); Intent mainIntent = getIntent();
Intent intent = new Intent(this, GameActivity.class); Intent intent = new Intent(this, GameActivity.class);
if (Objects.equals(mainIntent.getAction(), Intent.ACTION_SEND)) { if (Objects.equals(mainIntent.getAction(), Intent.ACTION_SEND)) {
// Convert to simpler intent that our GameActivity can process. // Convert to simpler intent that our GameActivity can process.
Uri uri = mainIntent.getParcelableExtra(Intent.EXTRA_STREAM); Uri uri = mainIntent.getParcelableExtra(Intent.EXTRA_STREAM);
intent.setData(uri); intent.setData(uri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
} }
startActivity(intent); startActivity(intent);
finish(); finish();
} }
} }
+1 -1
View File
@@ -6,7 +6,7 @@ This distribution contains code from the following projects (full license text b
- LOVE - LOVE
Website: https://love2d.org/ Website: https://love2d.org/
License: zlib License: zlib
Copyright (c) 2006-2023 LOVE Development Team Copyright (c) 2006-2024 LOVE Development Team
- ENet - ENet
Website: http://enet.bespin.org/index.html Website: http://enet.bespin.org/index.html