Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 11:10:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support for mindustry:// URLs for joining servers on Android

Browse Source
This commit is contained in:
Anuken
2026-07-15 14:41:28 -04:00
parent 91c3e50771
commit 5e426a60c1
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/mindustry/android/AndroidLauncher.java
+35 -23
View File
@@ -225,7 +225,7 @@ public class AndroidLauncher extends AndroidApplication{
}});
var intent = getIntent();
Events.on(ClientLoadEvent.class, u -> handleFiles(intent));
Events.on(ClientLoadEvent.class, u -> handleIntent(intent));
try{
//new external folder
@@ -287,38 +287,50 @@ public class AndroidLauncher extends AndroidApplication{
protected void onNewIntent(Intent intent){
super.onNewIntent(intent);
handleFiles(intent);
handleIntent(intent);
}
private void handleFiles(Intent intent){
private void handleIntent(Intent intent){
if(intent == null) return;
try{
Uri uri = intent.getData();
if(uri != null){
String scheme = uri.getScheme();
Fi file = Core.files.cache("temp-save." + saveExtension);
file.write(getContentResolver().openInputStream(uri), false);
//TODO: how to check if it's a server URL? e.g: mindustry://myserver.com or mindustry://127.0.0.1
if("mindustry".equalsIgnoreCase(scheme)){ //open a server URL
//may run on a different thread
Core.app.post(() -> {
try{
SaveMeta meta = SaveIO.getMeta(file);
if(!meta.isMap()){ //open save
SaveSlot slot = control.saves.importSave(file);
ui.load.runLoadSave(slot);
}else{ //open map
if(!ui.maps.isShown()){
ui.maps.show();
}
ui.maps.tryImportMap(file, result -> ui.maps.showMap(result));
}
}catch(Throwable e){
Log.err("Failed to load save", e);
ui.showException("@save.import.invalid", e);
String host = uri.getHost();
int port = uri.getPort();
if(host != null && !host.isEmpty()){
Core.app.post(() -> {
ui.showConfirm(Core.bundle.format("servers.connect.confirm", host), () -> ui.join.connect(host, port != -1 ? port : 6567));
});
}
});
}else{ //open a save file
Fi file = Core.files.cache("temp-save." + saveExtension);
file.write(getContentResolver().openInputStream(uri), false);
//may run on a different thread
Core.app.post(() -> {
try{
SaveMeta meta = SaveIO.getMeta(file);
if(!meta.isMap()){ //open save
SaveSlot slot = control.saves.importSave(file);
ui.load.runLoadSave(slot);
}else{ //open map
if(!ui.maps.isShown()){
ui.maps.show();
}
ui.maps.tryImportMap(file, result -> ui.maps.showMap(result));
}
}catch(Throwable e){
Log.err("Failed to load save", e);
ui.showException("@save.import.invalid", e);
}
});
}
//clear data (not sure if necessary?)
intent.setAction(Intent.ACTION_MAIN);