make nextcloud support explicit (closes https://github.com/PhilippC/keepass2android/issues/256)

src/Kp2aBusinessLogic/Io/WebDavFileStorage.cs

@@ -30,7 +30,8 @@ namespace keepass2android.Io
 				yield return "http";
 				yield return "https";
 				yield return "owncloud";
-			}
+			    yield return "nextcloud";
+            }
 		}
 
 	    public override bool UserShouldBackup
@@ -38,12 +39,15 @@ namespace keepass2android.Io
 	        get { return true; }
 	    }
 
-	    public static string Owncloud2Webdav(string owncloudUrl)
+	    public static string owncloudPrefix = "owncloud://";
+	    public static string nextcloudPrefix = "nextcloud://";
+
+        public static string Owncloud2Webdav(string owncloudUrl, string prefix)
 		{
-			string owncloudPrefix = "owncloud://";
-			if (owncloudUrl.StartsWith(owncloudPrefix))
+			
+			if (owncloudUrl.StartsWith(prefix))
 			{
-				owncloudUrl = owncloudUrl.Substring(owncloudPrefix.Length);
+				owncloudUrl = owncloudUrl.Substring(prefix.Length);
 			}
 			if (!owncloudUrl.Contains("://"))
 				owncloudUrl = "https://" + owncloudUrl;

src/keepass2android/FileSelectHelper.cs

@@ -222,8 +222,10 @@ namespace keepass2android
 			else if ((defaultPath.StartsWith("http://")) || (defaultPath.StartsWith("https://")))
 				ShowHttpDialog(_activity, ReturnFileOrStartFileChooser, ReturnCancel, defaultPath);
 			else if (defaultPath.StartsWith("owncloud://"))
-				ShowOwncloudDialog(_activity, ReturnFileOrStartFileChooser, ReturnCancel, defaultPath);
-			else
+				ShowOwncloudDialog(_activity, ReturnFileOrStartFileChooser, ReturnCancel, defaultPath, "owncloud");
+			else if (defaultPath.StartsWith("nextcloud://"))
+			    ShowOwncloudDialog(_activity, ReturnFileOrStartFileChooser, ReturnCancel, defaultPath, "nextcloud");
+            else
 			{
 				Func<string, Dialog, bool> onOpen = OnOpenButton;
 				Util.ShowFilenameDialog(_activity,
@@ -238,12 +240,13 @@ namespace keepass2android
 			}
 		}
 
-		private void ShowOwncloudDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath)
+		private void ShowOwncloudDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath, string subtype)
 		{
 #if !EXCLUDE_JAVAFILESTORAGE && !NoNet
 			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.owncloudcredentials, null);
 			builder.SetView(dlgContents);
+
 			builder.SetPositiveButton(Android.Resource.String.Ok,
 									  (sender, args) =>
 									  {
@@ -255,17 +258,17 @@ namespace keepass2android
 										  string scheme = defaultPath.Substring(0,defaultPath.IndexOf(_schemeSeparator, StringComparison.Ordinal));
 										  if (host.Contains(_schemeSeparator) == false)
 											  host = scheme + _schemeSeparator + host;
-										  string httpPath = new Keepass2android.Javafilestorage.WebDavStorage(null).BuildFullPath(WebDavFileStorage.Owncloud2Webdav(host), user,
+										  string httpPath = new Keepass2android.Javafilestorage.WebDavStorage(null).BuildFullPath(WebDavFileStorage.Owncloud2Webdav(host, subtype == "owncloud" ? WebDavFileStorage.owncloudPrefix : WebDavFileStorage.nextcloudPrefix), user,
 																										  password);
 										  onStartBrowse(httpPath);
 									  });
 			EventHandler<DialogClickEventArgs> evtH = new EventHandler<DialogClickEventArgs>((sender, e) => onCancel());
 
 			builder.SetNegativeButton(Android.Resource.String.Cancel, evtH);
-			builder.SetTitle(activity.GetString(Resource.String.enter_owncloud_login_title));
+			builder.SetTitle(activity.GetString(subtype == "owncloud" ?  Resource.String.enter_owncloud_login_title : Resource.String.enter_nextcloud_login_title));
 			Dialog dialog = builder.Create();
-
-			dialog.Show();
+		    dlgContents.FindViewById<EditText>(Resource.Id.owncloud_url).SetHint(subtype == "owncloud" ? Resource.String.hint_owncloud_url : Resource.String.hint_nextcloud_url);
+            dialog.Show();
 #endif
 
 		}

src/keepass2android/Resources/values/strings.xml

@@ -512,6 +512,9 @@
 
   <string name="enter_owncloud_login_title">Enter OwnCloud login data:</string>
   <string name="hint_owncloud_url">OwnCloud URL (ex: owncloud.me.com)</string>
+
+  <string name="enter_nextcloud_login_title">Enter NextCloud login data:</string>
+  <string name="hint_nextcloud_url">NextCloud URL (ex: nextcloud.me.com)</string>
   
   <string name="hint_sftp_host">host (ex: 192.168.0.1)</string>
 	<string name="hint_sftp_port">port</string>
@@ -533,6 +536,7 @@
 	<string name="filestoragename_http">HTTP (WebDav)</string>
 	<string name="filestoragename_https">HTTPS (WebDav)</string>
   <string name="filestoragename_owncloud">OwnCloud</string>
+  <string name="filestoragename_nextcloud">NextCloud</string>
   <string name="filestoragename_dropbox">Dropbox</string>
 	<string name="filestoragename_dropboxKP2A">Dropbox (KP2A folder)</string>
 	<string name="filestoragehelp_dropboxKP2A">If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, click this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file.</string>

src/keepass2android/keepass2android.csproj

@@ -1876,6 +1876,12 @@
   <ItemGroup>
     <AndroidResource Include="Resources\xml\network_security_config.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_nextcloud.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi\ic_storage_nextcloud.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">