allowing to start server without password if sftp only and pub key au…

…th is enabled, see GH issue #38
wolpi · Dec 17, 2015 · 5b760ca · 5b760ca
1 parent a364dff
commit 5b760ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/primitiveFTPd/src/org/primftpd/PrimitiveFtpdActivity.java b/primitiveFTPd/src/org/primftpd/PrimitiveFtpdActivity.java
@@ -632,7 +632,7 @@ protected void handleStart() {
 		handleStart(null, null);
 	}
 	protected void handleStart(MenuItem startIcon, MenuItem stopIcon) {
-		if (StringUtils.isBlank(prefsBean.getPassword()))
+		if (!isPasswordOk())
 		{
 			Toast.makeText(
 				getApplicationContext(),
@@ -691,6 +691,15 @@ protected void handlePrefs() {
 		startActivity(intent);
     }
 
+	protected boolean isPasswordOk() {
+		if (!prefsBean.getServerToStart().isPasswordMandatory()
+				&& prefsBean.isPubKeyAuth())
+		{
+			return true;
+		}
+		return !StringUtils.isBlank(prefsBean.getPassword());
+	}
+
     /**
      * @return Intent to start/stop {@link FtpServerService}.
      */

diff --git a/primitiveFTPd/src/org/primftpd/prefs/ServerToStart.java b/primitiveFTPd/src/org/primftpd/prefs/ServerToStart.java
@@ -25,6 +25,10 @@ public boolean startFtp() {
 		public boolean startSftp() {
 			return true;
 		}
+		@Override
+		public boolean isPasswordMandatory() {
+			return false;
+		}
 	},
 	ALL("0") {
 		@Override
@@ -60,4 +64,7 @@ public static ServerToStart byXmlVal(String xmlVal) {
 
 	public abstract boolean startFtp();
 	public abstract boolean startSftp();
+	public boolean isPasswordMandatory() {
+		return true;
+	}
 }