Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Events deleted from local DB on failures when device is offline #3038

Merged
merged 2 commits into from
Oct 17, 2022
Merged

fix: Events deleted from local DB on failures when device is offline #3038

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
286e0d5
fix: Events deleted from local DB on failures when device is offline
sdhuka Oct 17, 2022
d6c9347
Merge branch 'main' into sdhuka/fix-pinpoint-sync
sdhuka Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions ...t/src/main/java/com/amazonaws/mobileconnectors/pinpoint/internal/event/EventRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,17 @@

package com.amazonaws.mobileconnectors.pinpoint.internal.event;

import android.content.Context;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.Uri;

import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -247,7 +252,11 @@ public void submitEvents() {
submissionRunnableQueue.execute(new Runnable() {
@Override
public void run() {
processEvents();
if (isNetworkAvailable(pinpointContext.getApplicationContext())) {
processEvents();
} else {
log.warn("Device is offline, skipping submitting events to Pinpoint");
}
}
});
}
Expand All @@ -256,7 +265,12 @@ public Future<List<AnalyticsEvent>> submitEventsWithResult() {
return submissionRunnableQueue.submit(new Callable<List<AnalyticsEvent>>() {
@Override
public List<AnalyticsEvent> call() throws Exception {
return processEvents();
if (isNetworkAvailable(pinpointContext.getApplicationContext())) {
return processEvents();
} else {
log.warn("Device is offline, skipping submitting events to Pinpoint");
return Collections.emptyList();
}
}
});
}
Expand Down Expand Up @@ -451,7 +465,8 @@ private void submitEventsAndEndpoint(final JSONArray eventArray,
// in the local database.
// For all other client exceptions occurred during submit events,
// log the exception and delete the events in the local database.
if (isClientExceptionRetryable(amazonClientException)) {
if (isClientExceptionRetryable(amazonClientException) ||
isClientExceptionRetryable(amazonClientException.getCause())) {
log.error("AmazonClientException: Unable to successfully deliver events to server. " +
"Events will be saved, error likely recoverable." +
amazonClientException.getMessage(), amazonClientException);
Expand Down Expand Up @@ -542,10 +557,13 @@ private boolean isRetryable(String responseCode) {
return true;
}

private boolean isClientExceptionRetryable(AmazonClientException amazonClientException) {
private boolean isClientExceptionRetryable(Throwable amazonClientException) {
if (!isNetworkAvailable(pinpointContext.getApplicationContext())) {
return true;
}
return amazonClientException.getCause() != null &&
(amazonClientException.getCause() instanceof UnknownHostException ||
amazonClientException.getCause() instanceof SocketException);
(amazonClientException.getCause() instanceof UnknownHostException ||
amazonClientException.getCause() instanceof SocketException);
}

/**
Expand Down Expand Up @@ -674,4 +692,22 @@ void buildEventPayload(AnalyticsEvent internalEvent,
.withSession(session)
.withTimestamp(DateUtils.formatISO8601Date(new Date(internalEvent.getEventTimestamp())));
}

private boolean isNetworkAvailable(Context context) {
ConnectivityManager connectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
NetworkCapabilities capabilities =
connectivityManager.getNetworkCapabilities(connectivityManager.getActiveNetwork());
if (capabilities != null) {
return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET);
}
} else {
NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
return activeNetworkInfo != null && activeNetworkInfo.isConnected();
}
return false;
}
}