Improve FTP/FTPS/SFTP configuration and access controls

app/build.gradle

@@ -41,8 +41,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 36
 
-        versionCode 32
-        versionName "10.1.9"
+        versionCode 33
+        versionName "10.1.10"
         applicationVariants.all { variant ->
             variant.outputs.all {
                 outputFileName = "Drop-Android.apk"

app/src/main/java/com/erikraft/drop/AboutActivity.java

@@ -4,14 +4,16 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
-import android.view.View;
+import android.view.Gravity;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.chip.Chip;
 
 /** Stable, self-contained About screen with transparent dependency and attribution information. */
 public class AboutActivity extends DropPipActivity {
@@ -35,8 +37,20 @@ protected void onCreate(Bundle savedInstanceState) {
         int pad = dp(20);
         content.setPadding(pad, dp(18), pad, dp(32));
 
+        LinearLayout appTitleRow = new LinearLayout(this);
+        appTitleRow.setOrientation(LinearLayout.HORIZONTAL);
+        appTitleRow.setGravity(Gravity.CENTER_VERTICAL);
         TextView appName = text(getString(R.string.app_name_long), 28);
-        content.addView(appName);
+        appTitleRow.addView(appName, new LinearLayout.LayoutParams(0, -2, 1f));
+
+        Chip betaBadge = new Chip(this);
+        betaBadge.setText(R.string.beta_badge_label);
+        betaBadge.setCheckable(false);
+        betaBadge.setClickable(false);
+        betaBadge.setFocusable(false);
+        betaBadge.setEnsureMinTouchTargetSize(false);
+        appTitleRow.addView(betaBadge, new LinearLayout.LayoutParams(-2, -2));
+        content.addView(appTitleRow);
 
         TextView version = text(
                 getString(R.string.about_version_format, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE),
@@ -60,6 +74,8 @@ protected void onCreate(Bundle savedInstanceState) {
         missionParams.setMargins(0, dp(18), 0, dp(8));
         content.addView(missionCard, missionParams);
 
+        addWifiProjectSection(content);
+
         addHeading(content, getString(R.string.about_dependencies_title));
         addHtml(content, getString(R.string.about_dependencies_summary), 15);
         addHtml(content, buildAndroidDependenciesHtml(), 14);
@@ -71,7 +87,6 @@ protected void onCreate(Bundle savedInstanceState) {
         addHtml(content, getString(R.string.about_licenses_summary), 15);
         addButton(content, getString(R.string.about_licenses_title), "https://github.com/erikraft/Drop-Android/blob/master/LICENSE");
 
-
         addHeading(content, getString(R.string.support_us));
         addButton(content, "GitHub — ErikrafT Drop™", "https://github.com/erikraft/Drop");
         addButton(content, "GitHub — Android", "https://github.com/erikraft/Drop-Android");
@@ -83,6 +98,45 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(root);
     }
 
+    private void addWifiProjectSection(LinearLayout parent) {
+        MaterialCardView card = new MaterialCardView(this);
+        card.setRadius(dp(14));
+        card.setCardElevation(dp(1));
+        card.setStrokeWidth(dp(1));
+        card.setUseCompatPadding(true);
+
+        LinearLayout section = new LinearLayout(this);
+        section.setOrientation(LinearLayout.VERTICAL);
+        section.setPadding(dp(16), dp(14), dp(16), dp(16));
+
+        LinearLayout headingRow = new LinearLayout(this);
+        headingRow.setOrientation(LinearLayout.HORIZONTAL);
+        headingRow.setGravity(Gravity.CENTER_VERTICAL);
+
+        ImageView icon = new ImageView(this);
+        icon.setImageResource(R.drawable.ic_erikraft_wifi);
+        icon.setContentDescription(getString(R.string.about_wifi_title));
+        icon.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        headingRow.addView(icon, new LinearLayout.LayoutParams(dp(54), dp(58)));
+
+        TextView title = text(getString(R.string.about_wifi_title), 20);
+        LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams(0, -2, 1f);
+        titleParams.setMargins(dp(12), 0, 0, 0);
+        headingRow.addView(title, titleParams);
+        section.addView(headingRow);
+
+        TextView description = text(getString(R.string.about_wifi_description), 15);
+        description.setPadding(0, dp(10), 0, dp(8));
+        section.addView(description);
+        addButton(section, getString(R.string.about_wifi_open_repository),
+                "https://github.com/erikraft/WiFi");
+
+        card.addView(section);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(-1, -2);
+        params.setMargins(0, dp(12), 0, dp(8));
+        parent.addView(card, params);
+    }
+
     private String buildAndroidDependenciesHtml() {
         return "<b>" + getString(R.string.about_dependencies_ui) + "</b><br>"
                 + "AndroidX AppCompat 1.7.1<br>"

app/src/main/java/com/erikraft/drop/FtpServerService.java

@@ -99,10 +99,12 @@ private void startServer(long generation) {
         try {
             android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(this);
             int port = parsePort(prefs.getString(getString(R.string.pref_ftp_port), "" + DEFAULT_PORT));
-            String username = valueOrDefault(prefs.getString(getString(R.string.pref_ftp_username), ""), "admin");
-            String password = valueOrDefault(prefs.getString(getString(R.string.pref_ftp_password), ""), "erikraft");
-            boolean anonymous = prefs.getBoolean(getString(R.string.pref_ftp_anonymous), false);
-            boolean ftps = prefs.getBoolean(getString(R.string.pref_ftp_ftps), true);
+            String username = valueOrDefault(prefs.getString(getString(R.string.pref_ftp_username), ""), "android");
+            String password = valueOrDefault(prefs.getString(getString(R.string.pref_ftp_password), ""), "android");
+            boolean anonymous = prefs.getBoolean(getString(R.string.pref_ftp_anonymous), true);
+            boolean ftps = prefs.getBoolean(getString(R.string.pref_ftp_ftps), false);
+            boolean implicitFtps = prefs.getBoolean(getString(R.string.pref_ftp_ftps_implicit), false);
+            boolean readOnly = prefs.getBoolean(getString(R.string.pref_ftp_read_only), false);
             File home = resolveHome(prefs.getString(getString(R.string.pref_save_location), ""));
             if (!home.exists() && !home.mkdirs()) throw new IllegalStateException("Não foi possível criar a pasta base: " + home);
 
@@ -120,7 +122,10 @@ private void startServer(long generation) {
             user.setPassword(password);
             user.setHomeDirectory(home.getAbsolutePath());
             List<org.apache.ftpserver.ftplet.Authority> authorities = new ArrayList<>();
-            authorities.add(new WritePermission());
+            // Apache FtpServer 1.2.1 has no ReadPermission authority. An empty
+            // authority list grants no write operations; add WritePermission only
+            // when the user explicitly enables write access.
+            if (!readOnly) authorities.add(new WritePermission());
             user.setAuthorities(authorities);
             userManager.save(user);
 
@@ -151,9 +156,9 @@ private void startServer(long generation) {
                 sslFactory.setSslProtocol("TLS");
                 SslConfiguration ssl = sslFactory.createSslConfiguration();
                 listener.setSslConfiguration(ssl);
-                listener.setImplicitSsl(false);
+                listener.setImplicitSsl(implicitFtps);
                 data.setSslConfiguration(ssl);
-                data.setImplicitSsl(false);
+                data.setImplicitSsl(implicitFtps);
             }
 
             listener.setDataConnectionConfiguration(data.createDataConnectionConfiguration());

app/src/main/java/com/erikraft/drop/FtpSettingsActivity.java

@@ -2,6 +2,13 @@
 
 import android.Manifest;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.widget.ImageView;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+import com.google.zxing.qrcode.QRCodeWriter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -43,6 +50,9 @@ public class FtpSettingsActivity extends DropPipActivity {
     private TextInputEditText passwordInput;
     private SwitchCompat anonymousSwitch;
     private SwitchCompat ftpsSwitch;
+    private SwitchCompat readOnlySwitch;
+    private MaterialButton ftpsModeButton;
+    private TextView networkState;
     private SwitchCompat stopNotificationSwitch;
     private TextView directorySummary;
     private TextView status;
@@ -90,7 +100,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
             } catch (SecurityException ignored) { }
             DocumentFile folder = DocumentFile.fromTreeUri(this, uri);
-            if (folder == null) return;
+            if (folder == null || !folder.isDirectory() || !folder.canRead() || !folder.canWrite()) {
+                Toast.makeText(this, getString(R.string.transfer_error_folder_unsupported), Toast.LENGTH_LONG).show();
+                return;
+            }
             String path = DocumentFileUtils.getAbsolutePath(folder, this);
             if (path == null || path.trim().isEmpty()) {
                 Toast.makeText(this, getString(R.string.transfer_error_directory_path), Toast.LENGTH_LONG).show();
@@ -138,18 +151,35 @@ private void buildUi() {
         });
         portInput = field(getString(R.string.ftp_port_hint), prefs.getString(getString(R.string.pref_ftp_port), "2221"), InputType.TYPE_CLASS_NUMBER);
         content.addView((TextInputLayout) portInput.getTag(), lpTop(dp(12)));
-        usernameInput = field(getString(R.string.ftp_username_hint), prefs.getString(getString(R.string.pref_ftp_username), "admin"), InputType.TYPE_CLASS_TEXT);
+        usernameInput = field(getString(R.string.ftp_username_hint), prefs.getString(getString(R.string.pref_ftp_username), "android"), InputType.TYPE_CLASS_TEXT);
         content.addView((TextInputLayout) usernameInput.getTag(), lpTop(dp(8)));
-        passwordInput = field(getString(R.string.ftp_password_hint), prefs.getString(getString(R.string.pref_ftp_password), "admin"), InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        passwordInput = field(getString(R.string.ftp_password_hint), prefs.getString(getString(R.string.pref_ftp_password), "android"), InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
         content.addView((TextInputLayout) passwordInput.getTag(), lpTop(dp(8)));
         anonymousSwitch = new SwitchCompat(this);
         anonymousSwitch.setText(R.string.ftp_anonymous_title);
-        anonymousSwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_anonymous), false));
+        anonymousSwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_anonymous), true));
         content.addView(anonymousSwitch, lpTop(dp(8)));
         ftpsSwitch = new SwitchCompat(this);
         ftpsSwitch.setText(R.string.ftp_ftps_title);
-        ftpsSwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_ftps), true));
+        ftpsSwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_ftps), false));
         content.addView(ftpsSwitch, lpTop(dp(4)));
