From 04b328c9bb17d3952dc85d243cf463ed7ef4da3b Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Mon, 12 Apr 2021 15:34:46 +0200 Subject: [PATCH 1/3] Android-build: Fix libGmp md5sum --- android/external/downloads/gmp-6.2.1.tar.bz2.md5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/external/downloads/gmp-6.2.1.tar.bz2.md5 b/android/external/downloads/gmp-6.2.1.tar.bz2.md5 index 18f6d95..fceb6f1 100644 --- a/android/external/downloads/gmp-6.2.1.tar.bz2.md5 +++ b/android/external/downloads/gmp-6.2.1.tar.bz2.md5 @@ -1 +1 @@ -28971fc21cf028042d4897f02fd355ea downloads/gmp-6.2.1.tar.bz2 +28971fc21cf028042d4897f02fd355ea gmp-6.2.1.tar.bz2 From 4c1b935803efb282d4a9784893af70ca0106e774 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Mon, 12 Apr 2021 16:36:10 +0200 Subject: [PATCH 2/3] Android: Update engine version code --- .../pEp/jniadapter/AndroidHelper.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/android/src/foundation/pEp/jniadapter/AndroidHelper.java b/android/src/foundation/pEp/jniadapter/AndroidHelper.java index 0d079fe..100001b 100644 --- a/android/src/foundation/pEp/jniadapter/AndroidHelper.java +++ b/android/src/foundation/pEp/jniadapter/AndroidHelper.java @@ -30,7 +30,8 @@ public class AndroidHelper { private static File tmpDir; // TODO : Increment when needed. - public static int ENGINE_VERSION_CODE = 5115; + // TODO : Check if this version tracking is really needed and Automatize it + public static String ENGINE_VERSION_CODE = "Release_2.1.27"; private static File shareDir; @@ -45,7 +46,7 @@ public class AndroidHelper { // Add GnuPG's bin to PATH binDir = new File(optDir, "bin"); - setenv("PATH", System.getenv("PATH") + ":" + + setenv("PATH", System.getenv("PATH") + ":" + binDir.getAbsolutePath(), true); tmpDir = new File(c.getCacheDir(), "tmp"); @@ -62,11 +63,11 @@ public class AndroidHelper { } libDir = new File(optDir, "lib"); - setenv("LD_LIBRARY_PATH", appLibDir + ":" + + setenv("LD_LIBRARY_PATH", appLibDir + ":" + libDir.getAbsolutePath() + ":" + System.getenv("LD_LIBRARY_PATH"), true); - // Set HOME environment variable pointing to + // Set HOME environment variable pointing to // something like "/data/data/app.package.name/home" // pEpEngine use it to find management DB and gpg home homeDir = c.getDir("home", Context.MODE_PRIVATE); @@ -206,8 +207,8 @@ public class AndroidHelper { try { InputStream inputStream = assetManager.open(assetPath); - String targetFileName = - new File(targetDir, + String targetFileName = + new File(targetDir, new File(assetPath).getName()).getAbsolutePath(); OutputStream outputStream = new FileOutputStream(targetFileName); IOUtils.copy(inputStream, outputStream); @@ -219,12 +220,12 @@ public class AndroidHelper { } } - private static int getInstalledVersion() { - int versionCode = -1; + private static String getInstalledVersion() { + String versionCode = ""; if (versionFile.exists()){ try { Scanner scan = new Scanner(versionFile); - versionCode = Integer.parseInt(scan.next()); + versionCode = scan.next(); scan.close(); } catch (Exception e) { Log.e(TAG, "getInstalledVersion: " + e.getMessage()); @@ -237,7 +238,7 @@ public class AndroidHelper { try { FileOutputStream fileOutputStream = new FileOutputStream(versionFile); OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fileOutputStream); - outputStreamWriter.write(String.valueOf(ENGINE_VERSION_CODE) + "\n"); + outputStreamWriter.write(ENGINE_VERSION_CODE + "\n"); outputStreamWriter.close(); fileOutputStream.close(); } catch (Exception e) { @@ -246,7 +247,7 @@ public class AndroidHelper { } public static boolean needNewAssets() { - return ENGINE_VERSION_CODE != getInstalledVersion(); + return !getInstalledVersion().equals(ENGINE_VERSION_CODE); } // TODO: replace with native impl, less prone to failure. From 435f03de5f419bdc9538daace35407ad50609b74 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Mon, 12 Apr 2021 16:55:04 +0200 Subject: [PATCH 3/3] Android: Remove GnuPG implementation leftovers --- .../pEp/jniadapter/AndroidHelper.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/android/src/foundation/pEp/jniadapter/AndroidHelper.java b/android/src/foundation/pEp/jniadapter/AndroidHelper.java index 100001b..99c1dac 100644 --- a/android/src/foundation/pEp/jniadapter/AndroidHelper.java +++ b/android/src/foundation/pEp/jniadapter/AndroidHelper.java @@ -69,11 +69,10 @@ public class AndroidHelper { // Set HOME environment variable pointing to // something like "/data/data/app.package.name/home" - // pEpEngine use it to find management DB and gpg home + // pEpEngine use it to find management DB homeDir = c.getDir("home", Context.MODE_PRIVATE); gnupgHomeDir = new File(homeDir, ".gnupg"); setenv("HOME", homeDir.getAbsolutePath(), true); - setenv("GNUPGHOME", gnupgHomeDir.getAbsolutePath(), true); // pEpEngine need to find the safe words database shareDir = c.getDir("trustwords", Context.MODE_PRIVATE); @@ -99,24 +98,15 @@ public class AndroidHelper { assetFileExtract(c, dBFileName, shareDir); } - // Copy GnuPG binaries + // TODO: Remove this when releasing JNI 2.2.X + // Delete opt dir as no longer needed if (optDir.exists() && needUpgrade){ try { FileUtils.deleteDirectory(optDir); } catch (IOException e) { - Log.e(TAG, "Couldn't delete existing gpg binaries"); + Log.e(TAG, "Couldn't delete opt directory"); } } - if (!optDir.exists()){ - optDir.mkdirs(); - assetPathExtract(c, "lib", optDir); - assetPathExtract(c, "bin", optDir); - assetPathExtract(c, "libexec", optDir); - new File(optDir, "var/cache/gnupg").mkdirs(); - new File(optDir, "var/lib/gnupg").mkdirs(); - new File(optDir, "var/run/gnupg").mkdirs(); - chmod("0755", optDir, true); - } // Fill version file setInstalledVersion(c);