IDE-247 Fix further warnings

Catrobat · Sep 17, 2024 · 9dec94d · 9dec94d
1 parent cd1f6d6
commit 9dec94d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/catroid/config/lint.xml b/catroid/config/lint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  ~ Catroid: An on-device visual programming system for Android devices
- ~ Copyright (C) 2010-2022 The Catrobat Team
+ ~ Copyright (C) 2010-2024 The Catrobat Team
  ~ (<http://developer.catrobat.org/credits>)
  ~
  ~ This program is free software: you can redistribute it and/or modify
@@ -53,5 +53,5 @@
  </issue>
 
  <issue id="ContentDescription" severity="ignore" />
-
+ <issue id="NotifyDataSetChanged" severity="ignore" />
 </lint >
diff --git a/catroid/src/debug/AndroidManifest.xml b/catroid/src/debug/AndroidManifest.xml
@@ -83,6 +83,8 @@
  <application
  android:name=".CatroidApplication"
  android:allowBackup="false"
+ android:fullBackupContent="false"
+ android:dataExtractionRules="@xml/data_extraction_rules"
  android:icon="${appIcon}"
  android:label="${appName}"
  android:theme="@style/Catroid"

diff --git a/catroid/src/main/java/org/catrobat/catroid/stage/StageListener.java b/catroid/src/main/java/org/catrobat/catroid/stage/StageListener.java
@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2023 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -91,6 +91,7 @@
 import java.util.Objects;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.annotation.VisibleForTesting;
 import kotlinx.coroutines.GlobalScope;
 
@@ -518,6 +519,7 @@ public void pause() {
  }
  }
 
+ @OptIn(markerClass = kotlinx.coroutines.DelicateCoroutinesApi.class)
  @Override
  public void render() {
  CameraManager cameraManager = StageActivity.getActiveCameraManager();
@@ -527,11 +529,13 @@ public void render() {
 
  if (reloadProject) {
  stage.clear();
- if (penActor != null)
+ if (penActor != null) {
  penActor.dispose();
+ }
 
- if (plotActor != null)
+ if (plotActor != null) {
  plotActor.dispose();
+ }
 
  embroideryPatternManager.clear();
 

diff --git a/catroid/src/main/res/xml/data_extraction_rules.xml b/catroid/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Catroid: An on-device visual programming system for Android devices
+ ~ Copyright (C) 2010-2024 The Catrobat Team
+ ~ (<http://developer.catrobat.org/credits>)
+ ~
+ ~ This program is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation, either version 3 of the
+ ~ License, or (at your option) any later version.
+ ~
+ ~ An additional term exception under section 7 of the GNU Affero
+ ~ General Public License, version 3, is available at
+ ~ http://developer.catrobat.org/license_additional_term
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU Affero General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Affero General Public License
+ ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<data-extraction-rules>
+ <cloud-backup>
+ <exclude domain="root" />
+ <exclude domain="file" />
+ <exclude domain="database" />
+ <exclude domain="sharedpref" />
+ <exclude domain="external" />
+ </cloud-backup>
+ <device-transfer>
+ <exclude domain="root" />
+ <exclude domain="file" />
+ <exclude domain="database" />
+ <exclude domain="sharedpref" />
+ <exclude domain="external" />
+ </device-transfer>
+</data-extraction-rules>