Merge pull request Catrobat#3541 from MeIbtihajnaeem/develop

CATROID-458:Crash while creating a new Actor

Author: wslany

catroid/src/main/java/org/catrobat/catroid/sensing/CollisionPolygonCreationTask.java

@@ -24,20 +24,24 @@
 package org.catrobat.catroid.sensing;
 
 import android.os.Process;
+import android.util.Log;
 
 import org.catrobat.catroid.common.LookData;
 
 public class CollisionPolygonCreationTask implements Runnable {
-
 	private LookData lookdata;
-
+	private static final String TAG = CollisionPolygonCreationTask.class.getSimpleName();
 	public CollisionPolygonCreationTask(LookData lookdata) {
+
 		this.lookdata = lookdata;
 	}
-
 	@Override
 	public void run() {
 		android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
-		lookdata.getCollisionInformation().loadCollisionPolygon();
+		try {
+			lookdata.getCollisionInformation().loadCollisionPolygon();
+		} catch (NullPointerException exception) {
+			Log.e(TAG, "Image format not supported ");
+		}
 	}
 }

catroid/src/main/java/org/catrobat/catroid/ui/ProjectActivity.java

@@ -264,6 +264,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		}
 	}
 
+	public void imgFormatNotSupportedDialog() {
+
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this).setMessage(getString(R.string.Image_format_not_supported)).setPositiveButton(getString(R.string.ok), (dialog1, which) -> dialog1.cancel());
+
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		alertDialog.show();
+	}
+
 	public void addSpriteFromUri(final Uri uri) {
 		final Scene currentScene = ProjectManager.getInstance().getCurrentlyEditedScene();
 
@@ -295,12 +303,15 @@ public void addSpriteFromUri(final Uri uri) {
 					currentScene.addSprite(sprite);
 					try {
 						File imageDirectory = new File(currentScene.getDirectory(), IMAGE_DIRECTORY_NAME);
-						File file = StorageOperations
-								.copyUriToDir(getContentResolver(), uri, imageDirectory, lookFileName);
-
+						File file = StorageOperations.copyUriToDir(getContentResolver(), uri, imageDirectory, lookFileName);
 						LookData lookData = new LookData(textInput, file);
-						sprite.getLookList().add(lookData);
-						lookData.getCollisionInformation().calculate();
+						if (lookData.getImageMimeType() == null) {
+							imgFormatNotSupportedDialog();
+							currentScene.removeSprite(sprite);
+						} else {
+							sprite.getLookList().add(lookData);
+							lookData.getCollisionInformation().calculate();
+						}
 					} catch (IOException e) {
 						Log.e(TAG, Log.getStackTraceString(e));
 					}

catroid/src/main/res/values/strings.xml

@@ -538,7 +538,7 @@
     <string name="nfc_tag_name_label">NFC tag name</string>
     <string name="string_label">Text</string>
     <string name="data_label">Name</string>
-
+    <string name="Image_format_not_supported">Image format not supported</string>
     <!-- Details -->
     <string name="project_details">Last access: %s, size: %s</string>
     <string name="last_access_today">today, %s</string>