Skip to content

Commit b35b3d9

Browse files
committed
Pull request #476: Aboldyrev MM-5789 asyncs
Merge in MML/infobip-mobile-messaging-android from aboldyrev-MM-5789-asyncs to master Squashed commit of the following: commit f88e4dbc2eb531c7b2daf9bd9dfe59faf57d1661 Merge: 5a9a74df 9e4f1ac Author: Alexander Boldyrev <alexander.boldyrev@infobip.com> Date: Wed Jan 29 11:50:59 2025 +0300 Merge branch 'master' into aboldyrev-MM-5789-asyncs commit 5a9a74df4df55f5f8f6699118e6d79e8d2132d0a Author: Alexander Boldyrev <alexander.boldyrev@infobip.com> Date: Wed Jan 29 11:49:30 2025 +0300 mmasync updated commit dc826e1876ae92d2796a961070a1be7d16bf76b0 Author: Alexander Boldyrev <alexander.boldyrev@infobip.com> Date: Thu Dec 26 20:35:53 2024 +0300 cleaning up commit 2d45540b0dfb08adf6d9af5c4ffa04d753391136 Merge: 98c1b4e2 6e56ea5 Author: Alexander Boldyrev <alexander.boldyrev@infobip.com> Date: Thu Dec 26 18:14:34 2024 +0300 Merge branch 'refs/heads/master' into aboldyrev-MM-5789-asyncs commit 98c1b4e2e161b9d371fd8c8904cf967e005d3e09 Author: Alexander Boldyrev <alexander.boldyrev@infobip.com> Date: Thu Dec 26 18:09:32 2024 +0300 asynctask moved to SDK level
1 parent 0570e9b commit b35b3d9

File tree

10 files changed

+345
-19
lines changed

10 files changed

+345
-19
lines changed

infobip-mobile-messaging-android-chat-sdk/src/main/java/org/infobip/mobile/messaging/chat/attachments/InAppChatAttachmentHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import android.content.Intent;
77
import android.database.Cursor;
88
import android.net.Uri;
9-
import android.os.AsyncTask;
109
import android.os.Environment;
1110
import android.provider.MediaStore;
1211
import android.provider.OpenableColumns;
1312

1413
import org.infobip.mobile.messaging.logging.MobileMessagingLogger;
1514
import org.infobip.mobile.messaging.mobileapi.InternalSdkError;
15+
import org.infobip.mobile.messaging.mobileapi.common.MMAsyncTask;
1616
import org.infobip.mobile.messaging.util.DateTimeUtil;
1717
import org.infobip.mobile.messaging.util.SoftwareInformation;
1818

