From 2662eff12323c58af0b13a3f685ab3baf75b74c8 Mon Sep 17 00:00:00 2001
From: JannisX11 <jannis4236@gmail.com>
Date: Sat, 28 Sep 2024 20:11:37 +0200
Subject: [PATCH 1/2] Upgrade travis linux dist [ci-build]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b4375e0f..b5ede092 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: focal
 
 language: node_js
 node:

From afd621a02f3574eb0daa095f21b46279464faf98 Mon Sep 17 00:00:00 2001
From: JannisX11 <jannis4236@gmail.com>
Date: Thu, 24 Oct 2024 12:40:55 +0200
Subject: [PATCH 2/2] Ask for file type when opening file on android
 (workaround for #2522)

---
 js/file_system.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/file_system.js b/js/file_system.js
index da91560f..969c9524 100644
--- a/js/file_system.js
+++ b/js/file_system.js
@@ -48,7 +48,7 @@ Object.assign(Blockbench, {
 			let isIOS =  ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) ||
 				(navigator.userAgent.includes("Mac") && "ontouchend" in document);
 			
-			if (isIOS && options.extensions && options.extensions.length > 1) {
+			if ((isIOS || Blockbench.isTouch) && options.extensions && options.extensions.length > 1) {
 				let ext_options = {};
 				options.extensions.forEach(extension => {
 					ext_options[extension] = extension;