Lp/inapp image preloading

clevertap-core/src/main/java/com/clevertap/android/sdk/ILogger.java

@@ -0,0 +1,31 @@
+package com.clevertap.android.sdk;
+
+public interface ILogger {
+    void debug(String message);
+
+    void debug(String suffix, String message);
+
+    void debug(String suffix, String message, Throwable t);
+
+    @SuppressWarnings("unused")
+    void debug(String message, Throwable t);
+
+    @SuppressWarnings("unused")
+    void info(String message);
+
+    void info(String suffix, String message);
+
+    @SuppressWarnings("unused")
+    void info(String suffix, String message, Throwable t);
+
+    @SuppressWarnings("unused")
+    void info(String message, Throwable t);
+
+    void verbose(String message);
+
+    void verbose(String suffix, String message);
+
+    void verbose(String suffix, String message, Throwable t);
+
+    void verbose(String message, Throwable t);
+}

clevertap-core/src/main/java/com/clevertap/android/sdk/Logger.java

@@ -2,7 +2,7 @@
 
 import android.util.Log;
 
-public final class Logger {
+public final class Logger implements ILogger {
 
     private int debugLevel;
 
@@ -94,12 +94,14 @@ public static void v(String message, Throwable t) {
         this.debugLevel = level;
     }
 
+    @Override
     public void debug(String message) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.d(Constants.CLEVERTAP_LOG_TAG, message);
         }
     }
 
+    @Override
     public void debug(String suffix, String message) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()) {
             if (message.length() > 4000) {
@@ -111,52 +113,60 @@ public void debug(String suffix, String message) {
         }
     }
 
+    @Override
     public void debug(String suffix, String message, Throwable t) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.d(Constants.CLEVERTAP_LOG_TAG + ":" + suffix, message, t);
         }
     }
 
+    @Override
     @SuppressWarnings("unused")
     public void debug(String message, Throwable t) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.d(Constants.CLEVERTAP_LOG_TAG, message, t);
         }
     }
 
+    @Override
     @SuppressWarnings("unused")
     public void info(String message) {
         if (getDebugLevel() >= CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.i(Constants.CLEVERTAP_LOG_TAG, message);
         }
     }
 
+    @Override
     public void info(String suffix, String message) {
         if (getDebugLevel() >= CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.i(Constants.CLEVERTAP_LOG_TAG + ":" + suffix, message);
         }
     }
 
+    @Override
     @SuppressWarnings("unused")
     public void info(String suffix, String message, Throwable t) {
         if (getDebugLevel() >= CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.i(Constants.CLEVERTAP_LOG_TAG + ":" + suffix, message, t);
         }
     }
 
+    @Override
     @SuppressWarnings("unused")
     public void info(String message, Throwable t) {
         if (getDebugLevel() >= CleverTapAPI.LogLevel.INFO.intValue()) {
             Log.i(Constants.CLEVERTAP_LOG_TAG, message, t);
         }
     }
 
+    @Override
     public void verbose(String message) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()) {
             Log.v(Constants.CLEVERTAP_LOG_TAG, message);
         }
     }
 
+    @Override
     public void verbose(String suffix, String message) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()) {
             if (message.length() > 4000) {
@@ -168,12 +178,14 @@ public void verbose(String suffix, String message) {
         }
     }
 
+    @Override
     public void verbose(String suffix, String message, Throwable t) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()) {
             Log.v(Constants.CLEVERTAP_LOG_TAG + ":" + suffix, message, t);
         }
     }
 
