diff options
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/AndroidManifest.xml | 21 | ||||
| -rw-r--r-- | OpenPGP-Keychain/build.gradle | 48 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java | 11 |
3 files changed, 52 insertions, 28 deletions
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index 14d7a1f0a..2c8244055 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -6,7 +6,26 @@ android:versionCode="20000" android:versionName="2.0" > - <!-- General remarks =============== - Last APG 1 version was 10900 (1.0.9 beta 00) - Keychain starting with versionCode 20000! Association of file types to APG ================================= General remarks about file ending conventions: - *.gpg for binary files - *.asc for ascii armored files The actual content can be anything. The file ending only shows if it is binary or ascii encoded. Remarks about the ugly android:pathPattern: We are matching all files with a specific file ending. This is done in an ugly way because of Android limitations. Read http://stackoverflow.com/questions/1733195/android-intent-filter-for-a-particular-file-extension and http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i/8599921 for more information. --> + <!-- + General remarks + =============== + - Last APG 1 version was 10900 (1.0.9 beta 00) + - Keychain starting with versionCode 20000! + + Association of file types to Keychain + ===================================== + General remarks about file ending conventions: + - *.gpg for binary files + - *.asc for ascii armored files The actual content can be anything. + + The file ending only shows if it is binary or ascii encoded. + + Remarks about the ugly android:pathPattern: + We are matching all files with a specific file ending. + This is done in an ugly way because of Android limitations. + Read http://stackoverflow.com/questions/1733195/android-intent-filter-for-a-particular-file-extension and http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i/8599921 + for more information. + --> <uses-sdk android:minSdkVersion="8" diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle index a1bf3b783..a8523a6c8 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenPGP-Keychain/build.gradle @@ -16,8 +16,9 @@ repositories { dependencies { compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar']) - compile 'com.android.support:support-v4:13.0.+' + //compile 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock compile 'com.actionbarsherlock:actionbarsherlock:4.4.+@aar' + compile project(':libraries:HtmlTextView') } android { @@ -26,7 +27,7 @@ android { defaultConfig { minSdkVersion 8 - targetSdkVersion 18 + targetSdkVersion 17 } sourceSets { @@ -43,28 +44,31 @@ android { instrumentTest.setRoot('tests') } - if (project.hasProperty('signingStoreLocation')) { - /* - * To sign release build, create file gradle.properties in .gradle/ with this content: - * - * signingStoreLocation=/home/key.store - * signingStorePassword=xxx - * signingKeyAlias=alias - * signingKeyPassword=xxx - */ - signingConfigs { - myConfig { - storeFile file(signingStoreLocation) - storePassword signingStorePassword - keyAlias signingKeyAlias - keyPassword signingKeyPassword - } - } - - buildTypes { + /* + * To sign release build, create file gradle.properties in ~/.gradle/ with this content: + * + * signingStoreLocation=/home/key.store + * signingStorePassword=xxx + * signingKeyAlias=alias + * signingKeyPassword=xxx + */ + if (project.hasProperty('signingStoreLocation') && + project.hasProperty('signingStorePassword') && + project.hasProperty('signingKeyAlias') && + project.hasProperty('signingKeyPassword')) { + println "Found sign properties in gradle.properties! Signing build…" + + signingConfigs { release { - signingConfig signingConfigs.myConfig + storeFile file(signingStoreLocation) + storePassword signingStorePassword + keyAlias signingKeyAlias + keyPassword signingKeyPassword } } + + buildTypes.release.signingConfig = signingConfigs.release + } else { + buildTypes.release.signingConfig = null } } diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java index 3360388b8..a8e101dae 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java @@ -51,10 +51,11 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { public static final String EXTRA_MESSENGER = "messenger"; + // passphrase action public static final String EXTRA_SECRET_KEY_ID = "secret_key_id"; + // register action public static final String EXTRA_PACKAGE_NAME = "package_name"; - - // select activity + // select pub keys action public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "master_key_ids"; public static final String EXTRA_MISSING_USER_IDS = "missing_user_ids"; public static final String EXTRA_DUBLICATE_USER_IDS = "dublicate_user_ids"; @@ -63,10 +64,11 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { // register view private AppSettingsFragment mSettingsFragment; - // select pub key view + // select pub keys view private SelectPublicKeyFragment mSelectFragment; - // has the user clicked one of the buttons? + // has the user clicked one of the buttons + // or do we need to handle the callback in onStop() private boolean finishHandled; @Override @@ -267,7 +269,6 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { getSupportFragmentManager().beginTransaction() .add(R.id.api_select_pub_keys_fragment_container, mSelectFragment).commit(); } - } else { Log.e(Constants.TAG, "Wrong action!"); finish(); |