Load CA bundle from APK

Remove Assetbridge
This commit is contained in:
Leith Bade
2014-11-18 00:33:59 +11:00
parent f0e4e27cd3
commit 80be6c4eb0
6 changed files with 108 additions and 178 deletions

View File

@@ -1,124 +0,0 @@
package com.arieslabs.assetbridge;
import android.content.Context;
import android.content.res.AssetManager;
import android.util.Log;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
public class Assetbridge {
private static final String TAG = "Assetbridge";
/*static {
System.loadLibrary("assetbridge");
}*/
// unpack
public static void unpack(Context c) {
try {
// first let's get the data directory
String datadir = c.getFilesDir().getAbsolutePath();
Log.v(TAG, "Extracting assets to " + datadir);
// now we need the assetmanager
AssetManager am = c.getAssets();
// only extract what we need
ArrayList<String> assets = new ArrayList<String>();
assets.add("ca-bundle.crt");
//assets.add("styles");
// iterate on the files...
for(String asset : assets) {
delete(datadir + "/" + asset);
copyAssetFolder(am, asset, datadir + "/" + asset);
}
// last, set the ASSETDIR environment variable for the C
// parts of the procee
//setassetdir(c.getCacheDir().getPath());
} catch (IOException e) {
Log.e("Assetbridge", "Can't unpack assets from APK", e);
}
}
public static void delete(String dest) {
File destfh = new File(dest);
if (destfh.exists()) {
destfh.delete();
}
}
public static void copyAssetFolder(AssetManager am, String src, String dest)
throws IOException {
Log.v(TAG, "Copying " + src);
InputStream srcIS = null;
File destfh;
// this is the only way we can tell if this is a file or a
// folder - we have to open the asset, and if the open fails,
// it's a folder...
boolean isDir = false;
try {
srcIS = am.open(src);
} catch (FileNotFoundException e) {
isDir = true;
}
Log.v(TAG, src + " was " + (isDir ? "a dir" : "a file"));
// either way, we'll use the dest as a File
destfh = new File(dest);
// and now, depending on ..
if(isDir) {
// If the directory doesn't yet exist, create it
if( !destfh.exists() ) {
if (!destfh.mkdir()) {
throw new IOException("Failed to mkdir");
}
}
// list the assets in the directory...
String assets[] = am.list(src);
// and copy them all using same.
for(String asset : assets) {
copyAssetFolder(am, src + "/" + asset, dest + "/" + asset);
}
} else {
int count, buffer_len = 2048;
byte[] data = new byte[buffer_len];
// copy the file from the assets subsystem to the filesystem
FileOutputStream destOS = new FileOutputStream(destfh);
//copy the file content in bytes
while( (count = srcIS.read(data, 0, buffer_len)) != -1) {
destOS.write(data, 0, count);
}
// and close the two files
srcIS.close();
destOS.close();
}
}
// the native method to set the environment variable
//public static native void setassetdir(String s);
}

View File

@@ -16,7 +16,6 @@ import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.GestureDetector;
import android.view.InputDevice;
@@ -31,7 +30,6 @@ import android.widget.ZoomButtonsController;
import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
import com.arieslabs.assetbridge.Assetbridge;
// Custom view that shows a Map
// Based on SurfaceView as we use OpenGL ES to render
@@ -143,9 +141,6 @@ public class MapView extends SurfaceView {
String dataPath = context.getFilesDir().getAbsolutePath();
String apkPath = context.getPackageCodePath();
// Extract the asset files
Assetbridge.unpack(context);
// Load the map style and API key
//mStyleUrl = "https://mapbox.github.io/mapbox-gl-styles/styles/bright-v6.json";
mStyleUrl = "asset://styles/styles/bright-v6.json";