feat(sync): QR des reglages sur le PC, Paste settings sur le telephone

Le poste genere le QR (DelphiZXingQRCode, Apache 2.0) depuis ses prefs :
URL + jeton, jamais le mot de passe de synchro. Le telephone lit le texte
copie par l'appareil photo et remplit les champs ; Save valide.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

android-client/web/app.html

@@ -588,6 +588,7 @@
              type="password" autocomplete="off">
       <div class="in-x" data-clear="sPwd">&#215;</div>
     </div>
+    <button class="btn wide" id="sPaste">Paste settings (QR from the PC)</button>
     <button class="btn wide main" id="sSave">Save</button>
     <div class="note">The sync password never leaves this device. It is what
       encrypts the copy kept in the repository, so it must be the same on every
@@ -1665,6 +1666,9 @@ function normalizeRepoUrl(u) {
   if (!m) return u;
   return m[1] + '/api/v1/repos/' + m[2] + '/' + m[3] + '/contents/' + (m[4] || 'vault-sync.json');
 }
+document.getElementById('sPaste').addEventListener('click', function () {
+  send('pastecfg');
+});
 document.getElementById('sSave').addEventListener('click', function () {
   var sUrl = document.getElementById('sUrl');
   elUrl.value = normalizeRepoUrl(sUrl.value);
@@ -1849,6 +1853,16 @@ var PM = {
   /// Ils ne s'affichent plus - le panneau repliable a cede la place au voile -
   /// mais c'est toujours d'eux que part pushConfig, et Delphi ne connait qu'eux.
   /// Les vider ferait perdre la configuration a la premiere synchronisation.
+  /// Reglages lus dans le QR du poste : ils remplissent les champs, Save valide.
+  pasteConfig: function (url, tok) {
+    var u = document.getElementById('sUrl');
+    u.value = shortRepoUrl(url);
+    autoGrow(u);
+    document.getElementById('sTok').value = tok;
+    toast('URL and token pasted - type the sync password, then Save');
+    document.getElementById('sPwd').focus();
+  },
+
   setConfig: function (url, tok, pwd, show) {
     // elPin volontairement absent : rien ne le restaure, jamais.
     elUrl.value = url; elTok.value = tok; elPwd.value = pwd;

delphi-backend/PMServer.dpr

@@ -23,6 +23,7 @@ uses
   PM.MachineId in 'Source\PM.MachineId.pas',
   PM.Licence in 'Source\PM.Licence.pas',
   PM.LicenceGate in 'Source\PM.LicenceGate.pas',
+  DelphiZXingQRCode in 'Source\DelphiZXingQRCode.pas',
   PM.AutoStart in 'Source\PM.AutoStart.pas',
   PM.Favicon in 'Source\PM.Favicon.pas',
   PM.ProcessLockdown in 'Source\PM.ProcessLockdown.pas',

delphi-backend/PMServer.dproj

@@ -249,6 +249,7 @@ $(PreBuildEvent)]]></PreBuildEvent>
         <DCCReference Include="Source\PM.MachineId.pas"/>
         <DCCReference Include="Source\PM.Licence.pas"/>
         <DCCReference Include="Source\PM.LicenceGate.pas"/>
+        <DCCReference Include="Source\DelphiZXingQRCode.pas"/>
         <DCCReference Include="Source\PM.AutoStart.pas"/>
         <DCCReference Include="Source\PM.Favicon.pas"/>
         <DCCReference Include="Source\PM.ProcessLockdown.pas"/>

delphi-backend/Source/DelphiZXingQRCode.LICENSE.md

@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

delphi-backend/UMainForm.pas

@@ -35,7 +35,7 @@ uses
   FMX.TMSFNCEdgeWebBrowser,
   {$ENDIF}
   PM.HTTPServer, PM.Bridge, PM.QuickUnlock, PM.PinUnlock, PM.UserPrefs, PM.Licence, PM.AutoStart,
-  PM.Favicon,
+  PM.Favicon, DelphiZXingQRCode,
   FMX.Platform.Win, FMX.Menus;  // WindowHandleToPlatform → HWND for visibility check
 const
   // Bump on each release. Surfaced to JS via cmd://app/version, displayed
@@ -1330,6 +1330,52 @@ begin
     PM.UserPrefs.SetPref(LKey, GetParam('value'));
   end
 
+  // ---- QR des reglages de synchro, pour le telephone ------------------
+  // L'EXE FABRIQUE LE QR LUI-MEME : l'URL et le jeton se lisent ici, dans les
+  // prefs DPAPI, et seule la matrice noir/blanc part vers la page - le jeton
+  // ne transite pas en clair par le moteur de rendu (meme raison que
+  // prefs/has). Le mot de passe de synchro n'y est JAMAIS : un QR se
+  // photographie par-dessus l'epaule.
+  // JSON nu, sans prefixe "pmsync:" : un prefixe a deux-points se lit comme un
+  // lien, et l'appareil photo proposait "Ouvrir avec" au lieu de copier.
+  else if ACmd = 'sync/qr' then
+  begin
+    var LQrUrl := PM.UserPrefs.GetPref('syncUrl');
+    var LQrTok := PM.UserPrefs.GetPref('syncPwd');
+    var LBits := '';
+    var LSize := 0;
+    if (LQrUrl <> '') and (LQrTok <> '') then
+    begin
+      var LJson := TJSONObject.Create;
+      var LQr := TDelphiZXingQRCode.Create;
+      var LSb := TStringBuilder.Create;
+      try
+        LJson.AddPair('pmsync', TJSONNumber.Create(1));
+        LJson.AddPair('u', LQrUrl);
+        LJson.AddPair('t', LQrTok);
+        LQr.Encoding := qrUTF8NoBOM;
+        LQr.QuietZone := 4;
+        LQr.Data := LJson.ToJSON;
+        LSize := LQr.Rows;
+        for var R := 0 to LQr.Rows - 1 do
+          for var C := 0 to LQr.Columns - 1 do
+            if LQr.IsBlack[R, C] then LSb.Append('1') else LSb.Append('0');
+        LBits := LSb.ToString;
+      finally
+        LSb.Free;
+        LQr.Free;
+        LJson.Free;
+      end;
+    end;
+    if LSize > 0 then
+      LogLine('sync/qr: ' + IntToStr(LSize) + ' modules')
+    else
+      LogLine('sync/qr: URL or token not set');
+    WebBrowser.ExecuteJavaScript(
+      'if(window.Bridge&&Bridge.onSyncQr)Bridge.onSyncQr(' + IntToStr(LSize) +
+      ',"' + LBits + '")');
+  end
+
   // ---- Licence hors ligne (PM.Licence) ---------------------------------
   // cmd://licence/status             -> Bridge.onLicenceResult(ok, porteur)
   // cmd://licence/activate?key=<...> -> idem, apres verification + rangement

index.html

@@ -832,7 +832,9 @@
                     </p>
                     <div style="margin-bottom:8px">
                         <button class="btn btn-ghost btn-sm" id="syncTestBtn">Test connection</button>
+                        <button class="btn btn-ghost btn-sm" id="syncQrBtn">QR for phone</button>
                     </div>
+                    <div id="syncQrBox" hidden style="margin-bottom:8px"></div>
                     <label style="display:flex;align-items:center;gap:8px;margin:8px 0">
                         <input type="checkbox" id="syncPreBackup">
                         <span style="font-size:12px">Create a local backup before each sync</span>

js/app.js

@@ -8191,6 +8191,8 @@ async function init() {
         Bridge.setPref(SYNC_PREFS.preBackup, e.target.checked ? '1' : ''));
     if (syncSetPwd) syncSetPwd.addEventListener('click', syncSetEncPwdFlow);
     if (syncTest)   syncTest.addEventListener('click', syncTestConnection);
+    const syncQr = document.getElementById('syncQrBtn');
+    if (syncQr)     syncQr.addEventListener('click', syncQrToggle);
     // Guard the user entry point: ignore clicks while a sync is running (no
     // concurrent syncs) and call runSyncNow() with NO arg — the click event
     // must not land in its `_attempt` retry counter. Internal retries call

js/app.sync.js

@@ -37,6 +37,41 @@ const SYNC_PREFS = {
 };
 
 let _webdavResolvers = {};
+// QR POUR LE TELEPHONE. L'exe le fabrique depuis ses prefs (URL + jeton, jamais
+// le mot de passe de synchro) et n'envoie que la matrice : '1' = module noir,
+// ligne par ligne. Masque au bout d'une minute - il donne acces au depot.
+let syncQrTimer = null;
+function syncQrHide() {
+    const box = document.getElementById('syncQrBox');
+    if (box) { box.hidden = true; box.innerHTML = ''; }
+    clearTimeout(syncQrTimer);
+}
+function syncQrToggle() {
+    const box = document.getElementById('syncQrBox');
+    if (box && !box.hidden) return syncQrHide();
+    window.location.href = 'cmd://sync/qr';
+}
+Bridge.onSyncQr = function (size, bits) {
+    const box = document.getElementById('syncQrBox');
+    if (!box) return;
+    if (!size) return toast('Set the URL and the token first', 'warning');
+    let d = '';
+    for (let r = 0; r < size; r++)
+        for (let c = 0; c < size; c++)
+            if (bits.charCodeAt(r * size + c) === 49) d += 'M' + c + ' ' + r + 'h1v1h-1z';
+    box.innerHTML =
+        '<svg viewBox="0 0 ' + size + ' ' + size + '" width="240" height="240" ' +
+        'shape-rendering="crispEdges" style="background:#fff;display:block;border-radius:6px">' +
+        '<path d="' + d + '" fill="#000"/></svg>' +
+        '<p style="font-size:11px;color:var(--text-faint);margin:6px 0 0">' +
+        'Scan it with the phone camera and copy the text, then in the app: ' +
+        'Settings &rarr; Paste settings. It holds the URL and the token, not the ' +
+        'sync password. Hidden again in 60 s.</p>';
+    box.hidden = false;
+    clearTimeout(syncQrTimer);
+    syncQrTimer = setTimeout(syncQrHide, 60000);
+};
+
 Bridge.onWebdavResult = function(reqId, status, payload, etag) {
     const r = _webdavResolvers[reqId];
     if (!r) return;

mainApk.pas

@@ -341,6 +341,7 @@ type
     /// que le proprietaire ne connaitrait pas.
     procedure SetUnlockCode(const ANew: string);
     procedure PushUnlockMode;
+    procedure PasteSyncSettings;
     function PwdName: string;
     /// Va chercher l'icone du site de l'entree ouverte, ou l'efface.
     procedure SetEntryIcon(AFetch: Boolean);
@@ -1813,6 +1814,13 @@ begin
         SetUnlockCode(TNetEncoding.URL.Decode(Param('c')));
     end
 
+    // REGLAGES COLLES DEPUIS LE QR DU POSTE. L'appareil photo a lu le QR et
+    // copie son texte : {"pmsync":1,"u":URL,"t":JETON}. On remplit les champs
+    // des reglages SANS enregistrer - Save reste le geste qui valide - et on
+    // vide le presse-papiers, qui porte le jeton.
+    else if LAction = 'pastecfg' then
+      PasteSyncSettings
+
     else if LAction = 'pinclear' then
       ClearUnlockCode(TNetEncoding.URL.Decode(Param('c')))
 
@@ -3197,6 +3205,34 @@ begin
   if HasLocalContainer then Result := 'vault password' else Result := 'sync password';
 end;
 
+procedure TForm8.PasteSyncSettings;
+var
+  LDoc: TJSONObject;
+  LUrl, LTok: string;
+begin
+  LUrl := '';
+  LTok := '';
+  LDoc := TJSONObject.ParseJSONValue(CurrentClipboard.Trim) as TJSONObject;
+  if LDoc <> nil then
+  try
+    if LDoc.GetValue<Integer>('pmsync', 0) = 1 then
+    begin
+      LUrl := LDoc.GetValue<string>('u', '');
+      LTok := LDoc.GetValue<string>('t', '');
+    end;
+  finally
+    LDoc.Free;
+  end;
+  if (LUrl = '') or (LTok = '') then
+  begin
+    WebCall('PM.toast("No settings in the clipboard - scan the QR on the PC and copy its text first")');
+    Exit;
+  end;
+  ClearClipboard;
+  Log('Sync settings pasted from the clipboard: token ' + Fingerprint(LTok));
+  WebCall(Format('PM.pasteConfig(%s, %s)', [JsArg(LUrl), JsArg(LTok)]));
+end;
+
 function TForm8.CachePwd: string;
 begin
   if HasLocalContainer then Result := FVaultPwd else Result := FSyncPwd;