Release 1.3.0 (#5045)

* Migrate targetSDKVersion 34 and minSDKVersion 31 (#5027) * Increase Version Code and Version Number (#5028) * Migrate targetSDKVersion 34 and minSDKVersion 31 * Increase version code to 89 and version name to 1.3.0 * Increase Version Number to 95 (#5029) * Increase defaultVersionCode to 95 * Decrease minSDKVersion to 28 * Teamday fixes (#5032) * Fix German strings, add new german string * Remove 'Add from local' option from the actors and objects popup menu * Fix crash when trying to paste empty clipboard * Fix checkstyle * IDE-264 Migrate targetSDKVersion 34 (#5026) * IDE-264 Migrate targetSDKVersion 34 * IDE-264 Set ForegroundServiceType for project upload and download * Increase defaultVersionCode to 97 (#5037) --------- Co-authored-by: Frajhamster <51791805+Frajhamster@users.noreply.github.com> Co-authored-by: Thomas Reichel <thomas.reichel.1989@gmail.com>
Catrobat · Oct 30, 2024 · 2683546 · 2683546
1 parent 6007a2d
commit 2683546
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/catroid/build.gradle b/catroid/build.gradle
@@ -102,11 +102,11 @@ ext.copyGoogleServicesFile = { flavorName, flavorId ->
     }
 }
 
-def defaultVersionCode = 88
-def defaultVersionName = "1.1.2"
+def defaultVersionCode = 97
+def defaultVersionName = "1.3.0"
 
 android {
-    compileSdk 33
+    compileSdk 34
     buildToolsVersion = "33.0.2"
 
     namespace 'org.catrobat.catroid'
@@ -117,9 +117,8 @@ android {
     }
 
     defaultConfig {
-
-        minSdkVersion 23
-        targetSdkVersion 33
+        minSdkVersion 28
+        targetSdkVersion 34
         applicationId appId
         testInstrumentationRunner 'org.catrobat.catroid.runner.UiTestApplicationRunner'
         versionCode defaultVersionCode
@@ -197,7 +196,6 @@ android {
         }
     }
 
-    dexOptions.javaMaxHeapSize "4g"
     packagingOptions {
         jniLibs {
             excludes += ['lib/mips/*', 'lib/armeabi/*']

diff --git a/catroid/src/main/AndroidManifest.xml b/catroid/src/main/AndroidManifest.xml
@@ -43,7 +43,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
 
@@ -83,6 +82,10 @@
     android:name="android.hardware.camera"
     android:required="false" />
 
+    <!-- foreground services -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
     <application
         android:name=".CatroidApplication"
         android:allowBackup="false"
@@ -249,8 +252,12 @@
         <activity
             android:name=".ui.filepicker.FilePickerActivity" />
 
-        <service android:name=".transfers.project.ProjectUploadService" />
-        <service android:name=".transfers.project.ProjectDownloadService" />
+        <service
+            android:name=".transfers.project.ProjectUploadService"
+            android:foregroundServiceType="dataSync" />
+        <service
+            android:name=".transfers.project.ProjectDownloadService"
+            android:foregroundServiceType="dataSync" />
         <service android:name=".transfers.MediaDownloadService" />
         <service android:name=".utils.notifications.StatusBarNotificationManager$NotificationActionService" />
         <service android:name=".cast.CastService"/>

diff --git a/catroid/src/main/java/org/catrobat/catroid/common/Constants.java b/catroid/src/main/java/org/catrobat/catroid/common/Constants.java
@@ -42,7 +42,7 @@
 
 public final class Constants {
 
-	public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.12;
+	public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.13;
 	public static final String REMOTE_DISPLAY_APP_ID = "CEBB9229";
 	public static final int CAST_CONNECTION_TIMEOUT = 5000; //in milliseconds
 	public static final int CAST_NOT_SEEING_DEVICE_TIMEOUT = 3000; //in

diff --git a/catroid/src/main/java/org/catrobat/catroid/formulaeditor/InternFormula.java b/catroid/src/main/java/org/catrobat/catroid/formulaeditor/InternFormula.java
@@ -730,6 +730,10 @@ private CursorTokenPropertiesAfterModification insertRightToCurrentToken(List<In
 	}
 
 	private CursorTokenPropertiesAfterModification setCursorPositionAndSelectionAfterInput(int insertedInternTokenIndex) {
+		if (internTokenFormulaList.isEmpty()) {
+			return CursorTokenPropertiesAfterModification.RIGHT;
+		}
+
 		InternToken insertedInternToken = internTokenFormulaList.get(insertedInternTokenIndex);
 
 		if (insertedInternToken.getInternTokenType() == InternTokenType.FUNCTION_NAME) {

diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt
@@ -86,7 +86,8 @@ class ProjectDownloadService : IntentService("ProjectDownloadService") {
         val zipFileString = File(File(CACHE_DIRECTORY, TMP_DIRECTORY_NAME), DOWNLOAD_FILE_NAME).absolutePath
         val destinationFile = File(zipFileString)
 
-        if ((destinationFile.parentFile.isDirectory or destinationFile.parentFile.mkdirs()).not()) {
+        if (((destinationFile.parentFile?.isDirectory ?: false) or
+                (destinationFile.parentFile?.mkdirs() ?: false)).not()) {
             ToastUtil.showError(this, R.string.error_project_download)
             return
         }

diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.kt
@@ -385,6 +385,7 @@ class SpriteListFragment : RecyclerViewFragment<Sprite?>() {
         }
         if (item !is GroupSprite) {
             popupMenu.menu.findItem(R.id.backpack).setTitle(R.string.pack)
+            popupMenu.menu.removeItem(R.id.from_local)
         }
         popupMenu.show()
     }

diff --git a/catroid/src/main/res/values-de/strings.xml b/catroid/src/main/res/values-de/strings.xml
@@ -325,7 +325,7 @@
     <string formatted="false" name="am_merge_error">Es wird keine Zusammenlegung durchgeführt. Es müssen genau 2 Projekte ausgewählt werden, welche zusammengeführt werden sollen.</string>
     <string formatted="false" name="am_backpack">Einpacken</string>
     <string formatted="false" name="am_unpack">Auspacken</string>
-    <string formatted="false" name="am_copy">Kopiert</string>
+    <string formatted="false" name="am_copy">Kopieren</string>
     <string formatted="false" name="am_delete">Löschen</string>
     <string formatted="false" name="am_rename">Umbenennen</string>
     <string formatted="false" name="am_convert">Konvertieren</string>
@@ -334,7 +334,7 @@
     <string formatted="false" name="list_headline_sprites">Figuren und Objekte</string>
     <!-- Options Menu Options -->
     <string formatted="false" name="backpack">Rucksack</string>
-    <string formatted="false" name="copy">Kopiert</string>
+    <string formatted="false" name="copy">Kopieren</string>
     <string formatted="false" name="delete">Löschen</string>
     <string formatted="false" name="rename">Umbenennen</string>
     <string formatted="false" name="merge">Zusammenführen</string>
@@ -614,6 +614,7 @@
     <string formatted="false" name="add_look_choose_image">Bild auswählen</string>
     <string formatted="false" name="add_look_media_library">Medienbibliothek</string>
     <string formatted="false" name="add_look_from_local_project">Lokale Projekte</string>
+    <string formatted="false" name="add_look_actors_and_object">Lokale Figuren und Objekte</string>
     <!--  -->
     <!-- NewSoundDialog -->
     <string formatted="false" name="new_sound_dialog_title">Klang hinzufügen</string>
@@ -683,8 +684,8 @@
     <string formatted="false" name="brick_context_dialog_move_script">Skript bewegen</string>
     <string formatted="false" name="brick_context_dialog_move_definition">Verschiebe diese Definition</string>
     <string formatted="false" name="brick_context_dialog_delete_brick">Baustein löschen</string>
-    <string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopiert</string>
-    <string formatted="false" name="brick_context_dialog_copy_script">Skript kopiert</string>
+    <string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopieren</string>
+    <string formatted="false" name="brick_context_dialog_copy_script">Skript kopieren</string>
     <string formatted="false" name="brick_context_dialog_formula_edit_brick">Formel bearbeiten</string>
     <string formatted="false" name="brick_context_dialog_delete_script">Skript löschen</string>
     <string formatted="false" name="brick_context_dialog_delete_definition">Lösche diese Definition</string>