+        ftpsModeButton = new MaterialButton(this);
+        content.addView(ftpsModeButton, lpTop(dp(4)));
+        updateFtpsModeLabel();
+        ftpsModeButton.setOnClickListener(v -> {
+            final String[] modes = {getString(R.string.ftp_ftps_explicit), getString(R.string.ftp_ftps_implicit)};
+            new AlertDialog.Builder(this).setTitle(R.string.ftp_ftps_mode_title)
+                    .setSingleChoiceItems(modes, prefs.getBoolean(getString(R.string.pref_ftp_ftps_implicit), false) ? 1 : 0,
+                            (dialog, which) -> {
+                                prefs.edit().putBoolean(getString(R.string.pref_ftp_ftps_implicit), which == 1).apply();
+                                updateFtpsModeLabel();
+                                dialog.dismiss();
+                            }).setNegativeButton(android.R.string.cancel, null).show();
+        });
+        readOnlySwitch = new SwitchCompat(this);
+        readOnlySwitch.setText(R.string.ftp_read_only_title);
+        readOnlySwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_read_only), false));
+        content.addView(readOnlySwitch, lpTop(dp(8)));
         stopNotificationSwitch = new SwitchCompat(this);
         stopNotificationSwitch.setText(R.string.ftp_stop_notification_title);
         stopNotificationSwitch.setChecked(prefs.getBoolean(getString(R.string.pref_ftp_stop_notification), false));
