@capacitor/network 8.0.0-dev-2410-20250905T161359.0 → 8.0.0-dev-2411-20250905T170020.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/Package.swift +1 -1
  2. package/android/src/main/java/com/capacitorjs/plugins/network/Network.java +14 -49
  3. package/android/src/main/java/com/capacitorjs/plugins/network/NetworkPlugin.java +2 -10
  4. package/package.json +1 -1
package/Package.swift CHANGED
@@ -3,7 +3,7 @@ import PackageDescription
3
3
 
4
4
  let package = Package(
5
5
  name: "CapacitorNetwork",
6
- platforms: [.iOS(.v14)],
6
+ platforms: [.iOS(.v15)],
7
7
  products: [
8
8
  .library(
9
9
  name: "CapacitorNetwork",
package/android/src/main/java/com/capacitorjs/plugins/network/Network.java CHANGED
@@ -1,18 +1,12 @@
1
1
  package com.capacitorjs.plugins.network;
2
2
 
3
- import android.annotation.TargetApi;
4
3
  import android.content.BroadcastReceiver;
5
4
  import android.content.Context;
6
- import android.content.Intent;
7
- import android.content.IntentFilter;
8
5
  import android.net.ConnectivityManager;
9
6
  import android.net.ConnectivityManager.NetworkCallback;
10
7
  import android.net.NetworkCapabilities;
11
- import android.os.Build;
12
8
  import androidx.annotation.NonNull;
13
9
  import androidx.annotation.Nullable;
14
- import androidx.annotation.RequiresApi;
15
- import androidx.appcompat.app.AppCompatActivity;
16
10
 
17
11
  public class Network {
18
12
 
@@ -50,21 +44,10 @@ public class Network {
50
44
  * Create network monitoring object.
51
45
  * @param context
52
46
  */
53
- @SuppressWarnings("deprecation")
54
47
  public Network(@NonNull Context context) {
55
48
  this.context = context;
56
49
  this.connectivityManager = (ConnectivityManager) this.context.getSystemService(Context.CONNECTIVITY_SERVICE);
57
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
58
- receiver =
59
- new BroadcastReceiver() {
60
- @Override
61
- public void onReceive(Context context, Intent intent) {
62
- statusChangeListener.onNetworkStatusChanged(false);
63
- }
64
- };
65
- } else {
66
- this.connectivityCallback = new ConnectivityCallback();
67
- }
50
+ this.connectivityCallback = new ConnectivityCallback();
68
51
  }
69
52
 
70
53
  /**
@@ -90,26 +73,21 @@ public class Network {
90
73
  */
91
74
  public NetworkStatus getNetworkStatus() {
92
75
  NetworkStatus networkStatus = new NetworkStatus();
93
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
94
- if (this.connectivityManager != null) {
95
- android.net.Network activeNetwork = this.connectivityManager.getActiveNetwork();
96
- NetworkCapabilities capabilities =
97
- this.connectivityManager.getNetworkCapabilities(this.connectivityManager.getActiveNetwork());
98
- if (activeNetwork != null && capabilities != null) {
99
- networkStatus.connected =
100
- capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) &&
101
- capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
102
- if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
103
- networkStatus.connectionType = NetworkStatus.ConnectionType.WIFI;
104
- } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
105
- networkStatus.connectionType = NetworkStatus.ConnectionType.CELLULAR;
106
- } else {
107
- networkStatus.connectionType = NetworkStatus.ConnectionType.UNKNOWN;
108
- }
76
+ if (this.connectivityManager != null) {
77
+ android.net.Network activeNetwork = this.connectivityManager.getActiveNetwork();
78
+ NetworkCapabilities capabilities = this.connectivityManager.getNetworkCapabilities(this.connectivityManager.getActiveNetwork());
79
+ if (activeNetwork != null && capabilities != null) {
80
+ networkStatus.connected =
81
+ capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) &&
82
+ capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
83
+ if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
84
+ networkStatus.connectionType = NetworkStatus.ConnectionType.WIFI;
85
+ } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
86
+ networkStatus.connectionType = NetworkStatus.ConnectionType.CELLULAR;
87
+ } else {
88
+ networkStatus.connectionType = NetworkStatus.ConnectionType.UNKNOWN;
109
89
  }
110
90
  }
111
- } else {
112
- networkStatus = getAndParseNetworkInfo();
113
91
  }
114
92
  return networkStatus;
115
93
  }
@@ -133,27 +111,14 @@ public class Network {
133
111
  /**
134
112
  * Register a network callback.
135
113
  */
136
- @RequiresApi(api = Build.VERSION_CODES.N)
137
114
  public void startMonitoring() {
138
115
  connectivityManager.registerDefaultNetworkCallback(connectivityCallback);
139
116
  }
140
117
 
141
- @TargetApi(Build.VERSION_CODES.M)
142
- public void startMonitoring(AppCompatActivity activity) {
143
- IntentFilter filter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
144
- activity.registerReceiver(receiver, filter);
145
- }
146
-
147
118
  /**
148
119
  * Unregister the network callback.
149
120
  */
150
- @RequiresApi(api = Build.VERSION_CODES.N)
151
121
  public void stopMonitoring() {
152
122
  connectivityManager.unregisterNetworkCallback(connectivityCallback);
153
123
  }
154
-
155
- @TargetApi(Build.VERSION_CODES.M)
156
- public void stopMonitoring(@NonNull AppCompatActivity activity) {
157
- activity.unregisterReceiver(receiver);
158
- }
159
124
  }
package/android/src/main/java/com/capacitorjs/plugins/network/NetworkPlugin.java CHANGED
@@ -56,11 +56,7 @@ public class NetworkPlugin extends Plugin {
56
56
  */
57
57
  @Override
58
58
  protected void handleOnResume() {
59
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
60
- implementation.startMonitoring();
61
- } else {
62
- implementation.startMonitoring(getActivity());
63
- }
59
+ implementation.startMonitoring();
64
60
  NetworkStatus afterPauseNetworkStatus = implementation.getNetworkStatus();
65
61
  if (
66
62
  prePauseNetworkStatus != null &&
@@ -82,11 +78,7 @@ public class NetworkPlugin extends Plugin {
82
78
  @Override
83
79
  protected void handleOnPause() {
84
80
  this.prePauseNetworkStatus = implementation.getNetworkStatus();
85
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
86
- implementation.stopMonitoring();
87
- } else {
88
- implementation.stopMonitoring(getActivity());
89
- }
81
+ implementation.stopMonitoring();
90
82
  }
91
83
 
92
84
  private void updateNetworkStatus() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capacitor/network",
3
- "version": "8.0.0-dev-2410-20250905T161359.0",
3
+ "version": "8.0.0-dev-2411-20250905T170020.0",
4
4
  "description": "The Network API provides network and connectivity information.",
5
5
  "main": "dist/plugin.cjs.js",
6
6
  "module": "dist/esm/index.js",