+    @Override
     public void verbose(String message, Throwable t) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.DEBUG.intValue()) {
             Log.v(Constants.CLEVERTAP_LOG_TAG, message, t);

clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java

@@ -36,16 +36,11 @@
 import com.clevertap.android.sdk.network.DownloadedBitmap;
 import com.clevertap.android.sdk.network.DownloadedBitmapFactory;
 import com.google.firebase.messaging.RemoteMessage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import javax.net.ssl.HttpsURLConnection;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -164,37 +159,6 @@ public static long getNowInMillis() {
         return System.currentTimeMillis();
     }
 
-    public static byte[] getByteArrayFromImageURL(String srcUrl) {
-        srcUrl = srcUrl.replace("///", "/");
-        srcUrl = srcUrl.replace("//", "/");
-        srcUrl = srcUrl.replace("http:/", "http://");
-        srcUrl = srcUrl.replace("https:/", "https://");
-        HttpsURLConnection connection = null;
-        try {
-            URL url = new URL(srcUrl);
-            connection = (HttpsURLConnection) url.openConnection();
-            InputStream is = connection.getInputStream();
-            byte[] buffer = new byte[8192];
-            int bytesRead;
-            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            while ((bytesRead = is.read(buffer)) != -1) {
-                baos.write(buffer, 0, bytesRead);
-            }
-            return baos.toByteArray();
-        } catch (IOException e) {
-            Logger.v("Error processing image bytes from url: " + srcUrl);
-            return null;
-        } finally {
-            try {
-                if (connection != null) {
-                    connection.disconnect();
-                }
-            } catch (Throwable t) {
-                Logger.v("Couldn't close connection!", t);
-            }
-        }
-    }
-
     @SuppressLint("MissingPermission")
     public static String getCurrentNetworkType(final Context context) {
         try {
@@ -329,11 +293,7 @@ public static boolean isActivityDead(Activity activity) {
         if (activity == null) {
             return true;
         }
-        boolean isActivityDead = activity.isFinishing();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            isActivityDead = isActivityDead || activity.isDestroyed();
-        }
-        return isActivityDead;
+        return activity.isFinishing() || activity.isDestroyed();
     }
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -497,14 +457,14 @@ private static boolean checkForExoPlayer() {
             if (logo == null) {
                 throw new Exception("Logo is null");
             }
-            return DownloadedBitmapFactory.INSTANCE.successBitmap(drawableToBitmap(logo), 0);
+            return DownloadedBitmapFactory.INSTANCE.successBitmap(drawableToBitmap(logo), 0, null);
         } catch (Exception e) {
             e.printStackTrace();
             // Try to get the app icon now
             // No error handling here - handle upstream
             return DownloadedBitmapFactory.INSTANCE.successBitmap(
                     drawableToBitmap(context.getPackageManager().getApplicationIcon(context.getApplicationInfo())),
-                    0);
+                    0, null);
         }
     }
 

clevertap-core/src/main/java/com/clevertap/android/sdk/bitmap/BitmapDownloader.kt

@@ -47,8 +47,11 @@ class BitmapDownloader(
                     return DownloadedBitmapFactory.nullBitmapWithStatus(SIZE_LIMIT_EXCEEDED)
                 }
 
