Skip to content

Mob 4998 connectivity manager offline mode improvements #476

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Mob 4998 connectivity manager offline mode improvements #476

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b73fa6c
[MOB-4998] - OfflineMode ConnectivityManager Improvements
Ayyanchira Oct 19, 2022
357973f
Taking account of multiple network
Oct 20, 2022
d56b976
Conditional Default value for API > 28
Oct 21, 2022
d9526b6
Adding suggestions.
Nov 2, 2022
1fc4fc4
Adding suggested changes
Nov 16, 2022
913415d
Adding Try Catch as suggested
Nov 17, 2022
e9f80f9
Merge branch 'master' into MOB-4998-ConnectivityManager-OfflineMode-i…
jena-chakour Mar 6, 2024
787fac2
Merge branch 'master' into MOB-4998-ConnectivityManager-OfflineMode-i…
evantk91 Mar 12, 2024
2d3c066
Merge branch 'master' into MOB-4998-ConnectivityManager-OfflineMode-i…
Ayyanchira Mar 15, 2024
9eb7c51
Merge branch 'master' into MOB-4998-ConnectivityManager-OfflineMode-i…
evantk91 Sep 17, 2024
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
36 changes: 27 additions & 9 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableNetworkConnectivityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,25 @@
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.os.Build;

import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;

class IterableNetworkConnectivityManager {
private static final String TAG = "NetworkConnectivityManager";
private boolean isConnected;

private static IterableNetworkConnectivityManager sharedInstance;

private ConnectivityManager connectivityManager;
private ArrayList<IterableNetworkMonitorListener> networkMonitorListeners = new ArrayList<>();
private Set<Network> networkSet = new HashSet<>();

public interface IterableNetworkMonitorListener {
void onNetworkConnected();
Expand All @@ -37,21 +41,32 @@ private IterableNetworkConnectivityManager(Context context) {
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
checkInternetAvailabilityOnActiveNetwork();
startNetworkCallback(context);
}
}

private void checkInternetAvailabilityOnActiveNetwork() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
Network activeNetwork = connectivityManager.getActiveNetwork();
isConnected = activeNetwork == null ? false : connectivityManager.getNetworkCapabilities(activeNetwork).hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
Copy link
Contributor

@vbabenkoru vbabenkoru Nov 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also wrap all of this stuff in a try...catch. It should be safe enough, but this is Android, who knows if it's going to blow up on some obscure Android device. 😀

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea 👍. Done

IterableLogger.v(TAG, "Internet active : " + isConnected);
} else {
IterableLogger.v(TAG, "Internet capability could not be detected on active network due to Android OS < Marshmallow.");
}
}

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
private void startNetworkCallback(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkRequest.Builder networkBuilder = new NetworkRequest.Builder();

NetworkRequest networkRequest = new NetworkRequest.Builder().build();
if (connectivityManager != null) {
try {
connectivityManager.registerNetworkCallback(networkBuilder.build(), new ConnectivityManager.NetworkCallback() {
connectivityManager.registerNetworkCallback(networkRequest, new ConnectivityManager.NetworkCallback() {
@Override
public void onAvailable(@NonNull Network network) {
super.onAvailable(network);
networkSet.add(network);
IterableLogger.v(TAG, "Network Connected");
isConnected = true;
ArrayList<IterableNetworkMonitorListener> networkListenersCopy = new ArrayList<>(networkMonitorListeners);
Expand All @@ -64,10 +79,13 @@ public void onAvailable(@NonNull Network network) {
public void onLost(@NonNull Network network) {
super.onLost(network);
IterableLogger.v(TAG, "Network Disconnected");
isConnected = false;
ArrayList<IterableNetworkMonitorListener> networkListenersCopy = new ArrayList<>(networkMonitorListeners);
for (IterableNetworkMonitorListener listener : networkListenersCopy) {
listener.onNetworkDisconnected();
networkSet.remove(network);
if (networkSet.isEmpty()) {
isConnected = false;
ArrayList<IterableNetworkMonitorListener> networkListenersCopy = new ArrayList<>(networkMonitorListeners);
for (IterableNetworkMonitorListener listener : networkListenersCopy) {
listener.onNetworkDisconnected();
}
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion iterableapi/src/main/java/com/iterable/iterableapi/IterableTaskRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void onSwitchToBackground() {

}

private void runNow() {
private synchronized void runNow() {
handler.removeMessages(OPERATION_PROCESS_TASKS);
handler.sendEmptyMessage(OPERATION_PROCESS_TASKS);
}
Expand Down