Connection Manager password callback improvements

1 files changed, 10 insertions, 3 deletions

diff --git a/UCore.pas b/UCore.pas
index cdbbd06..0fbfbb7 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -193,9 +193,9 @@ type TMounterItem = class
      TConnMgrItem = class
      public
        ConnectionName: string;
-       URI: string;  //  generated at runtime
        ServiceType, Server, Username, Password, TargetDir: string;
        PluginID: string;  //  leave blank for default
+       function GetURI(IncludePassword: boolean): string;
      end;
 
 procedure FillDefaultFstabMounterItems;
@@ -2678,7 +2678,7 @@ var Thread: TOpenDirThread;
 begin
   if pthread_self = Application.ThreadID then begin
     DebugMsg(['!! (WARNING): vfs_ask_question_callback called from the main thread, expected spawn from a OpenDirThread']);
-    HandleVFSAskQuestionCallback(nil, AMessage, Choices, choice);
+    HandleVFSAskQuestionCallback(FMain.FWidget, AMessage, Choices, choice);
     Exit;
   end;
 
@@ -2706,7 +2706,7 @@ var Thread: TOpenDirThread;
 begin
   if pthread_self = Application.ThreadID then begin
     DebugMsg(['!! (WARNING): vfs_ask_password_callback called from the main thread, expected spawn from a OpenDirThread']);
-    Result := HandleVFSAskPasswordCallback(nil, AMessage, default_user, default_domain, flags, username, password, anonymous, domain, password_save);
+    Result := HandleVFSAskPasswordCallback(FMain.FWidget, AMessage, default_user, default_domain, flags, username, password, anonymous, domain, password_save);
     Exit;
   end;
 
@@ -2850,6 +2850,13 @@ begin
 end;
 
 
+(********************************************************************************************************************************)
+(********************************************************************************************************************************)
+function TConnMgrItem.GetURI(IncludePassword: boolean): string;
+begin
+  Result := ConstructURI(IncludePassword, False, ServiceType, Server, Username, Password, TargetDir);
+end;
+
 
 (********************************************************************************************************************************)
 (********************************************************************************************************************************)