Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed iOS sharing

Browse Source
This commit is contained in:
Anuken
2020-11-06 21:02:08 -05:00
parent c51fcd3839
commit 78af4e2120
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -199,24 +199,19 @@ public class SettingsMenuDialog extends SettingsDialog{
t.row(); t.row();
t.button("@crash.export", Icon.upload, style, () -> { t.button("@crash.export", Icon.upload, style, () -> {
if(settings.getDataDirectory().child("crashes").list().length == 0){ if(settings.getDataDirectory().child("crashes").list().length == 0 && !settings.getDataDirectory().child("last_log.txt").exists()){
ui.showInfo("@crash.none"); ui.showInfo("@crash.none");
}else{ }else{
platform.showFileChooser(false, "txt", file -> { if(ios){
Fi log = settings.getDataDirectory().child("last_log.txt"); Fi logs = tmpDirectory.child("logs.txt");
logs.writeString(getLogs());
StringBuilder out = new StringBuilder(); platform.shareFile(logs);
for(Fi fi : settings.getDataDirectory().child("crashes").list()){ }else{
out.append(fi.name()).append("\n\n").append(fi.readString()).append("\n"); platform.showFileChooser(false, "txt", file -> {
} file.writeString(getLogs());
app.post(() -> ui.showInfo("@crash.exported"));
if(log.exists()){ });
out.append("\nlast log:\n").append(log.readString()); }
}
file.writeString(out.toString());
app.post(() -> ui.showInfo("@crash.exported"));
});
} }
}).marginLeft(4); }).marginLeft(4);
}); });
@@ -250,6 +245,21 @@ public class SettingsMenuDialog extends SettingsDialog{
addSettings(); addSettings();
} }
String getLogs(){
Fi log = settings.getDataDirectory().child("last_log.txt");
StringBuilder out = new StringBuilder();
for(Fi fi : settings.getDataDirectory().child("crashes").list()){
out.append(fi.name()).append("\n\n").append(fi.readString()).append("\n");
}
if(log.exists()){
out.append("\nlast log:\n").append(log.readString());
}
return out.toString();
}
void rebuildMenu(){ void rebuildMenu(){
menu.clearChildren(); menu.clearChildren();