Browse Source

Merge branch 'android-build' into Release_2.1

pull/7/head Release_2.1.23
heck 1 year ago
parent
commit
486b4fab93
2 changed files with 17 additions and 26 deletions
  1. +1
    -1
      android/external/downloads/gmp-6.2.1.tar.bz2.md5
  2. +16
    -25
      android/src/foundation/pEp/jniadapter/AndroidHelper.java

+ 1
- 1
android/external/downloads/gmp-6.2.1.tar.bz2.md5 View File

@ -1 +1 @@
28971fc21cf028042d4897f02fd355ea downloads/gmp-6.2.1.tar.bz2
28971fc21cf028042d4897f02fd355ea gmp-6.2.1.tar.bz2

+ 16
- 25
android/src/foundation/pEp/jniadapter/AndroidHelper.java View File

@ -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,17 +63,16 @@ 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
// 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);
@ -98,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);
@ -206,8 +197,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 +210,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 +228,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 +237,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.


Loading…
Cancel
Save