moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

update readme

This commit is contained in:
Dominik 2012-11-19 22:42:55 +01:00
parent c36fdbd3f8
commit b56326aec8
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APG/src/org/thialfihar/android/apg/provider/ApgProvider.java
View File

@ -206,7 +206,6 @@ public class ApgProvider extends ContentProvider {
@Override @Override
public boolean onCreate() { public boolean onCreate() {
mUriMatcher = buildUriMatcher(mInternalProvider); mUriMatcher = buildUriMatcher(mInternalProvider);
mApgDatabase = new ApgDatabase(getContext()); mApgDatabase = new ApgDatabase(getContext());
return true; return true;
} }

2
APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java
View File

@ -26,4 +26,4 @@ public class ApgProviderInternal extends ApgProvider {
mInternalProvider = true; mInternalProvider = true;
} }
} }

17
README.md
View File

@ -12,15 +12,14 @@ Fork APG and do a merge request. I will merge your changes back into the main pr
## Build with Ant ## Build with Ant
1. Add a file called local.properties in org_apg folder with the following lines, altered to your locations of the SDK: ``sdk.dir=/opt/android-sdk`` 1. Add a file called ``local.properties`` in APG folder with the following lines, altered to your locations of the SDK: ``sdk.dir=/opt/android-sdk``
2. execute "ant release" 2. execute ``ant release``
## Build with Eclipse ## Build with Eclipse
1. File -> Import -> Android -> Existing Android Code Into Workspace, choose com_actionbarsherlock 1. File -> Import -> Android -> Existing Android Code Into Workspace, choose ``APG/android-libs/ActionBarSherlock``
2. File -> Import -> Android -> Existing Android Code Into Workspace, choose org_apg 2. File -> Import -> Android -> Existing Android Code Into Workspace, choose ``APG``
3. Add com_actionbarsherlock as Android Lib (Properties of org_apg -> Android -> Library -> add) 3. APG can now be build
5. APG can now be build
# Libraries # Libraries
@ -34,10 +33,10 @@ The Libraries are provided in the git repository.
## Build Barcode Scanner Integration ## Build Barcode Scanner Integration
1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout) 1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout)
2. Change android-home variable in "build.properties" in the main directory to point to your Android SDK 2. Change android-home variable in ``build.properties`` in the main directory to point to your Android SDK
3. Change directory to android-integration 3. Change directory to android-integration
4. Build using "ant build" 4. Build using ``ant build``
5. We use "android-integration-supportv4.jar" 5. We use ``android-integration-supportv4.jar``
On error see: http://code.google.com/p/zxing/issues/detail?id=1207 On error see: http://code.google.com/p/zxing/issues/detail?id=1207