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

Bugfix Check Network Connection When File Item Clicked #12093

Merged
merged 22 commits into from
Dec 11, 2023
Merged

Bugfix Check Network Connection When File Item Clicked #12093

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bfccb3b
Check network connection when file item clicked
alperozturk96 Oct 25, 2023
497faaa
Fix code analytics
alperozturk96 Oct 25, 2023
55c7aca
Analysis: update lint results to reflect reduced error/warning count
invalid-email-address Oct 25, 2023
e202ce3
Merge master
alperozturk96 Oct 26, 2023
af0ea73
Merge remote-tracking branch 'origin/bugfix/Despite-connection-is-res…
alperozturk96 Oct 26, 2023
1ae36e9
Analysis: update lint results to reflect reduced error/warning count
invalid-email-address Oct 26, 2023
95931f2
Merge master
alperozturk96 Oct 31, 2023
c3a9060
Analysis: update lint results to reflect reduced error/warning count
invalid-email-address Oct 31, 2023
1551873
Revert styling changes
alperozturk96 Oct 31, 2023
a37e564
Merge remote-tracking branch 'origin/bugfix/Despite-connection-is-res…
alperozturk96 Oct 31, 2023
6dbf383
Optimize imports
alperozturk96 Oct 31, 2023
a79ba9d
Remove extra space in uploadFiles
alperozturk96 Oct 31, 2023
32d1e25
Merge master
alperozturk96 Nov 2, 2023
4f7b486
Use ConnectivityServiceImpl
alperozturk96 Nov 8, 2023
0803ecc
Merge master
alperozturk96 Nov 9, 2023
8ef5721
Merge master
alperozturk96 Nov 9, 2023
71d2983
Merge branch 'master' into bugfix/Despite-connection-is-restored-mess…
AndyScherzinger Nov 9, 2023
07bb2f4
Use interface rather than service
alperozturk96 Nov 10, 2023
0541fbc
Remove public access modifier
alperozturk96 Nov 10, 2023
c9ecd1b
Merge master
alperozturk96 Nov 22, 2023
c380ff1
Add missing interface method to tests
alperozturk96 Nov 22, 2023
8be0dbe
Merge master
alperozturk96 Dec 5, 2023
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
18 changes: 17 additions & 1 deletion app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package com.nextcloud.client.network;

import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
Expand All @@ -36,7 +37,7 @@
import androidx.core.net.ConnectivityManagerCompat;
import kotlin.jvm.functions.Function1;

class ConnectivityServiceImpl implements ConnectivityService {
public class ConnectivityServiceImpl implements ConnectivityService {
Copy link
Member

Choose a reason for hiding this comment

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

This is implemention of an interface.
Please add the new function to its interface.


private static final String TAG = "ConnectivityServiceImpl";
private static final String CONNECTIVITY_CHECK_ROUTE = "/index.php/204";
Expand All @@ -47,6 +48,21 @@ class ConnectivityServiceImpl implements ConnectivityService {
private final GetRequestBuilder requestBuilder;
private final WalledCheckCache walledCheckCache;

public static boolean isConnected(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Network nw = connectivityManager.getActiveNetwork();
NetworkCapabilities actNw = connectivityManager.getNetworkCapabilities(nw);

if (actNw == null) {
return false;
}

return actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ||
actNw.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH);
}


static class GetRequestBuilder implements Function1<String, GetMethod> {
@Override
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.jobs.BackgroundJobManager;
import com.nextcloud.client.network.ConnectivityService;
import com.nextcloud.client.network.ConnectivityServiceImpl;
import com.nextcloud.utils.EditorUtils;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
Expand Down Expand Up @@ -240,6 +241,12 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

public void checkInternetConnection() {
if (ConnectivityServiceImpl.isConnected(this)) {
Copy link
Member

Choose a reason for hiding this comment

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

When it is via interface you can use "connectivityService", which is injected.

hideInfoBox();
}
}

@Override
protected void onStart() {
super.onStart();
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ protected final void showInfoBox(@StringRes int text) {
/**
* Hides the toolbar's info box.
*/
@VisibleForTesting
public final void hideInfoBox() {
mInfoBox.setVisibility(View.GONE);
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,7 @@ public void uploadFiles() {
getActivity(),
((FileActivity) getActivity()).getUser().orElseThrow(RuntimeException::new),
FileDisplayActivity.REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM,
getCurrentFile().isEncrypted()
);
getCurrentFile().isEncrypted());
}

@Override
Expand Down Expand Up @@ -976,6 +975,8 @@ public boolean onLongItemClicked(OCFile file) {

@Override
public void onItemClicked(OCFile file) {
((FileActivity) mContainerActivity).checkInternetConnection();

if (getCommonAdapter().isMultiSelect()) {
toggleItemToCheckedList(file);
} else {
Expand Down
Loading