enable workflow_dispatch and attach debug APK for Android CI

.github/workflows/android.yml

@@ -1,6 +1,7 @@
 name: Android CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [ master ]
   pull_request:
@@ -10,18 +11,53 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        distribution: "adopt"
-        java-version: 11
+        distribution: "temurin"
+        java-version: 17
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
     - name: Build apk
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: build
+
+    - name: Setup environment variable
+      run: |
+        APK_VERSION="$(grep 'def baseline' build.gradle | sed -E "s/.+'(.+)'/\1/")"
+        APK_FULL_VERSION="$APK_VERSION($(date +%y%m%d))"
+        APK_BUILD_DATE="$(date +%Y-%m-%d)"
+        APK_DIR_PATH="./build/outputs/apk/debug"
+
+        echo "APK_VERSION=$APK_VERSION" >> $GITHUB_ENV
+        echo "APK_FULL_VERSION=$APK_FULL_VERSION" >> $GITHUB_ENV
+        echo "APK_BUILD_DATE=$APK_BUILD_DATE" >> $GITHUB_ENV
+        echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
+
+    - name: Generate sha256sum file
+      run: |
+        (cd "$APK_DIR_PATH"; sha256sum "osu!droid-$APK_FULL_VERSION-debug-$APK_BUILD_DATE.apk" > "osu!droid-$APK_FULL_VERSION-$APK_BUILD_DATE.sha256sum") || {
+          echo "Failed to generate sha256sum for 'osu!droid-$APK_FULL_VERSION-$APK_BUILD_DATE' APK."
+          exit 1
+        }
+
+    - name: Attach APK file
+      uses: actions/upload-artifact@v4
+      with:
+        name: osu!droid-${{ env.APK_FULL_VERSION }}-${{ env.APK_BUILD_DATE }}_apk
+        path: |
+          ${{ env.APK_DIR_PATH }}/osu!droid-${{ env.APK_FULL_VERSION }}-debug-${{ env.APK_BUILD_DATE }}.apk
+          ${{ env.APK_DIR_PATH }}/output-metadata.json
+
+    - name: Attach sha256sum file
+      uses: actions/upload-artifact@v4
+      with:
+        name: osu!droid-${{ env.APK_FULL_VERSION }}-${{ env.APK_BUILD_DATE }}_sha256sum
+        path: |
+          ${{ env.APK_DIR_PATH }}/osu!droid-${{ env.APK_FULL_VERSION }}-${{ env.APK_BUILD_DATE }}.sha256sum
+          ${{ env.APK_DIR_PATH }}/output-metadata.json

.github/workflows/gradle-wrapper-validation.yml

@@ -6,5 +6,5 @@ jobs:
     name: Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2

AndEngine/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.anddev.andengine"
 	android:versionCode="1"
 	android:versionName="1.0">
 

