Android : try to rationalize gpg-agent parameters, prevented sig13 dumps in pinentry.sh + added some pinentry.sh log

android/external/pinentry.sh

@@ -1,7 +1,16 @@
 #!/system/bin/sh
+
+exit_with_log() {
+    echo Pipe kill $$ >> /data/data/com.pep.pepjniaaractivity/files/pinentry.log
+    exit
+}
+trap "exit_with_log" 13
+
+echo Start $$ >> /data/data/com.pep.pepjniaaractivity/files/pinentry.log
 echo OK
 while read cmd rest
 do
+    echo $cmd $rest >> /data/data/com.pep.pepjniaaractivity/files/pinentry.log
     case $cmd in
         SETDESC)
             DESC=$rest
@@ -32,6 +41,7 @@ do
                 pid*)
                     echo D $$
                     echo OK
+                    echo D $$ >> /data/data/com.pep.pepjniaaractivity/files/pinentry.log
                 ;;
             esac
         ;;

android/src/org/pEp/jniadapter/GPGAgentService.java

@@ -21,9 +21,10 @@ public class GPGAgentService extends Service {
                     "gpg-agent" +
                     " --pinentry-program " + 
                     new File(AndroidHelper.binDir, "pinentry.sh").getAbsolutePath() +
-                    " --no-detach" +
-                    " --daemon --write-env-file" +
-                    " --batch" + 
+                    //" --no-detach" +
+                    " --daemon" +
+                    //" --write-env-file" +
+                    //" --batch" + 
                     " --debug-level basic --log-file "
                     + new File(GPGAgentService.this.getFilesDir(), "gpg-agent.log")).waitFor();
                 Log.i(TAG, "execution terminated");