-                return bitmapInputStreamReader.readInputStream(inputStream, this, downloadStartTimeInMilliseconds)
-                    ?: DownloadedBitmapFactory.nullBitmapWithStatus(DOWNLOAD_FAILED)
+                return bitmapInputStreamReader.readInputStream(
+                    inputStream = inputStream,
+                    connection = this,
+                    downloadStartTimeInMilliseconds = downloadStartTimeInMilliseconds
+                )
             }
         } catch (e: Throwable) {
             Logger.v("Couldn't download the notification icon. URL was: $srcUrl")

clevertap-core/src/main/java/com/clevertap/android/sdk/bitmap/BitmapInputStreamDecoder.kt

@@ -5,23 +5,58 @@ import com.clevertap.android.sdk.Logger
 import com.clevertap.android.sdk.Utils
 import com.clevertap.android.sdk.network.DownloadedBitmap
 import com.clevertap.android.sdk.network.DownloadedBitmapFactory
+import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import java.net.HttpURLConnection
 
-class BitmapInputStreamDecoder(private val nextBitmapInputStreamReader: GzipBitmapInputStreamReader? = null) :
-    IBitmapInputStreamReader {
+open class BitmapInputStreamDecoder(
+    val saveBytes: Boolean = false,
+    val logger: Logger? = null
+) : IBitmapInputStreamReader {
 
     override fun readInputStream(
         inputStream: InputStream,
         connection: HttpURLConnection,
         downloadStartTimeInMilliseconds: Long
-    ): DownloadedBitmap? {
-        Logger.v("reading bitmap input stream in BitmapInputStreamDecoder....")
-
-        return nextBitmapInputStreamReader?.readInputStream(inputStream,connection, downloadStartTimeInMilliseconds)
-            ?: DownloadedBitmapFactory.successBitmap(
-                BitmapFactory.decodeStream(inputStream),
-                Utils.getNowInMillis() - downloadStartTimeInMilliseconds
-            )
+    ): DownloadedBitmap {
+        logger?.verbose("reading bitmap input stream in BitmapInputStreamDecoder....")
+
+        val bufferForHttpInputStream = ByteArray(16384)
+        val finalDataFromHttpInputStream = ByteArrayOutputStream()
+
+        var totalBytesRead = 0
+        var bytesRead: Int
+
+        // Read data from input stream
+        while (inputStream.read(bufferForHttpInputStream).also { bytesRead = it } != -1) {
+            totalBytesRead += bytesRead
+            finalDataFromHttpInputStream.write(bufferForHttpInputStream, 0, bytesRead)
+            logger?.verbose("Downloaded $totalBytesRead bytes")
+        }
+        logger?.verbose("Total download size for bitmap = $totalBytesRead")
+
+        val dataReadFromStreamInByteArray = finalDataFromHttpInputStream.toByteArray()
+        // Decode the bitmap from decompressed data
+        val bitmap = BitmapFactory.decodeByteArray(
+            dataReadFromStreamInByteArray,
+            0,
+            dataReadFromStreamInByteArray.size
+        )
+
+        val fileLength = connection.contentLength
+        if (fileLength != -1 && fileLength != totalBytesRead) {
+            logger?.debug("File not loaded completely not going forward. URL was: ${connection.url}")
+            return DownloadedBitmapFactory.nullBitmapWithStatus(DownloadedBitmap.Status.DOWNLOAD_FAILED)
+        }
+
+        return DownloadedBitmapFactory.successBitmap(
+            bitmap = bitmap,
+            downloadTime = Utils.getNowInMillis() - downloadStartTimeInMilliseconds,
+            data = if (saveBytes) {
+                dataReadFromStreamInByteArray
+            } else {
+                null
+            }
+        )
     }
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/bitmap/BitmapInputStreamReader.kt

@@ -20,7 +20,7 @@ class BitmapInputStreamReader(
         inputStream: InputStream,
         connection: HttpURLConnection,
         downloadStartTimeInMilliseconds: Long
-    ): DownloadedBitmap? {
+    ): DownloadedBitmap {
 
         Logger.v("reading bitmap input stream in BitmapInputStreamReader....")
         val bufferForHttpInputStream = ByteArray(16384)
@@ -47,22 +47,31 @@ class BitmapInputStreamReader(
         }
 
         return nextBitmapInputStreamReader?.readInputStream(
-            ByteArrayInputStream(finalDataFromHttpInputStream.toByteArray()),
-            connection,
-            downloadStartTimeInMilliseconds
-        ) ?: getDownloadedBitmapFromStream(finalDataFromHttpInputStream, downloadStartTimeInMilliseconds)
+            inputStream = ByteArrayInputStream(finalDataFromHttpInputStream.toByteArray()),
+            connection = connection,
+            downloadStartTimeInMilliseconds = downloadStartTimeInMilliseconds
+        ) ?: getDownloadedBitmapFromStream(
+            dataReadFromStream = finalDataFromHttpInputStream,
+            downloadStartTimeInMilliseconds = downloadStartTimeInMilliseconds
+        )
     }
 
     private fun getDownloadedBitmapFromStream(
-        dataReadFromStream: ByteArrayOutputStream, downloadStartTimeInMilliseconds: Long
+        dataReadFromStream: ByteArrayOutputStream,
+        downloadStartTimeInMilliseconds: Long
     ): DownloadedBitmap {
 
         val dataReadFromStreamInByteArray = dataReadFromStream.toByteArray()
         // Decode the bitmap from decompressed data
-        val bitmap =
-            BitmapFactory.decodeByteArray(dataReadFromStreamInByteArray, 0, dataReadFromStreamInByteArray.size)
+        val bitmap = BitmapFactory.decodeByteArray(
+            dataReadFromStreamInByteArray,
+            0,
+            dataReadFromStreamInByteArray.size
+        )
+
         return DownloadedBitmapFactory.successBitmap(
-            bitmap, Utils.getNowInMillis() - downloadStartTimeInMilliseconds
+            bitmap = bitmap,
+            downloadTime = Utils.getNowInMillis() - downloadStartTimeInMilliseconds
         )
     }
 }