Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class ConnectivityServiceImpl(
) : ConnectivityService {

companion object {
var instance: ConnectivityServiceImpl? = null

// todo: remove
private var initCount = 0
private const val TAG = "ConnectivityServiceImpl"
private const val CONNECTIVITY_CHECK_ROUTE = "/index.php/204"
}
Expand Down Expand Up @@ -66,10 +70,13 @@ class ConnectivityServiceImpl(
}
// endregion



init {
initCount += 1
connectivityManager.registerDefaultNetworkCallback(networkCallback)
updateConnectivity()
Log_OC.d(TAG, "connectivity service constructed")
Log_OC.d(TAG, "connectivity service constructed: " + initCount)
}

// region overridden methods
Expand Down
19 changes: 14 additions & 5 deletions app/src/main/java/com/nextcloud/client/network/NetworkModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,26 @@
@Module
public class NetworkModule {

// todo: check 429, remove manual instance...
@Provides
@Singleton
ConnectivityService connectivityService(Context context,
UserAccountManager accountManager,
ClientFactory clientFactory,
WalledCheckCache walledCheckCache) {
return new ConnectivityServiceImpl(context,
accountManager,
clientFactory,
url -> new GetMethod(url, false),
walledCheckCache
var instance = ConnectivityServiceImpl.Companion.getInstance();
if (instance != null) {
return instance;
}

instance = new ConnectivityServiceImpl(context,
accountManager,
clientFactory,
url -> new GetMethod(url, false),
walledCheckCache
);
ConnectivityServiceImpl.Companion.setInstance(instance);
return instance;
}

@Provides
Expand Down
Loading