From 368ad10e7d1aa755ff9bdbba401e1fca57d57c73 Mon Sep 17 00:00:00 2001 From: vishal0071 Date: Sun, 20 Aug 2017 23:41:47 +0530 Subject: [PATCH] FTP: Allow fragment to open when inet is not available --- .../amaze/filemanager/fragments/FTPServerFragment.java | 9 +++++++-- app/src/main/res/layout/dialog_ftp_login.xml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/fragments/FTPServerFragment.java b/app/src/main/java/com/amaze/filemanager/fragments/FTPServerFragment.java index 719b3cf74d..8de44a6663 100644 --- a/app/src/main/java/com/amaze/filemanager/fragments/FTPServerFragment.java +++ b/app/src/main/java/com/amaze/filemanager/fragments/FTPServerFragment.java @@ -275,6 +275,11 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) if (mSecureCheckBox.isChecked()) { setSecurePreference(true); } else setSecurePreference(false); + + // TODO: Fix secure connection certification + mSecureCheckBox.setEnabled(false); + setSecurePreference(false); + // TODO: Fix secure connection certification } }); @@ -476,14 +481,14 @@ public void onClick(View v) { */ private void updateSpans() { - String ftpAddress = ""; + String ftpAddress; try{ ftpAddress = getFTPAddressString(); } catch (NullPointerException npe){ npe.printStackTrace(); + ftpAddress = ""; Toast.makeText(getContext(), getResources().getString(R.string.local_inet_addr_error), Toast.LENGTH_SHORT).show(); - mainActivity.onBackPressed(); } String statusHead = getResources().getString(R.string.ftp_status_title) + ": "; diff --git a/app/src/main/res/layout/dialog_ftp_login.xml b/app/src/main/res/layout/dialog_ftp_login.xml index de40bee6e6..339536ea51 100644 --- a/app/src/main/res/layout/dialog_ftp_login.xml +++ b/app/src/main/res/layout/dialog_ftp_login.xml @@ -54,6 +54,7 @@ android:layout_height="wrap_content" android:text="@string/ftp_status_secure_connection" android:layout_gravity="end" + android:enabled="false" /> \ No newline at end of file