Merge pull request #1358 from khalid-nasralla/PAINTROID-803

PAINTROID-803 Use new media library for Import image tool

Author: ThorstenBandel

Paintroid/build.gradle

@@ -110,7 +110,6 @@ android {
         signedRelease {
             initWith(release)
             signingConfig = signingConfigs.signedRelease
-
         }
         debug { }
     }

Paintroid/src/main/java/org/catrobat/paintroid/common/Constants.kt

@@ -24,7 +24,7 @@ import java.io.File
 const val PAINTROID_PICTURE_PATH = "org.catrobat.extra.PAINTROID_PICTURE_PATH"
 const val PAINTROID_PICTURE_NAME = "org.catrobat.extra.PAINTROID_PICTURE_NAME"
 const val TEMP_PICTURE_NAME = "catroidTemp"
-const val MEDIA_GALLEY_URL = "https://share.catrob.at/pocketcode/media-library/looks"
+const val MEDIA_GALLEY_URL = "https://catrobat.org/figures-download/"
 const val ABOUT_DIALOG_FRAGMENT_TAG = "aboutdialogfragment"
 const val LIKE_US_DIALOG_FRAGMENT_TAG = "likeusdialogfragment"
 const val RATE_US_DIALOG_FRAGMENT_TAG = "rateusdialogfragment"

Paintroid/src/main/java/org/catrobat/paintroid/web/MediaGalleryWebViewClient.java

@@ -23,7 +23,6 @@
 package org.catrobat.paintroid.web;
 
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.view.View;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
@@ -46,16 +45,9 @@ public MediaGalleryWebViewClient(WebClientCallback callback) {
 		this.callback = callback;
 	}
 
-	private static final String GALLERY_ROOT = "https://share.catrob.at/pocketcode/";
-
 	@Override
 	public void onPageStarted(WebView view, String url, Bitmap favicon) {
-		// avoid regex 'matches' – we only want a prefix check
-		if (!startsWithGalleryRoot(url)) {
-			showLoading(view);
-		} else {
-			callback.finish();
-		}
+		showLoading(view);
 	}
 
 	@Override
@@ -92,17 +84,6 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
 		callback.finish();
 	}
 
-	private boolean startsWithGalleryRoot(String url) {
-		try {
-			Uri u = Uri.parse(url);
-			// normalize to compare robustly
-			String normalized = u.getScheme() + "://" + u.getHost() + (u.getPort() != -1 ? ":" + u.getPort() : "") + u.getPath();
-			return normalized.startsWith(GALLERY_ROOT);
-		} catch (Exception ignored) {
-			return false;
-		}
-	}
-
 	private void showLoading(View anchor) {
 		if (loadingDialog != null) {
 			return;