diff options
4 files changed, 17 insertions, 18 deletions
diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml index 9d735860c..1cf132904 100644 --- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml +++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml @@ -13,10 +13,10 @@ <application android:icon="@drawable/icon" - android:label="APG API Demo" > + android:label="OpenPGP Keychain API Demo" > <activity android:name=".BaseActivity" - android:label="APG API Demo" > + android:label="OpenPGP Keychain API Demo" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java index 756dd974b..c0d2a9fa5 100644 --- a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java @@ -24,7 +24,7 @@ import android.widget.Toast; public class KeychainIntentHelper { - public static final String APG_INTENT_PREFIX = "org.thialfihar.android.apg.intent."; + public static final String APG_INTENT_PREFIX = Constants.KEYCHAIN_PACKAGE_NAME + ".action."; // Intents /** @@ -343,7 +343,8 @@ public class KeychainIntentHelper { * @param data * @return handled or not */ - public boolean onActivityResult(int requestCode, int resultCode, Intent data, KeychainData apgData) { + public boolean onActivityResult(int requestCode, int resultCode, Intent data, + KeychainData apgData) { switch (requestCode) { case CREATE_KEY: diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java index 10e431d4b..5939c8e03 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java @@ -22,7 +22,7 @@ public final class Constants { public static final boolean DEBUG = true; - public static final String TAG = "APG"; + public static final String TAG = "Keychain"; public static final String PACKAGE_NAME = "org.sufficientlysecure.keychain"; @@ -35,7 +35,7 @@ public final class Constants { public static final String INTENT_PREFIX = PACKAGE_NAME + ".action."; public static final class path { - public static final String APP_DIR = Environment.getExternalStorageDirectory() + "/APG"; + public static final String APP_DIR = Environment.getExternalStorageDirectory() + "/OpenPGP-Keychain"; } public static final class pref { @@ -1,27 +1,25 @@ -# APG +# OpenPGP Keychain (for Android) -This is a fork of Android Privacy Guard (APG) - -I will try to reintegrate the various forks and develope a new user interface and API via AIDL and build a new stable version. +OpenPGP Keychain is a EXPERIMENTAL fork of Android Privacy Guard (APG) # Contribute -Fork APG and do a merge request. I will merge your changes back into the main project. +Fork OpenPGP Keychain and do a merge request. I will merge your changes back into the main project. # Build ## Build with Ant 1. Have Android SDK "tools" directory in your PATH (http://developer.android.com/sdk/index.html) -2. Change to "APG" directory with ``cd APG`` +2. Change to "OpenPGP-Kechain" directory with ``cd OpenPGP-Kechain`` 3. Execute ``android update project -p .`` and ``android update project -p android-libs/ActionBarSherlock`` 4. Execute ``ant debug`` ## Build with Eclipse -1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "APG/android-libs/ActionBarSherlock" -2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "APG" -3. APG can now be build +1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain/android-libs/ActionBarSherlock" +2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain" +3. OpenPGP-Kechain can now be build # Libraries @@ -52,7 +50,7 @@ see http://rtyley.github.com/spongycastle/ ## Eclipse: "GC overhead limit exceeded" -If you have problems starting APG from Eclipse, consider increasing the memory limits in eclipse.ini. +If you have problems starting OpenPGP Kechain from Eclipse, consider increasing the memory limits in eclipse.ini. See http://docs.oseems.com/general/application/eclipse/fix-gc-overhead-limit-exceeded for more information. ## Generate pressed dashboard icons @@ -116,7 +114,7 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al * ACCESS_KEYS # Licenses -APG is licensed under Apache License v2. +OpenPGP Kechain is licensed under Apache License v2. ## Libraries * ActionBarSherlock @@ -152,5 +150,5 @@ APG is licensed under Apache License v2. Public Domain * dashboard_scan_qrcode.svg - New creation for APG + New creation for OpenPGP Kechain Apache License v2
\ No newline at end of file |