Vincent Breitmoser abce05d529 Merge remote-tracking branch 'origin/development' into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java

2015-03-20 14:01:07 +01:00

..

AlgorithmNames.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

Choice.java

add ecc support

2014-08-24 16:08:37 +02:00

ContactHelper.java

removed unnecessary @TargetApi annotation

2015-03-17 02:32:09 +05:30

DatabaseUtil.java

Add temporary file storage as discussed in #665

2014-07-01 14:50:15 +02:00

EmailKeyHelper.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

ExportHelper.java

Fixed a crash on ViewKeyActivity

2015-03-19 18:54:26 +05:30

FabContainer.java

forgot to commit FabContainer

2015-02-28 00:40:11 +01:00

FileHelper.java

package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting

2014-09-17 21:51:25 +02:00

InputData.java

rewrite PgpSignEncrypt data flow

2015-02-01 23:14:26 +01:00

IntentIntegratorSupportV4.java

Move logic classes for import into own sub-package

2014-05-06 22:29:57 +02:00

Iso7816TLV.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

IterableIterator.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

KeyUpdateHelper.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

Log.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

NfcHelper.java

Merge remote-tracking branch 'origin/development' into development

2015-03-20 14:01:07 +01:00

ParcelableFileCache.java

prevent recursive consolidate

2015-01-31 18:49:00 +01:00

Passphrase.java

Improve Passphrase class with finalize()

2015-03-19 13:58:26 +01:00

PositionAwareInputStream.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

Preferences.java

Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists

2015-03-05 16:57:57 +01:00

Primes.java

Change license from ASLv2 to GPLv3 where possible

2014-04-08 11:59:35 +02:00

PRNGFixes.java

Optimize imports

2014-04-15 22:52:21 +02:00

ProgressFixedScaler.java

add ProgressFixedScaler (forgot in a previous commit)

2014-08-19 15:55:53 +02:00

ProgressScaler.java

prevent cancel dring consolidate, move logic into progressable

2014-10-26 22:00:57 +01:00

ShareHelper.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

TlsHelper.java

rewrite PgpSignEncrypt data flow

2015-02-01 23:14:26 +01:00

Utf8Util.java

New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)

2014-09-15 10:19:55 +02:00