@@ -241,6 +271,7 @@ private void saveAndStart() {
                 .apply();
         ContextCompat.startForegroundService(this, FtpServerService.startIntent(this));
         status.setText(R.string.ftp_starting);
+        showConnectionQr(buildAddress());
     }
 
     private void stopServer() {
@@ -258,10 +289,25 @@ private void updateAddress() {
 
     private String buildAddress() {
         String port = prefs.getString(getString(R.string.pref_ftp_port), "2221");
-        String scheme = prefs.getBoolean(getString(R.string.pref_ftp_ftps), true) ? "ftps" : "ftp";
+        String scheme = prefs.getBoolean(getString(R.string.pref_ftp_ftps), false) ? "ftps" : "ftp";
         return scheme + "://" + getWifiAddress() + ":" + port;
     }
 
+    private void updateFtpsModeLabel() {
+        if (ftpsModeButton == null) return;
+        boolean implicit = prefs.getBoolean(getString(R.string.pref_ftp_ftps_implicit), false);
+        ftpsModeButton.setText(getString(R.string.ftp_ftps_mode_label, getString(implicit ? R.string.ftp_ftps_implicit : R.string.ftp_ftps_explicit)));
+        ftpsModeButton.setEnabled(ftpsSwitch != null && ftpsSwitch.isChecked());
+        if (ftpsSwitch != null) ftpsSwitch.setOnCheckedChangeListener((button, checked) -> { if (ftpsModeButton != null) ftpsModeButton.setEnabled(checked); });
+    }
+
+    private String buildNetworkStatus() {
+        android.net.ConnectivityManager cm = (android.net.ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+        android.net.NetworkInfo info = cm == null ? null : cm.getActiveNetworkInfo();
+        boolean wifiConnected = info != null && info.isConnected() && info.getType() == android.net.ConnectivityManager.TYPE_WIFI;
+        return getString(wifiConnected ? R.string.ftp_wifi_connected : R.string.ftp_wifi_disconnected) + "\n" + getString(R.string.ftp_ip_address, com.erikraft.drop.utils.NetworkUtils.getIpAddress(this));
+    }
+
     private String getWifiAddress() {
         try {
             for (NetworkInterface network : Collections.list(NetworkInterface.getNetworkInterfaces())) {
@@ -285,6 +331,28 @@ private void copyAddress() {
         Toast.makeText(this, R.string.ftp_address_copied, Toast.LENGTH_SHORT).show();
     }
 
+    private void showConnectionQr(String connectionAddress) {
+        try {
+            com.google.zxing.common.BitMatrix matrix = new QRCodeWriter().encode(connectionAddress, BarcodeFormat.QR_CODE, 480, 480);
+            Bitmap bitmap = Bitmap.createBitmap(480, 480, Bitmap.Config.RGB_565);
+            for (int y = 0; y < 480; y++) {
+                for (int x = 0; x < 480; x++) bitmap.setPixel(x, y, matrix.get(x, y) ? Color.BLACK : Color.WHITE);
+            }
+            ImageView image = new ImageView(this);
+            image.setImageBitmap(bitmap);
+            image.setAdjustViewBounds(true);
+            image.setScaleType(ImageView.ScaleType.FIT_CENTER);
+            int padding = dp(12);
+            image.setPadding(padding, padding, padding, padding);
+            image.setLayoutParams(new android.view.ViewGroup.LayoutParams(dp(240), dp(240)));
+            new AlertDialog.Builder(this).setTitle(R.string.ftp_settings_title)
+                    .setMessage(connectionAddress).setView(image)
+                    .setPositiveButton(android.R.string.ok, null).show();
+        } catch (WriterException e) {
+            Toast.makeText(this, connectionAddress, Toast.LENGTH_LONG).show();
+        }
+    }
+
     private TextView text(String value, float size) {
         TextView view = new TextView(this);
         view.setText(value);