AndEngine/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    namespace 'org.anddev.andengine'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
     }
 
     sourceSets {
@@ -18,16 +18,18 @@ android {
     }
 
     useLibrary 'org.apache.http.legacy'
-
-    lintOptions {
+    lint {
         abortOnError true
         ignoreWarnings true
-        disable 'ExpiredTargetSdkVersion'
     }
+    buildFeatures {
+        buildConfig true
+    }
+
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.11.0'
 }

AndEngine/src/org/anddev/andengine/entity/Entity.java

@@ -212,6 +212,8 @@ public void setPosition(final IEntity pOtherEntity) {
 
 	@Override
 	public void setPosition(final float pX, final float pY) {
+		if (pX == mX && pY == mY)
+			return;
 		this.mX = pX;
 		this.mY = pY;
 		this.mLocalToParentTransformationDirty = true;
@@ -238,6 +240,8 @@ public boolean isRotated() {
 
 	@Override
 	public void setRotation(final float pRotation) {
+		if (mRotation == pRotation)
+			return;
 		this.mRotation = pRotation;
 		this.mLocalToParentTransformationDirty = true;
 		this.mParentToLocalTransformationDirty = true;
@@ -306,6 +310,8 @@ public void setScaleY(final float pScaleY) {
 
 	@Override
 	public void setScale(final float pScale) {
+		if (mScaleX == pScale && mScaleY == pScale)
+			return;
 		this.mScaleX = pScale;
 		this.mScaleY = pScale;
 		this.mLocalToParentTransformationDirty = true;
@@ -1047,22 +1053,13 @@ protected void onDrawChildren(final GL10 pGL, final Camera pCamera) {
 	public void onManagedDrawChildren(final GL10 pGL, final Camera pCamera) {
 		final ArrayList<IEntity> children = this.mChildren;
 		final int childCount = children.size();
-		int i = 0;
-		while (i < childCount) {
+		for (int i = 0; i < childCount; i++) {
 			IEntity child;
-			try {
-				child = children.get(i);
-
-				if (child == null)
-					throw new ConcurrentModificationException();
-
-			} catch (Exception e) {
+			try { child = children.get(i); } catch (Exception e) {
 				Debug.e("Failed to draw child at index " + i);
-				++i;
 				continue;
 			}
 			child.onDraw(pGL, pCamera);
-			++i;
 		}
 	}
 
@@ -1077,21 +1074,13 @@ protected void onManagedUpdate(final float pSecondsElapsed) {
 		if(this.mChildren != null && !this.mChildrenIgnoreUpdate) {
 			final ArrayList<IEntity> entities = this.mChildren;
 			final int entityCount = entities.size();
-			int i = 0;
-			while (i < entityCount) {
+			for (int i = 0; i < entityCount; i++) {
 				IEntity entity;
-				try {
-					entity = entities.get(i);
-
-					if (entity == null)
-						throw new ConcurrentModificationException();
-
-				} catch (Exception e) {
+				try { entity = entities.get(i); } catch (Exception e) {
 					Debug.e("Failed to update entity at index " + i);
-					break;
+					continue;
 				}
 				entity.onUpdate(pSecondsElapsed);
-				++i;
 			}
 		}
 	}

AndEngine/src/org/anddev/andengine/entity/scene/Scene.java

@@ -269,8 +269,7 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 						case TouchEvent.ACTION_CANCEL:
 							this.mOnSceneTouchListenerBindings.remove(pSceneTouchEvent.getPointerID());
 					}
-					final Boolean handled = this.mOnSceneTouchListener.onSceneTouchEvent(this, pSceneTouchEvent);
-					if(handled != null && handled) {
+					if(this.mOnSceneTouchListener.onSceneTouchEvent(this, pSceneTouchEvent)) {
 						return true;
 					}
 				}
@@ -290,8 +289,7 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 						case TouchEvent.ACTION_CANCEL:
 							touchAreaBindings.remove(pSceneTouchEvent.getPointerID());
 					}
-					final Boolean handled = this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, boundTouchArea);
-					if(handled != null && handled) {
+					if(this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, boundTouchArea)) {
 						return true;
 					}
 				}
@@ -319,8 +317,7 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 					for(int i = 0; i < touchAreaCount; i++) {
 						final ITouchArea touchArea = touchAreas.get(i);
 						if (touchArea != null && touchArea.contains(sceneTouchEventX, sceneTouchEventY)) {
-							final Boolean handled = this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, touchArea);
-							if (handled != null && handled) {
+							if (this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, touchArea)) {
 								/* If binding of ITouchAreas is enabled and this is an ACTION_DOWN event,
 								 *  bind this ITouchArea to the PointerID. */
 								if (this.mTouchAreaBindingEnabled && isActionDown) {
@@ -334,8 +331,7 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 					for(int i = touchAreaCount - 1; i >= 0; i--) {
 						final ITouchArea touchArea = touchAreas.get(i);
 						if(touchArea.contains(sceneTouchEventX, sceneTouchEventY)) {
-							final Boolean handled = this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, touchArea);
-							if(handled != null && handled) {
+							if(this.onAreaTouchEvent(pSceneTouchEvent, sceneTouchEventX, sceneTouchEventY, touchArea)) {
 								/* If binding of ITouchAreas is enabled and this is an ACTION_DOWN event,
 								 *  bind this ITouchArea to the PointerID. */
 								if(this.mTouchAreaBindingEnabled && isActionDown) {
@@ -350,8 +346,7 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 		}
 		/* If no area was touched, the Scene itself was touched as a fallback. */
 		if(this.mOnSceneTouchListener != null){
-			final Boolean handled = this.mOnSceneTouchListener.onSceneTouchEvent(this, pSceneTouchEvent);
-			if(handled != null && handled) {
+			if(this.mOnSceneTouchListener.onSceneTouchEvent(this, pSceneTouchEvent)) {
 				/* If binding of ITouchAreas is enabled and this is an ACTION_DOWN event,
 				 *  bind the active OnSceneTouchListener to the PointerID. */
 				if(this.mOnSceneTouchListenerBindingEnabled && isActionDown) {
@@ -366,18 +361,18 @@ public boolean onSceneTouchEvent(final TouchEvent pSceneTouchEvent) {
 		}
 	}
 
-	private Boolean onAreaTouchEvent(final TouchEvent pSceneTouchEvent, final float sceneTouchEventX, final float sceneTouchEventY, final ITouchArea touchArea) {
+	private boolean onAreaTouchEvent(final TouchEvent pSceneTouchEvent, final float sceneTouchEventX, final float sceneTouchEventY, final ITouchArea touchArea) {
 		final float[] touchAreaLocalCoordinates = touchArea.convertSceneToLocalCoordinates(sceneTouchEventX, sceneTouchEventY);
 		final float touchAreaLocalX = touchAreaLocalCoordinates[Constants.VERTEX_INDEX_X];
 		final float touchAreaLocalY = touchAreaLocalCoordinates[Constants.VERTEX_INDEX_Y];
 
 		final boolean handledSelf = touchArea.onAreaTouched(pSceneTouchEvent, touchAreaLocalX, touchAreaLocalY);
 		if(handledSelf) {
-			return Boolean.TRUE;
+			return true;
 		} else if(this.mOnAreaTouchListener != null) {
 			return this.mOnAreaTouchListener.onAreaTouched(pSceneTouchEvent, touchArea, touchAreaLocalX, touchAreaLocalY);
 		} else {
-			return null;
+			return false;
 		}
 	}
 

AndEngine/src/org/anddev/andengine/entity/shape/RectangularShape.java

@@ -83,16 +83,22 @@ public float getBaseHeight() {
 	}
 
 	public void setWidth(final float pWidth) {
+		if (pWidth == mWidth)
+			return;
 		this.mWidth = pWidth;
 		this.updateVertexBuffer();
 	}
 
 	public void setHeight(final float pHeight) {
+		if (pHeight == mHeight)
+			return;
 		this.mHeight = pHeight;
 		this.updateVertexBuffer();
 	}
 
 	public void setSize(final float pWidth, final float pHeight) {
+		if (mWidth == pWidth && mHeight == pHeight)
+			return;
 		this.mWidth = pWidth;
 		this.mHeight = pHeight;
 		this.updateVertexBuffer();

AndEngine/src/org/anddev/andengine/opengl/font/Font.java

@@ -222,7 +222,6 @@ public synchronized void update(final GL10 pGL) {
 				bitmap.recycle();
 			}
 			lettersPendingToBeDrawnToTexture.clear();
-			System.gc();
 		}
 	}
 

AndEngine/src/org/anddev/andengine/opengl/texture/TextureManager.java

@@ -169,11 +169,6 @@ public synchronized void updateTextures(final GL10 pGL) {
 				texturesManaged.remove(textureToBeUnloaded);
 			}
 		}
-
-		/* Finally invoke the GC if anything has changed. */
-		if(texturesToBeLoadedCount > 0 || texturesToBeUnloadedCount > 0){
-			System.gc();
-		}
 	}
 
 	// ===========================================================

AndEngine/src/org/anddev/andengine/util/path/Path.java

@@ -119,7 +119,7 @@ public int getToTileColumn() {
 	// Inner and Anonymous Classes
 	// ===========================================================
 
-	public class Step {
+	public static class Step {
 		// ===========================================================
 		// Constants
 		// ===========================================================

AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="ru.nsu.ccfit.zuev.osuplus"
-      android:installLocation="auto">
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -14,6 +13,7 @@
     <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:icon="@drawable/ic_launcher"
@@ -25,7 +25,7 @@
         android:resizeableActivity="false"
         android:name="ru.nsu.ccfit.zuev.audio.serviceAudio.SaveServiceObject"
         tools:ignore="UnusedAttribute">
-        <service android:name="ru.nsu.ccfit.zuev.audio.serviceAudio.SongService"/>
+        <service android:name="ru.nsu.ccfit.zuev.audio.serviceAudio.SongService" android:exported="false"/>
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
@@ -54,7 +54,8 @@
 
         <activity
             android:name="com.edlplan.ui.ImportReplayActivity"
-            android:label="@string/act_import_replay">
+            android:label="@string/act_import_replay"
+            android:exported="true">
 
             <!-- firefox and file explorer -->
             <intent-filter>
@@ -94,6 +95,7 @@
             android:launchMode="singleInstance"
             android:screenOrientation="sensorLandscape"
             android:label="@string/app_name"
+            android:exported="false"
             tools:ignore="LockedOrientationActivity"/>
 
         <activity
@@ -103,6 +105,7 @@
             android:launchMode="singleInstance"
             android:screenOrientation="sensorLandscape"
             android:label="@string/app_name"
+            android:exported="true"
             tools:ignore="LockedOrientationActivity">
 
             <!--Multiplayer invite link-->
@@ -131,6 +134,7 @@
                 <data android:scheme="file" android:host="*"
                       android:mimeType="application/octet-stream" android:pathPattern=".*\\.odr"/>
             </intent-filter>
+
             <!-- firefox and file explorer -->
             <intent-filter>
                 <action