.clang-format

@@ -1,6 +1,7 @@
 BasedOnStyle: LLVM
-IndentWidth: 8
+IndentWidth: 4
 UseTab: Always
+TabWidth: 4
 BreakBeforeBraces: Custom
 Standard: Cpp11
 BraceWrapping:
@@ -16,7 +17,7 @@ BraceWrapping:
 FixNamespaceComments: false
 AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
-AccessModifierOffset: -8
+AccessModifierOffset: -4
 ColumnLimit: 90
 AllowShortFunctionsOnASingleLine: InlineOnly
 SortIncludes: false
@@ -26,7 +27,7 @@ IncludeCategories:
   - Regex:           '^<.*'
     Priority:        1
 AlignAfterOpenBracket: DontAlign
-ContinuationIndentWidth: 16
-ConstructorInitializerIndentWidth: 16
+ContinuationIndentWidth: 8
+ConstructorInitializerIndentWidth: 8
 BreakConstructorInitializers: AfterColon
 AlwaysBreakTemplateDeclarations: Yes

.github/workflows/android.yml

@@ -8,15 +8,15 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
-      - 'build/android/**'
+      - 'android/**'
       - '.github/workflows/android.yml'
   pull_request:
     paths:
       - 'lib/**.[ch]'
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
-      - 'build/android/**'
+      - 'android/**'
       - '.github/workflows/android.yml'
 
 jobs:
@@ -29,14 +29,14 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: cd build/android; ./gradlew assemblerelease
+      run: cd android; ./gradlew assemblerelease
     - name: Save armeabi artifact
       uses: actions/upload-artifact@v2
       with:
         name: Minetest-armeabi-v7a.apk
-        path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
+        path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
     - name: Save arm64 artifact
       uses: actions/upload-artifact@v2
       with:
         name: Minetest-arm64-v8a.apk
-        path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
+        path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk

.gitignore

@@ -76,6 +76,7 @@ doc/mkdocs/docs/*.md
 doc/mkdocs/mkdocs.yml
 
 ## Build files
+build/
 CMakeFiles
 Makefile
 cmake_install.cmake

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CLANG_MINIMUM_VERSION "3.4")
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 5)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases

build/android/app/build.gradle → android/app/build.gradle

@@ -52,7 +52,7 @@ android {
 
 task prepareAssets() {
 	def assetsFolder = "build/assets"
-	def projRoot = "../../.."
+	def projRoot = "../.."
 	def gameToCopy = "minetest_game"
 
 	copy {

build/android/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml

@@ -19,6 +19,8 @@
 		android:label="@string/label"
 		android:requestLegacyExternalStorage="true"
 		android:resizeableActivity="false"
+		android:hasFragileUserData="true"
+		android:isGame="true"
 		tools:ignore="UnusedAttribute">
 
 		<meta-data

build/android/app/src/main/java/net/minetest/minetest/GameActivity.java → android/app/src/main/java/net/minetest/minetest/GameActivity.java

@@ -146,4 +146,12 @@ public void openURI(String uri) {
 		Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
 		startActivity(browserIntent);
 	}
+
+	public String getUserDataPath() {
+		return Utils.getUserDataDirectory(this).getAbsolutePath();
+	}
+
+	public String getCachePath() {
+		return Utils.getCacheDirectory(this).getAbsolutePath();
+	}
 }

build/android/app/src/main/java/net/minetest/minetest/MainActivity.java → android/app/src/main/java/net/minetest/minetest/MainActivity.java

@@ -29,12 +29,14 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -43,11 +45,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static net.minetest.minetest.UnzipService.ACTION_FAILURE;
-import static net.minetest.minetest.UnzipService.ACTION_PROGRESS;
-import static net.minetest.minetest.UnzipService.ACTION_UPDATE;
-import static net.minetest.minetest.UnzipService.FAILURE;
-import static net.minetest.minetest.UnzipService.SUCCESS;
+import static net.minetest.minetest.UnzipService.*;
 
 public class MainActivity extends AppCompatActivity {
 	private final static int versionCode = BuildConfig.VERSION_CODE;
@@ -56,26 +54,40 @@ public class MainActivity extends AppCompatActivity {
 			new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE};
 	private static final String SETTINGS = "MinetestSettings";
 	private static final String TAG_VERSION_CODE = "versionCode";
+
 	private ProgressBar mProgressBar;
 	private TextView mTextView;
 	private SharedPreferences sharedPreferences;
+
 	private final BroadcastReceiver myReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(Context context, Intent intent) {
 			int progress = 0;
-			if (intent != null)
+			@StringRes int message = 0;
+			if (intent != null) {
 				progress = intent.getIntExtra(ACTION_PROGRESS, 0);
-			if (progress >= 0) {
+				message = intent.getIntExtra(ACTION_PROGRESS_MESSAGE, 0);
+			}
+
+			if (progress == FAILURE) {
+				Toast.makeText(MainActivity.this, intent.getStringExtra(ACTION_FAILURE), Toast.LENGTH_LONG).show();
+				finish();
+			} else if (progress == SUCCESS) {
+				startNative();
+			} else {
 				if (mProgressBar != null) {
 					mProgressBar.setVisibility(View.VISIBLE);
-					mProgressBar.setProgress(progress);
+					if (progress == INDETERMINATE) {
+						mProgressBar.setIndeterminate(true);
+					} else {
+						mProgressBar.setIndeterminate(false);
+						mProgressBar.setProgress(progress);
+					}
 				}
 				mTextView.setVisibility(View.VISIBLE);
-			} else if (progress == FAILURE) {
-				Toast.makeText(MainActivity.this, intent.getStringExtra(ACTION_FAILURE), Toast.LENGTH_LONG).show();
-				finish();
-			} else if (progress == SUCCESS)
-				startNative();
+				if (message != 0)
+					mTextView.setText(message);
+			}
 		}
 	};
 
@@ -88,6 +100,7 @@ public void onCreate(Bundle savedInstanceState) {
 		mProgressBar = findViewById(R.id.progressBar);
 		mTextView = findViewById(R.id.textView);
 		sharedPreferences = getSharedPreferences(SETTINGS, Context.MODE_PRIVATE);
+
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
 			checkPermission();
 		else
@@ -120,17 +133,35 @@ public void onRequestPermissionsResult(int requestCode,
 				if (grantResult != PackageManager.PERMISSION_GRANTED) {
 					Toast.makeText(this, R.string.not_granted, Toast.LENGTH_LONG).show();
 					finish();
+					return;
 				}
 			}
 			checkAppVersion();
 		}
 	}
 
 	private void checkAppVersion() {
-		if (sharedPreferences.getInt(TAG_VERSION_CODE, 0) == versionCode)
+		if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+			Toast.makeText(this, R.string.no_external_storage, Toast.LENGTH_LONG).show();
+			finish();
+			return;
+		}
+
+		if (UnzipService.getIsRunning()) {
+			mProgressBar.setVisibility(View.VISIBLE);
+			mProgressBar.setIndeterminate(true);
+			mTextView.setVisibility(View.VISIBLE);
+		} else if (sharedPreferences.getInt(TAG_VERSION_CODE, 0) == versionCode &&
+				Utils.isInstallValid(this)) {
 			startNative();
-		else
-			new CopyZipTask(this).execute(getCacheDir() + "/Minetest.zip");
+		} else {
+			mProgressBar.setVisibility(View.VISIBLE);
+			mProgressBar.setIndeterminate(true);
+			mTextView.setVisibility(View.VISIBLE);
+
+			Intent intent = new Intent(this, UnzipService.class);
+			startService(intent);
+		}
 	}
 
 	private void startNative() {