@@ -32,7 +32,7 @@ public class InAppChatAttachmentHelper {
3232
public static final String MIME_TYPE_IMAGE_JPEG = "image/jpeg";
3333

3434
public static void makeAttachment(final FragmentActivity context, final Intent data, final Uri capturedMediaStoreUri, final InAppChatAttachmentHelper.InAppChatAttachmentHelperListener listener) {
35-
AsyncTask.execute(() -> {
35+
MMAsyncTask.execute(() -> {
3636
try {
3737
//From media store Uri we need to get real Uri of the file
3838
Uri capturedMediaRealUri = getUriFromMediaStoreURI(capturedMediaStoreUri, context);

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/interactive/inapp/image/DownloadImageTask.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import android.graphics.Bitmap;
44
import android.graphics.BitmapFactory;
5-
import android.os.AsyncTask;
65
import android.os.Build;
76
import android.security.NetworkSecurityPolicy;
87

98
import org.infobip.mobile.messaging.logging.MobileMessagingLogger;
9+
import org.infobip.mobile.messaging.mobileapi.common.MMAsyncTask;
1010

1111
import java.io.InputStream;
1212
import java.net.URL;
@@ -15,7 +15,7 @@
1515
* @author sslavin
1616
* @since 12/04/2018.
1717
*/
18-
public abstract class DownloadImageTask extends AsyncTask<String, Void, Bitmap> {
18+
public abstract class DownloadImageTask extends MMAsyncTask<String, Void, Bitmap> {
1919

2020
private final static int MAX_DOWNLOAD_ATTEMPTS = 3;
2121

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/interactive/inapp/view/InAppWebViewDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.content.Context;
88
import android.graphics.Bitmap;
99
import android.graphics.Rect;
10-
import android.os.AsyncTask;
1110
import android.os.Handler;
1211
import android.os.Looper;
1312
import android.util.DisplayMetrics;
@@ -37,6 +36,7 @@
3736
import org.infobip.mobile.messaging.interactive.inapp.InAppWebViewMessage;
3837
import org.infobip.mobile.messaging.interactive.inapp.InAppWebViewMessage.InAppWebViewPosition;
3938
import org.infobip.mobile.messaging.logging.MobileMessagingLogger;
39+
import org.infobip.mobile.messaging.mobileapi.common.MMAsyncTask;
4040
import org.infobip.mobile.messaging.platform.AndroidBroadcaster;
4141
import org.infobip.mobile.messaging.platform.Time;
4242
import org.infobip.mobile.messaging.util.PreferenceHelper;
@@ -548,7 +548,7 @@ private static void logWebViewError(int errorCode) {
548548
}
549549

550550
@SuppressLint("StaticFieldLeak")
551-
public class ConnectionTimeoutHandler extends AsyncTask<Void, Void, String> {
551+
public class ConnectionTimeoutHandler extends MMAsyncTask<Void, Void, String> {
552552

553553
private static final String PAGE_LOADED = "PAGE_LOADED";
554554
private static final String CONNECTION_TIMEOUT = "CONNECTION_TIMEOUT";

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobileapi/common/IMAsyncTask.java

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public void before() {
1111

1212
/**
1313
* Executed on background thread as a last step before running the main block
14+
*
1415
* @return return true to skip execution, in this case only the {@link IMAsyncTask#cancelled(Object[])} will be called.
1516
*/
1617
public boolean shouldCancel() {
@@ -67,6 +68,7 @@ public void error(IN[] ins, Throwable error) {
6768

6869
/**
6970
* Executed on UI thread if execution was cancelled ({@link IMAsyncTask#shouldCancel()} returned `true`).
71+
*
7072
* @param ins input parameters
7173
*/
7274
public void cancelled(IN[] ins) {

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobileapi/common/MAsyncTask.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.infobip.mobile.messaging.mobileapi.common;
22

33
import android.annotation.SuppressLint;
4-
import android.os.AsyncTask;
4+
55
import androidx.annotation.NonNull;
66

77
import org.infobip.mobile.messaging.api.support.ApiBackendExceptionWithContent;
@@ -40,7 +40,7 @@ public abstract class MAsyncTask<IN, OUT> extends IMAsyncTask<IN, OUT> {
4040
}};
4141

4242
@SuppressLint("StaticFieldLeak")
43-
private final AsyncTask<IN, Void, ResultWrapper<IN, OUT>> asyncTask = new AsyncTask<IN, Void, ResultWrapper<IN, OUT>>() {
43+
private final MMAsyncTask<IN, Void, ResultWrapper<IN, OUT>> MMAsyncTask = new MMAsyncTask<IN, Void, ResultWrapper<IN, OUT>>() {
4444
@Override
4545
protected void onPreExecute() {
4646
before();
@@ -87,7 +87,7 @@ protected void onPostExecute(ResultWrapper<IN, OUT> resultWrapper) {
8787
*/
8888
@SuppressWarnings({"unused", "unchecked"})
8989
public void execute(IN... ins) {
90-
asyncTask.execute(ins);
90+
MMAsyncTask.execute(ins);
9191
}
9292

9393
/**
@@ -98,7 +98,7 @@ public void execute(IN... ins) {
9898
*/
9999
@SuppressWarnings({"unused", "unchecked"})
100100
public void execute(Executor executor, IN... ins) {
101-
asyncTask.executeOnExecutor(executor, ins);
101+
MMAsyncTask.executeOnExecutor(executor, ins);
102102
}
103103

104104
// region private methods

0 commit comments

Comments
 (0)