This repository was archived by the owner on Jan 12, 2019. It is now read-only.
ctb-android-changes #96
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,6 +50,18 @@ | |
| import io.card.payment.ui.Appearance; | ||
| import io.card.payment.ui.ViewUtil; | ||
|
|
||
|
|
||
| /* Tesseract Imports */ | ||
| import android.os.Environment; | ||
|
||
| import android.content.Context; | ||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * This is the entry point {@link android.app.Activity} for a card.io client to use <a | ||
| * href="https://card.io">card.io</a>. | ||
|
|
@@ -327,7 +339,7 @@ public final class CardIOActivity extends Activity { | |
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| Log.i(TAG, "onCreate()"); | ||
| tessSetup(); | ||
| numActivityAllocations++; | ||
| // NOTE: java native asserts are disabled by default on Android. | ||
| if (numActivityAllocations != 1) { | ||
|
|
@@ -1111,4 +1123,94 @@ public Rect getTorchRect() { | |
| return mOverlay.getTorchRect(); | ||
| } | ||
|
|
||
| /*************************** TESSERACT Entry Point **************************/ | ||
|
|
||
|
|
||
| private String DATA_PATH = ""; | ||
| private final String TESSDATA = "tessdata"; | ||
| private final String TESSCONFIG = "tessconfigs"; | ||
|
|
||
| /* | ||
| * Entry point for tessdata adapted from TessTwo | ||
| */ | ||
| private void tessSetup() { | ||
| DATA_PATH = getExternalFilesDir(null) + "/Tesseract/";//getFilesDir()+ "/Tesseract/";//getExternalFilesDir(null) + "/Tesseract/";//Environment.getExternalStorageDirectory().toString() + "/Tesseract/"; | ||
|
||
| Log.i(TAG, "Attempting to copy tessdata"); | ||
| Log.i(TAG, "Accessing: "+ DATA_PATH); | ||
| prepareTesseract(); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Prepare directory on external storage | ||
| * | ||
| * @param path | ||
| * @throws Exception | ||
| */ | ||
| private void prepareDirectory(String path) { | ||
|
|
||
|
||
| File dir = new File(path); | ||
| if (!dir.exists()) { | ||
| if (!dir.mkdirs()) { | ||
| Log.e(TAG, "ERROR: Creation of directory " + path + " failed, check does Android Manifest have permission to write to external storage?"); | ||
| } | ||
| } | ||
| else { | ||
| Log.i(TAG, "Created directory " + path); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private void prepareTesseract() { | ||
| try { | ||
| prepareDirectory(DATA_PATH + TESSDATA); | ||
| prepareDirectory(DATA_PATH + TESSDATA + "/" + TESSCONFIG); | ||
| } | ||
| catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| copyTessDataFiles(TESSDATA); | ||
| } | ||
|
|
||
| /** | ||
| * Copy tessdata files (located on assets/tessdata) to destination directory | ||
| * | ||
| * @param path - name of directory with .traineddata files | ||
| */ | ||
| private void copyTessDataFiles(String path) { | ||
| try { | ||
| String fileList[] = getAssets().list(path); | ||
|
|
||
| for (String fileName : fileList) { | ||
|
|
||
| // open file within the assets folder | ||
| // if it is not already there copy it to the sdcard | ||
| String pathToDataFile = DATA_PATH + path + "/" + fileName; | ||
| if (!(new File(pathToDataFile)).exists()) { | ||
|
|
||
| InputStream in = getAssets().open(path + "/" + fileName); | ||
|
|
||
| OutputStream out = new FileOutputStream(pathToDataFile); | ||
|
|
||
| // Transfer bytes from in to out | ||
| byte[] buf = new byte[1024]; | ||
| int len; | ||
|
|
||
| while ((len = in.read(buf)) > 0) { | ||
| out.write(buf, 0, len); | ||
| } | ||
| in.close(); | ||
| out.close(); | ||
|
|
||
| Log.d(TAG, "Copied " + fileName + " to tessdata"); | ||
| } | ||
| } | ||
| } | ||
| catch (IOException e) { | ||
| Log.e(TAG, "Unable to copy files to tessdata " + e.toString()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does
tessdataneed these extra permissions? Is the data not stored within the SDK itself?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tessdata is an external directory read in by Tesseract. It needs to be included with the app/assets/bundle. With android the only way to do this is have it on the sd card or emulated storage build into most devices. Read/write external in this case does not mean external storage but rather the external emulated storage.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be no need to write it to external storage, the internal private storage for the app should be fine. I've had to do something similar with an OpenVPN binary that needs to read a configuration file from disk, it does need to be written to storage instead of the assets directory so it can be accessed as a file, but from the point of view of the app, internal storage should be ok.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an issue with tesseract, not an inability to read from assets. C/C++ can do what you described. However to my knowledge Tesseract specifically does not. It is platform agnostic so it cannot use AssetManager/NDK without referencing android specific apis. I will look into adding this functionality with some flags/magic if that is the desired. It should also be noted that this is not writing to external storage. It is internal to the phone, not the apk. The write permission is required to do that. It may require code changes to tesseract. The current solution is the agreed method outside of changing the tesseract source. Having said that I am in agreement that this is sort of a stupid solution to something you would think would be more straight forward as it is with ios version.
Some relevant discussion on the topic: http://stackoverflow.com/questions/23174318/how-to-get-a-full-path-for-an-android-resource-file-init-tesseract-ocr-in-andro