Merge pull request Catrobat#3192 from LPeteR90/CATROID-166

CATROID-166 Refactor ProjectUploadService to foreground service

Author: wslany

.idea/codeStyles/Project.xml

@@ -37,8 +37,8 @@
 import org.catrobat.catroid.io.asynctask.ProjectExportTask;
 import org.catrobat.catroid.io.asynctask.ProjectSaveTask;
 import org.catrobat.catroid.test.utils.Reflection;
-import org.catrobat.catroid.utils.NotificationData;
-import org.catrobat.catroid.utils.StatusBarNotificationManager;
+import org.catrobat.catroid.utils.notifications.NotificationData;
+import org.catrobat.catroid.utils.notifications.StatusBarNotificationManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

catroid/src/androidTest/java/org/catrobat/catroid/test/io/asynctask/ProjectExportTaskTest.java

@@ -225,11 +225,11 @@
         <activity
             android:name=".ui.filepicker.FilePickerActivity" />
 
-        <service android:name=".transfers.ProjectUploadService" />
+        <service android:name=".transfers.project.ProjectUploadService" />
         <service android:name=".transfers.ProjectDownloadService" />
         <service android:name=".transfers.MediaDownloadService" />
         <service android:name="com.parrot.freeflight.service.DroneControlService" />
-        <service android:name=".utils.StatusBarNotificationManager$NotificationActionService" />
+        <service android:name=".utils.notifications.StatusBarNotificationManager$NotificationActionService" />
         <service android:name=".cast.CastService" android:exported="false"/>
 
         <provider

catroid/src/androidTest/java/org/catrobat/catroid/test/ui/StatusBarNotificationManagerTest.java

@@ -227,6 +227,21 @@ public final class Constants {
 	public static final String EXTRA_PICTURE_PATH_POCKET_PAINT = "org.catrobat.extra.PAINTROID_PICTURE_PATH";
 	public static final String POCKET_PAINT_INTENT_ACTIVITY_NAME = "org.catrobat.paintroid.MainActivity";
 
+	// Intent Extra / Bundle Keys
+	public static final String EXTRA_PROJECT_NAME = "projectName";
+	public static final String EXTRA_PROJECT_DESCRIPTION = "projectDescription";
+	public static final String EXTRA_PROJECT_PATH = "projectPath";
+	public static final String EXTRA_PROJECT_ID = "projectId";
+	public static final String EXTRA_SCENE_NAMES = "sceneNames";
+	public static final String EXTRA_USER_EMAIL = "userEmail";
+	public static final String EXTRA_LANGUAGE = "language";
+	public static final String EXTRA_NOTIFICATION_ID = "notificationId";
+	public static final String EXTRA_RESULT_RECEIVER = "resultReceiver";
+	public static final String EXTRA_PROVIDER = "provider";
+	public static final String EXTRA_UPLOAD_NAME = "uploadName";
+
+	public static final int UPLOAD_RESULT_RECEIVER_RESULT_CODE = 1;
+
 	//Various:
 	public static final int BUFFER_8K = 8 * 1024;
 	public static final String PREF_PROJECTNAME_KEY = "projectName";
@@ -258,9 +273,13 @@ public final class Constants {
 	public static final int OFFSET_FOR_THINK_BUBBLES_AND_ARROW = 40;
 	public static final int JUMPING_SUMO_BATTERY_STATUS = 100;
 
+	public static final int UPLOAD_IMAGE_SCALE_WIDTH = 480;
+	public static final int UPLOAD_IMAGE_SCALE_HEIGHT = 480;
+
 	//Services + Notifications
 	public static final int UPDATE_DOWNLOAD_PROGRESS = 101;
 	public static final int UPDATE_DOWNLOAD_ERROR = 105;
+	public static final int MAX_PERCENT = 100;
 
 	//Up-/Download Status Codes
 	public static final int STATUS_CODE_INTERNAL_SERVER_ERROR = 500;

catroid/src/main/AndroidManifest.xml

@@ -23,11 +23,9 @@
 package org.catrobat.catroid.io;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.widget.ImageView;
 
-import org.catrobat.catroid.R;
 import org.catrobat.catroid.ui.UiUtils;
 import org.catrobat.catroid.utils.ImageEditing;
 
@@ -67,7 +65,8 @@ private class ScreenshotData {
 
 	private Map<ImageView, String> imageViews = Collections.synchronizedMap(new WeakHashMap<ImageView, String>());
 	private ExecutorService executorService;
-	private Context context;
+	private int thumbnailWidth;
+	private int thumbnailHeight;
 
 	private Map<String, Bitmap> imageCache = Collections.synchronizedMap(new LinkedHashMap<String, Bitmap>(
 			INITIAL_VALUE, LOAD_FACTOR, true) {
@@ -80,9 +79,10 @@ protected boolean removeEldestEntry(Map.Entry<String, Bitmap> eldest) {
 		}
 	});
 
-	public ProjectAndSceneScreenshotLoader(Context context) {
+	public ProjectAndSceneScreenshotLoader(int thumbnailWidth, int thumbnailHeight) {
 		executorService = Executors.newFixedThreadPool(POOL_SIZE);
-		this.context = context;
+		this.thumbnailWidth = thumbnailWidth;
+		this.thumbnailHeight = thumbnailHeight;
 	}
 
 	public void loadAndShowScreenshot(String projectName, String sceneName, boolean isBackpackScene, ImageView
@@ -135,9 +135,7 @@ public void run() {
 			if (!projectAndSceneImageFile.exists() || ImageEditing.getImageDimensions(pathOfScreenshot)[0] < 0) {
 				projectAndSceneImage = null;
 			} else {
-				int width = context.getResources().getDimensionPixelSize(R.dimen.project_thumbnail_width);
-				int height = context.getResources().getDimensionPixelSize(R.dimen.project_thumbnail_height);
-				projectAndSceneImage = ImageEditing.getScaledBitmapFromPath(pathOfScreenshot, width, height,
+				projectAndSceneImage = ImageEditing.getScaledBitmapFromPath(pathOfScreenshot, thumbnailWidth, thumbnailHeight,
 						ImageEditing.ResizeType.STAY_IN_RECTANGLE_WITH_SAME_ASPECT_RATIO, true);
 			}
 

catroid/src/main/java/org/catrobat/catroid/common/Constants.java

@@ -28,7 +28,7 @@
 
 import org.catrobat.catroid.R;
 import org.catrobat.catroid.io.ZipArchiver;
-import org.catrobat.catroid.utils.StatusBarNotificationManager;
+import org.catrobat.catroid.utils.notifications.StatusBarNotificationManager;
 
 import java.io.File;
 import java.io.IOException;