FTP: Allow fragment to open when inet is not available

TeamAmaze · Aug 20, 2017 · 368ad10 · 368ad10
1 parent b7894a2
commit 368ad10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -54,6 +54,7 @@
             android:layout_height="wrap_content"
             android:text="@string/ftp_status_secure_connection"
             android:layout_gravity="end"
+            android:enabled="false"
             />
     </LinearLayout>
 </LinearLayout>