GithubStar/AmazeFileManager
1
0
Fork 0
mirror of https://github.com/TeamAmaze/AmazeFileManager.git synced 2026-10-17 05:08:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2196 from TeamAmaze/bugfix/2195

Browse Source 
Reopen SMB dialog on failed load list
This commit is contained in:
Vishal Nehra
2021-01-09 14:06:01 +05:30
committed by GitHub
parent ebe77dd77d 2966422fe1
commit 92139421b6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java
+1
View File
@@ -130,6 +130,7 @@ public class LoadFilesListTask
return null;
} catch (SmbException | NullPointerException e) {
e.printStackTrace();
nullCheckOrInterrupt(mainFragment, this).reauthenticateSmb();
return null;
}
break;
app/src/main/java/com/amaze/filemanager/ui/fragments/MainFragment.java
+3 -1
View File
@@ -38,6 +38,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
import com.amaze.filemanager.R;
import com.amaze.filemanager.adapters.RecyclerAdapter;
import com.amaze.filemanager.adapters.data.LayoutElementParcelable;
import com.amaze.filemanager.application.AppConfig;
import com.amaze.filemanager.asynchronous.asynctasks.DeleteTask;
import com.amaze.filemanager.asynchronous.asynctasks.LoadFilesListTask;
import com.amaze.filemanager.asynchronous.handlers.FileHandler;
@@ -948,11 +949,11 @@ public class MainFragment extends Fragment implements BottomBarButtonPath {
getBoolean(PREFERENCE_SHOW_THUMB),
getBoolean(PREFERENCE_SHOW_HIDDENFILES),
(data) -> {
mSwipeRefreshLayout.setRefreshing(false);
if (data != null && data.second != null) {
boolean isPathLayoutGrid =
dataUtils.getListOrGridForPath(path, DataUtils.LIST) == DataUtils.GRID;
setListElements(data.second, back, path, data.first, false, isPathLayoutGrid);
mSwipeRefreshLayout.setRefreshing(false);
}
});
loadFilesListTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1320,6 +1321,7 @@ public class MainFragment extends Fragment implements BottomBarButtonPath {
.runOnUiThread(
() -> {
int i;
AppConfig.toast(requireContext(), getString(R.string.unknown_error));
if ((i = dataUtils.containsServer(smbPath)) != -1) {
getMainActivity()
.showSMBDialog(dataUtils.getServers().get(i)[0], smbPath, true);