f1f0126048
Switch to new support lib version 22.1
2015-04-25 23:40:26 +02:00
ef52a3319a
Espresso test for CreateKeyActivity
2015-04-25 18:44:02 +05:30
64ca19464b
Set different titles when changing in nav drawer
2015-04-25 14:37:55 +02:00
28da731201
Fix empty screen when clicking on encrypt in details view
2015-04-25 14:15:38 +02:00
de575a618a
Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer
...
Switch to MaterialDrawer library
2015-04-25 13:59:56 +02:00
9c174ff71d
fix encrypt activity layout
2015-04-24 19:17:08 +02:00
96853a15ee
revamp decrypt ui
2015-04-24 19:17:05 +02:00
b323fc29c2
Fix #1197 Switch to MaterialDrawer library
2015-04-24 03:22:15 -07:00
3ee2c6fc6a
Introduce and Switch to mikepenz/MaterialDrawer
2015-04-24 00:00:58 -07:00
40122d61cc
Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
2015-04-24 03:44:57 +01:00
d9cabf8dc4
-Fixed a crash while recreating CreateKeyEmailFragment
...
-Email data is properly restored while rotating the Activity.
-Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
2015-04-24 03:35:30 +01:00
aecebd2ac0
Fixed Snackbar behind layout
...
Surrounded string with quotes
2015-04-22 19:22:12 +05:30
2571d25058
keyserver verification on addition
2015-04-22 06:16:50 +05:30
09cb00a87c
corrected possible null pointer
2015-04-22 03:32:59 +05:30
713f6ba6c7
Simplify ImportKeysProxyActivity
2015-04-21 20:15:10 +02:00
7d273ecfa6
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-04-21 20:09:52 +02:00
5a4a8f2b6a
added log to QR code scan/import fail
2015-04-21 23:16:33 +05:30
9d56fc9768
Fix for initialization failure when card returns FCI in data field.
2015-04-20 19:12:01 -04:00
104fdcd6bf
Track state of PIN verification on smart card; only verify when needed.
2015-04-20 19:11:53 -04:00
91443c2f43
support for handling keyserver urls from browser, added documentation
2015-04-20 21:42:51 +05:30
7a097dd5df
Cleanup in HkpKeyserver
2015-04-20 13:53:00 +02:00
f2d3abd4c9
Format KeyListFragment
2015-04-18 16:52:02 +02:00
555b0bf757
Temporarily fix devices without nfc
2015-04-18 16:50:52 +02:00
b440456acc
Use portrait mode for qr code scanning
2015-04-15 10:25:56 +02:00
e332699c9c
More cleanup
2015-04-15 10:10:53 +02:00
3668c8897d
Fix YubiKey naming, cleanup
2015-04-15 10:02:41 +02:00
f41758261f
Clean up NfcOperationActivity
2015-04-15 09:55:29 +02:00
84deba9886
Reformat nfcVerifyPIN
2015-04-15 09:50:34 +02:00
f85befd982
Consolidate PIN verify operation in nfcVerifyPIN method.
2015-04-14 16:19:28 -04:00
f981c36bf4
Move PIN verify inside sign/decrypt operation and set correct mode.
2015-04-14 15:34:25 -04:00
d097131a3d
-Improved email sanity verifications when adding emails when creating a new Key
...
-fixed a few NFC crashes
-fixed a few instances when showing the keyboard would crash the Activity
-fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
2015-04-14 03:40:59 +01:00
71024460cb
Reformat comment in PassphraseCacheService
2015-04-13 23:53:46 +02:00
1923942fc9
Buffer ascii armored encryption/signatures
2015-04-13 23:41:16 +02:00
f12c7b64d8
Merge pull request #1193 from adithyaphilip/auto-refresh-contacts
...
Immediate display of contact card, fixed contact picture display issue, hides card if no contact
2015-04-13 23:33:23 +02:00
256d644d03
IMplement CryptoInputParcelCacheService
2015-04-13 23:29:35 +02:00
9fc001c9b9
Clearer var naming
2015-04-12 21:23:59 +02:00
4a55308741
More simplifications to PassphraseCacheService
2015-04-12 20:12:10 +02:00
c3d6637e6a
Simplify PassphraseCacheService
2015-04-12 19:55:10 +02:00
7074b44347
Cache CryptoInputParcel in OpenPgpService
2015-04-10 15:58:37 +02:00
5ea01a15d3
Remove unused AlgorithmNames
2015-04-10 15:21:02 +02:00
ae4fc47443
Add license headers
2015-04-10 15:20:36 +02:00
702a77ccd1
Externalize Parcelable caching
2015-04-10 15:16:13 +02:00
083cd100ce
hide linked system contact card if no contact present
2015-04-08 01:11:55 +05:30
13332bc28d
linked system contact auto-refresh added, fixed contact image issue
2015-04-08 00:30:55 +05:30
a467480717
Fix signing subkey selection in remote service
2015-04-07 13:49:34 +02:00
8e5d0d1682
Fix nullpointer with Intent API, fix clearing of encrypt file list, notify when adding a range of input uris
2015-04-04 19:01:03 +02:00
ad69622b69
fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)
2015-04-01 00:39:32 +02:00
cc44ff1a8b
Prepare decrypt UI for input parcel
2015-03-31 15:44:37 +02:00
c37e7ef241
Better check if file is already added
2015-03-31 01:53:37 +02:00
ce3a1f4c33
Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel
2015-03-31 00:32:56 +02:00
8bd8267a47
work on passphrase data flow
2015-03-31 00:28:24 +02:00
aea52f2e6f
Simplify passphrase dialog design
2015-03-31 00:24:08 +02:00
6cc7b6141a
update OpenPgpApi, re-add EXTRA_PASSPHRASE
2015-03-30 23:56:09 +02:00
19ecd5f427
Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
2015-03-30 23:42:38 +02:00
b0a51e7dd3
remove unused NfcActivity
2015-03-30 23:39:36 +02:00
39b131c7e5
fix Encrypt* with RequiredInputParcel
2015-03-30 23:35:32 +02:00
d67b546ec5
Dont show slinger button in spinner
2015-03-30 23:23:54 +02:00
a3276a4485
Use RecyclerView in EncryptFilesFragment
2015-03-30 20:41:29 +02:00
d7b79e55fb
pass CryptoInputParcel independently for SignEncryptOperation
2015-03-30 16:40:41 +02:00
91494dd3a3
Merge branch 'development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
2015-03-30 15:53:44 +02:00
dcaac4f85f
rewrite EncryptKeyCompletionView with generalized KeyAdapter
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
2015-03-30 02:45:49 +02:00
7ffb55faaa
Merge branch 'development' into v/crypto-input-parcel
2015-03-29 21:00:06 +02:00
95f1527afe
Fixing crashes with new encrypt ui
2015-03-29 20:37:54 +02:00
6b48ddd717
Merge pull request #1188 from adithyaphilip/import-message-error
...
Corrected import error message, changed style to WARN
2015-03-28 18:11:26 +01:00
1af522cf35
changed style to WARN, corrected error message
2015-03-28 19:47:54 +05:30
605c9ace58
-Fixed a situation where additional emails could be duplicated when creating a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
2015-03-27 23:15:27 +00:00
b82f273284
Start reworking decrypt ui classes
2015-03-27 00:55:55 +01:00
13f4cc4ad3
Refactoring of EncryptTextActivity
2015-03-27 00:40:37 +01:00
f62a5eded4
Merge branch 'development' into v/crypto-input-parcel
2015-03-26 22:48:06 +01:00
76db0b3b8e
Start refactoring encrypt ui, EncryptFileActivity no longer crashing
2015-03-26 11:04:20 +01:00
621e7401a8
Modify break as return.
2015-03-26 12:18:41 +09:00
59a446d7f4
Add brackets for if-else constructs and externalize the procedure as showMultiExportDialog.
2015-03-26 11:59:18 +09:00
1ef63f3187
Fix certify with CryptoInputParcel
2015-03-25 11:12:52 +01:00
5e024bba2e
Remove backward compat in CertifyKeyFragment
2015-03-25 10:50:55 +01:00
e83532cb19
Add a loop for multiple key export.
2015-03-25 04:44:53 +09:00
040cf42cb0
Merge branch 'development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
2015-03-24 13:19:43 +01:00
e2f27d0f47
Pull from transifex
2015-03-23 15:54:48 +01:00
95639f2720
Merge pull request #1165 from kentnek/dev-yubikey-null
...
Fixed #1152 : NullPointerException when signing with YubiKey
2015-03-23 15:39:16 +01:00
54cd414693
Merge pull request #1166 from adithyaphilip/multi-threaded
...
Multi-threaded key import, update all feature
2015-03-23 15:38:57 +01:00
aa3565b857
Fix passphrase cache not clearing all passphrases
2015-03-23 15:38:02 +01:00
30711c3fe7
Merge pull request #1174 from Jesperbk/development
...
Fixed symmetric encryption crash
2015-03-23 13:01:10 +01:00
5bdac11ef8
Fixed issue where setting a passphrase to null later causes a NullPointerException.
2015-03-23 11:17:01 +01:00
9f5581463f
shifted multi-threading to own service
...
added multi-threaded cloud import, restored KeychainIntentService
eliminated code duplication in multi-threaded import
2015-03-23 15:37:05 +05:30
19775c399b
introduced multi-threading
...
refactored oldKeys to updatedKeys
added update all keys, ThreadPoolExecutor
used modified CachedThreadPoolExecutor
2015-03-23 15:34:22 +05:30
c694d73cab
further improve yubikey error handling
2015-03-23 01:48:44 +01:00
633b64fd95
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-23 01:11:17 +01:00
b3a599f214
Use markdown for in-app help
2015-03-23 01:11:11 +01:00
3bb194fc08
nicer handling of nfc errors
2015-03-23 01:09:39 +01:00
5227b45af8
Merge branch 'development' into v/crypto-input-parcel
2015-03-22 22:21:19 +01:00
8b4388e1a2
use top line in snackbar for status indication
2015-03-22 16:55:46 +01:00
5d5e06cabd
fix unit test and add new for divert-to-card promotion
2015-03-22 07:21:27 +01:00
2e838e4cce
enable nfc in import dialog as well
2015-03-22 06:48:33 +01:00
212bba1869
finish ui flow for yubikey import
2015-03-22 06:36:27 +01:00
2151411219
actually promote to divert, pass yubikey's AID
2015-03-22 03:58:01 +01:00
22063cdd6e
improve status reporting in yubikey dialogue
2015-03-22 03:34:34 +01:00
a7c52a1c9f
move yubikey import into viewkeyfragment
2015-03-22 02:36:10 +01:00
04c7639a5a
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
1ad3635d13
work on ad-hoc yubikey import support
2015-03-21 19:52:10 +01:00
147003123f
first steps toward yubikey activity
...
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
2015-03-21 17:13:35 +01:00
9ef2795fcd
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
bf427ce9c1
Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development
2015-03-21 15:43:44 +01:00
10f9dcd7a1
Add TODO to remote API
2015-03-21 15:43:36 +01:00
93c7eb72fb
more data in RequiredInputParcel, OperationResult notifications
...
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
2015-03-21 15:16:32 +01:00
88ca41d555
add edit key unit test for no-op
2015-03-20 18:55:16 +01:00
3e51da3afa
fix unit tests (for real)
2015-03-20 18:45:00 +01:00
850a374788
Added docs for Notify class
2015-03-20 19:49:43 +05:30
fa8d5657be
Fixed Snackbar behind keyboard on ImportKeysActivity
2015-03-20 19:49:43 +05:30
4e4b8efd6e
Reworked Notify class
2015-03-20 19:49:42 +05:30
0954b02812
Merge pull request #1163 from kentnek/dev-list-footer
...
Added a blank footer view to the list of keys
2015-03-20 15:01:08 +01:00
e00ce86de9
fix more unit tests (syntax)
2015-03-20 14:57:38 +01:00
3fce6d8a12
inline mNfcSignOps variable
2015-03-20 14:22:07 +01:00
879efc2c70
fix unit tests (syntax)
2015-03-20 14:21:55 +01:00
6cf966b63f
re-inline cryptoInput variable
2015-03-20 14:10:00 +01:00
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
ebf9bb3a63
Fix API RESULT_TYPE
2015-03-20 13:51:06 +01:00
9e668eadcb
Fix PASSPHRASE handling in API
2015-03-20 13:38:07 +01:00
50913d0ff1
Updated GNU header
2015-03-20 12:38:16 +08:00
e0a5f1a0d4
Removed create and added GPLv3 header
2015-03-20 12:24:06 +08:00
3b04636f5d
support yubikeys in (some) edit key operations
2015-03-20 02:28:22 +01:00
1d6643fa6b
Fixed #1152 :
...
- Checking if input.getSignatureSubKeyId() is not null before proceeding.
2015-03-20 06:40:52 +08:00
8d6d4328f2
Implemented #1162 : Invoke NFC in Advanced View
...
- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
- Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
- Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
- Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
2015-03-20 06:31:18 +08:00
4d43950841
- Added footer so that the Floating Action Button won't block the last few items' content
2015-03-20 06:11:50 +08:00
cfef53be01
Remove on click on icon
2015-03-19 17:21:26 +01:00
7e5cc9ee70
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-19 17:16:30 +01:00
98817d13ee
Manage my keys wizard
2015-03-19 17:16:23 +01:00
6120365ee1
Fix for Issue #1114
...
Displays the snackbar above the keyboard on all activities.
2015-03-19 19:58:24 +05:30
d122d27eba
Fixed a crash on ViewKeyActivity
...
This occurs when deleting a key with a stripped master key from the
ViewKeyActivity.
2015-03-19 18:54:26 +05:30
25d89b5550
generalize NfcOperationParcel to RequiredInputParcel, including passphrases
2015-03-19 14:21:30 +01:00
0bcc2793c3
Improve Passphrase class with finalize()
2015-03-19 13:58:26 +01:00
e65efce333
Fix tests for Passphrase class
2015-03-19 03:30:12 +01:00
b24ff10c43
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-19 03:04:08 +01:00
9c9f95c7ac
New Passphrase class for safer passphrase handling in memory
2015-03-19 03:03:46 +01:00
aab32b81b9
Added comments for server result sorting in key search
2015-03-18 22:24:29 +01:00
d46fc3740b
yubikey certifications!
2015-03-18 21:12:31 +01:00
aca54e31ea
generalize nfc crypto input structure
2015-03-18 18:25:44 +01:00
74c474e3e2
Show HKP server results first in key cloud search. Fixes #1066
2015-03-18 17:49:57 +01:00
4499caef1e
introduce CryptoOperationParcel for nfc data
2015-03-18 14:06:59 +01:00
17181cbc19
contacts work on all supported api levels
2015-03-17 19:07:28 +05:30
7f2a89e125
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-17 13:22:21 +01:00
444123d040
File extensions into Constants
2015-03-17 13:22:13 +01:00
6f496730be
removed unnecessary @TargetApi annotation
2015-03-17 02:32:09 +05:30
fd8f5ebb2f
Allow for hidden recipients in encrypt methods
2015-03-16 18:20:44 +01:00
a5271bf229
Allow encrypt of filenames via overflow menu
2015-03-16 17:00:53 +01:00
a655664c0b
object oriented split user id
2015-03-16 13:54:01 +01:00
58450daef4
Fix nullpointer when scanning malformed qr codes
2015-03-16 00:16:20 +01:00
ad9c35f522
Allow selection of none in SelectSignKeyIdActivity
2015-03-15 22:05:12 +01:00
5cb22ece30
Clarify MIME usage
2015-03-15 21:17:24 +01:00
db39b779c9
fix expiry of master keys
...
fixes #1141
2015-03-15 19:20:03 +01:00
809cd6e495
Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist
2015-03-15 18:58:09 +01:00
fd5719ff6b
Remove display of key id in other lists
2015-03-15 18:40:52 +01:00
81d6da899f
Show main user id instead of key in certify screen
2015-03-15 16:32:52 +01:00
e873bac880
Fixes for selection of certify key
2015-03-15 16:24:06 +01:00
ff60e80d42
Merge pull request #1142 from tdjogi010/development
...
Preselected Suitable Key
2015-03-15 15:56:12 +01:00
8a2bd80d40
Merge pull request #1148 from manojkhannakm/development
...
Fixed a ClassCastException
2015-03-15 15:35:32 +01:00
f1dc58ddfd
Merge pull request #1147 from Hiperzone/development
...
-fixed out of bounds crash when retrieving the main profile name with se...
2015-03-15 15:34:07 +01:00
f4cb254404
Dont display key ids in KeySpinner, display creation date when user ids duplicate
2015-03-15 15:29:06 +01:00
0fe060e88e
Fixed a ClassCastException
2015-03-15 12:30:08 +05:30
c2593f29ff
Query for duplicate user ids
2015-03-15 02:40:31 +01:00
d3dd9020f5
-fixed out of bounds crash when retrieving the main profile name with secret keys
...
-fixed a possible crash when retrieving the main profile contactid
2015-03-15 00:12:26 +00:00
6c9b2ce0c0
Add missing license headers
2015-03-15 00:49:29 +01:00
8ede97b9ff
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-14 21:36:35 +01:00
f1b1ecae20
Merge pull request #1143 from manojkhannakm/development
...
Fix for Issue #1115
2015-03-14 21:36:28 +01:00
afa7790fbd
disable debug sync
2015-03-14 14:08:03 +01:00
12734127a7
Use names also for main contact
2015-03-14 14:07:45 +01:00
cd7f631221
Show key name instead of key id in contacts, cleanup
2015-03-14 14:05:31 +01:00
d56c90ce76
Preselected Suitable Key
2015-03-13 11:06:13 +05:30
d7ef2c1b9e
added some documentation
2015-03-13 04:49:34 +05:30
759009ddb4
added own profile support in linekd system contact
2015-03-13 04:04:11 +05:30
d4375b7dfc
links own keys to me profile in contacts
2015-03-13 03:13:22 +05:30
5b5e5b4981
Fix for Issue #1115
2015-03-13 00:53:05 +05:30
b953623802
Clarify logs in DeleteFileDialog
2015-03-12 14:34:58 +01:00
27027b8ee5
Use notify instead of Toast for NFC check
2015-03-12 13:39:20 +01:00
67a9f12790
Merge pull request #1133 from Rrego6/development
...
Check if NFC is available on device
2015-03-12 13:38:15 +01:00
183457334f
Merge pull request #1117 from danielnelz/development
...
#1042 : Replaced ints with enums
2015-03-12 13:27:04 +01:00
dae48e84c8
Improve file deletion strings
2015-03-12 13:18:31 +01:00
4de978bccb
Merge pull request #1137 from manojkhannakm/development
...
Updated fix for Issue #1116
2015-03-12 13:11:29 +01:00
fb1701f09f
Merge pull request #1134 from adithyaphilip/sync-confirmed-keys
...
Sync only confirmed keys and change
2015-03-12 13:08:18 +01:00
52200edfd7
Fixed possible ArrayIndexOutOfBoundsException.
2015-03-11 21:32:20 +01:00
08972de68f
added contact sync at end of CertifyOperation
2015-03-11 23:11:01 +05:30
45eea9b5b8
corrected linked system contact display name
2015-03-11 23:10:32 +05:30
9ff4d7b2bc
change user_id primary key in database, use keyring rather than unified query in consolidate
2015-03-11 18:39:26 +01:00
bb018b8fc1
Updated fix for Issue #1116
2015-03-11 20:52:00 +05:30
82a2a76a33
make constant for certify hash algo
2015-03-11 14:37:23 +01:00
471f92a967
Check if NFC is available on device
2015-03-10 22:06:17 -04:00
446e16fc62
Disable maybe methods in ImportKeysListEntry for now
2015-03-10 15:55:19 +01:00
79a4e7fb9c
Fix expiry, revoked checks in OpenPgpSignatureResultBuilder
2015-03-10 15:52:44 +01:00
f13953e8fc
API 7
2015-03-10 11:34:35 +01:00
b3257e0ffa
Ripple
2015-03-10 02:13:36 +01:00
64e85a2eb4
Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card
...
Conflicts:
Graphics/get-material-icons.sh
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
2015-03-10 01:51:30 +01:00
b74fa6c662
Merge pull request #1121 from adithyaphilip/rawcontact-deletion
...
Fixed contact deletion Issue #1120
2015-03-10 01:45:28 +01:00
bce0fe6221
Add additional email addresses in create key
2015-03-10 01:44:07 +01:00
3012001979
Show passphrase checkbox in create key
2015-03-10 03:46:10 +05:30
224f243c79
added CALLER_IS_SYNCADAPTER parameter to delete queries
2015-03-10 03:28:12 +05:30
7d2e2e3eec
Make create key wizard step-by-step
2015-03-10 02:49:34 +05:30
e3547b4979
Show passphrase checkbox in create key
2015-03-09 22:09:48 +01:00
67076b2019
Make create key wizard step-by-step
2015-03-09 22:00:44 +01:00
012b7e4830
cleaned up code, added comments
...
optimised imports
2015-03-10 01:33:55 +05:30
f8a6f814dd
added contact linking
2015-03-10 01:08:09 +05:30
bc43797c32
added card
2015-03-10 01:08:09 +05:30
704821a8db
Merge remote-tracking branch 'upstream/development' into development
2015-03-09 20:25:03 +01:00
Dominik Schürmann