simplify

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/GlideHelper.kt

@@ -7,6 +7,7 @@
 
 package com.nextcloud.utils
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
@@ -72,6 +73,7 @@ object GlideHelper {
     private fun <T> RequestBuilder<T>.withLogging(methodName: String, identifier: String): RequestBuilder<T> =
         listener(GlideLogger(methodName, identifier))
 
+    @SuppressLint("CheckResult")
     private fun createSvgRequestBuilder(
         context: Context,
         uri: Uri,
@@ -96,63 +98,8 @@ object GlideHelper {
             .centerCrop()
     }
 
-    fun loadIntoImageView(
-        context: Context,
-        client: NextcloudClient,
-        url: String?,
-        imageView: ImageView,
-        @DrawableRes placeholderRes: Int,
-        circleCrop: Boolean = false
-    ) {
-        val validatedUrl = validateAndGetURL(url) ?: return
-
-        if (isSVG(validatedUrl)) {
-            val uri = validateAndGetURI(validatedUrl) ?: return
-            val requestBuilder = createSvgRequestBuilder(context, uri, placeholderRes)
-                .withLogging("loadIntoImageView", validatedUrl)
-            if (circleCrop) {
-                requestBuilder.circleCrop().into(imageView)
-            } else {
-                requestBuilder.into(imageView)
-            }
-        } else {
-            val requestBuilder = createUrlRequestBuilder(context, client, validatedUrl)
-                .placeholder(placeholderRes)
-                .error(placeholderRes)
-                .withLogging("loadIntoImageView", validatedUrl)
-            if (circleCrop) {
-                requestBuilder.circleCrop().into(imageView)
-            } else {
-                requestBuilder.into(imageView)
-            }
-        }
-    }
-
-    @Suppress("TooGenericExceptionCaught", "ReturnCount")
-    fun getDrawable(context: Context, client: NextcloudClient, urlString: String?): Drawable? {
-        val validatedUrl = validateAndGetURL(urlString) ?: return null
-
-        return try {
-            if (isSVG(validatedUrl)) {
-                val uri = validateAndGetURI(validatedUrl) ?: return null
-                createSvgRequestBuilder(context, uri)
-                    .withLogging("getDrawable", validatedUrl)
-                    .submit()
-                    .get()
-            } else {
-                createUrlRequestBuilder(context, client, validatedUrl)
-                    .withLogging("getDrawable", validatedUrl)
-                    .submit()
-                    .get()
-            }
-        } catch (e: Exception) {
-            Log_OC.e(TAG, "Error getting drawable: $e")
-            null
-        }
-    }
-
     @Suppress("TooGenericExceptionCaught")
-    fun downloadImageSynchronous(context: Context, url: String?): Bitmap? {
+    fun getBitmap(context: Context, url: String?): Bitmap? {
         val validatedUrl = validateAndGetURL(url) ?: return null
 
         return try {
@@ -188,31 +135,55 @@ object GlideHelper {
             })
     }
 
-    @Suppress("UNCHECKED_CAST", "TooGenericExceptionCaught")
+    @Suppress("UNCHECKED_CAST", "TooGenericExceptionCaught", "ReturnCount")
+    private fun <T> createRequestBuilder(context: Context, client: NextcloudClient, url: String?): RequestBuilder<T>? {
+        val validatedUrl = validateAndGetURL(url) ?: return null
+
+        return try {
+            val isSVG = isSVG(validatedUrl)
+
+            return if (isSVG) {
+                val uri = validateAndGetURI(validatedUrl) ?: return null
+                createSvgRequestBuilder(context, uri)
+            } else {
+                createUrlRequestBuilder(context, client, validatedUrl)
+            }
+                .withLogging("createRequestBuilder", validatedUrl) as RequestBuilder<T>?
+        } catch (e: Exception) {
+            Log_OC.e(TAG, "Error createRequestBuilder: $e")
+            null
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    fun loadIntoImageView(
+        context: Context,
+        client: NextcloudClient,
+        url: String?,
+        imageView: ImageView,
+        @DrawableRes placeholder: Int,
+        circleCrop: Boolean = false
+    ) {
+        createRequestBuilder<Drawable>(context, client, url)
+            ?.placeholder(placeholder)
+            ?.error(placeholder)
+            ?.apply { if (circleCrop) circleCrop() }
+            ?.into(imageView)
+    }
+
+    fun getDrawable(context: Context, client: NextcloudClient, urlString: String?): Drawable? =
+        createRequestBuilder<Drawable>(context, client, urlString)?.submit()?.get()
+
     fun <T> loadIntoTarget(
         context: Context,
         client: NextcloudClient,
         url: String,
         target: Target<T>,
         @DrawableRes placeholder: Int
     ) {
-        try {
-            val validatedUrl = validateAndGetURL(url) ?: return
-
-            if (isSVG(validatedUrl)) {
-                val uri = validateAndGetURI(validatedUrl) ?: return
-                val requestBuilder = createSvgRequestBuilder(context, uri, placeholder)
-                    .withLogging("loadIntoTarget", validatedUrl) as RequestBuilder<T>
-                requestBuilder.into(target)
-            } else {
-                val requestBuilder = createUrlRequestBuilder(context, client, validatedUrl)
-                    .placeholder(placeholder)
-                    .error(placeholder)
-                    .withLogging("loadIntoTarget", validatedUrl) as RequestBuilder<T>
-                requestBuilder.into(target)
-            }
-        } catch (e: Exception) {
-            Log_OC.e(TAG, "Failed to load into target: $e")
-        }
+        createRequestBuilder<T>(context, client, url)
+            ?.placeholder(placeholder)
+            ?.error(placeholder)
+            ?.into(target)
     }
 }

app/src/main/java/third_parties/ezvcard_android/ContactOperations.java

@@ -14,7 +14,6 @@
 
 import com.nextcloud.utils.GlideHelper;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.time.ZoneId;
@@ -519,7 +518,7 @@ private void convertPhotos(List<NonEmptyContentValues> contentValues, VCard vcar
 
     private void downloadPhoto(Photo photo) {
         String url = photo.getUrl();
-        Bitmap bitmap = GlideHelper.INSTANCE.downloadImageSynchronous(context, url);
+        Bitmap bitmap = GlideHelper.INSTANCE.getBitmap(context, url);
         if (bitmap != null) {
             ByteArrayOutputStream stream = new ByteArrayOutputStream();
             bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);