diff --git a/.gitattributes b/.gitattributes
index 03c23b6..2d9fa44 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,3 +31,10 @@
 *.ico   binary
 *.png   binary
 *.rar   binary
+
+# RAD Studio exige CRLF dans les sources Pascal — sans cette regle, git les
+# normalise en LF au commit et le compilateur le signale a chaque unite.
+*.pas text eol=crlf
+*.dpr text eol=crlf
+*.dproj text eol=crlf
+*.fmx text eol=crlf
diff --git a/android-client/PMA.Crypto.pas b/android-client/PMA.Crypto.pas
index a8f0a86..22aaa5e 100644
--- a/android-client/PMA.Crypto.pas
+++ b/android-client/PMA.Crypto.pas
@@ -70,7 +70,9 @@ implementation
 
 {$IF DEFINED(ANDROID)}
 uses
-  Androidapi.JNIBridge, Androidapi.JNI.JavaTypes, Androidapi.Helpers;
+  // Androidapi.Jni : sans elle, TJavaArray.Length reste un appel non inline
+  // et le compilateur emet un avertissement a chaque usage.
+  Androidapi.Jni, Androidapi.JNIBridge, Androidapi.JNI.JavaTypes, Androidapi.Helpers;
 {$ENDIF}
 
 var
diff --git a/android-client/PMA.Store.pas b/android-client/PMA.Store.pas
index a28aad8..012204d 100644
--- a/android-client/PMA.Store.pas
+++ b/android-client/PMA.Store.pas
@@ -62,7 +62,7 @@ implementation
 
 {$IF DEFINED(ANDROID)}
 uses
-  Androidapi.JNIBridge, Androidapi.JNI.JavaTypes, Androidapi.Helpers;
+  Androidapi.Jni, Androidapi.JNIBridge, Androidapi.JNI.JavaTypes, Androidapi.Helpers;
 {$ENDIF}
 
 const
@@ -213,7 +213,9 @@ type
   [JavaSignature('javax/crypto/Cipher')]
   JCipherX = interface(JObject)
     ['{3D2B1C4E-5F60-7B82-9DA4-192031425364}']
-    procedure init(opmode: Integer; key: JKeyX); cdecl;
+    // Les DEUX surcharges doivent porter la directive : Delphi refuse une
+    // seconde declaration si la premiere ne l'a pas.
+    procedure init(opmode: Integer; key: JKeyX); cdecl; overload;
     procedure init(opmode: Integer; key: JKeyX; params: JAlgorithmParameterSpecX); cdecl; overload;
     function doFinal(input: TJavaArray<Byte>): TJavaArray<Byte>; cdecl;
     function getIV: TJavaArray<Byte>; cdecl;