Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into 12.x
Browse files Browse the repository at this point in the history
  • Loading branch information
MikuAuahDark committed Feb 13, 2024
2 parents 46e7d9d + 860c109 commit 288949e
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 51 deletions.
100 changes: 50 additions & 50 deletions app/src/main/java/org/love2d/android/IntentReceiverActivity.java
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
/*
* Copyright (c) 2006-2024 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 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
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*/

package org.love2d.android;

import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;

import androidx.annotation.Nullable;

import java.util.Objects;

public class IntentReceiverActivity extends Activity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

Intent mainIntent = getIntent();
Intent intent = new Intent(this, GameActivity.class);

if (Objects.equals(mainIntent.getAction(), Intent.ACTION_SEND)) {
// Convert to simpler intent that our GameActivity can process.
Uri uri = mainIntent.getParcelableExtra(Intent.EXTRA_STREAM);
intent.setData(uri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
}

startActivity(intent);
finish();
}
}
/**
* Copyright (c) 2006-2024 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 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
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*/

package org.love2d.android;

import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;

import androidx.annotation.Nullable;

import java.util.Objects;

public class IntentReceiverActivity extends Activity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

Intent mainIntent = getIntent();
Intent intent = new Intent(this, GameActivity.class);

if (Objects.equals(mainIntent.getAction(), Intent.ACTION_SEND)) {
// Convert to simpler intent that our GameActivity can process.
Uri uri = mainIntent.getParcelableExtra(Intent.EXTRA_STREAM);
intent.setData(uri);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
}

startActivity(intent);
finish();
}
}
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This distribution contains code from the following projects (full license text b
- LOVE
Website: https://love2d.org/
License: zlib
Copyright (c) 2006-2023 LOVE Development Team
Copyright (c) 2006-2024 LOVE Development Team

- ENet
Website: http://enet.bespin.org/index.html
Expand Down

0 comments on commit 288949e

Please sign in to comment.