aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into backup-apiDominik Schürmann2016-05-071-5/+5
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib
| * Update obsolete Nfc class prefixesNikita Mikhailov2016-04-161-2/+2
| |
| * OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-151-3/+3
| |
| * OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-141-3/+3
| |
* | Add backup APIDominik Schürmann2016-03-011-0/+9
|/
* Passthrough of data Intent in methods of ApiPendingIntentFactory instead of ↵Dominik Schürmann2016-02-231-28/+26
| | | | constructor
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-221-26/+24
|
* Use FLAG_IMMUTABLEDominik Schürmann2016-02-221-6/+22
|
* Move PendingIntent creation into factoryDominik Schürmann2016-02-221-0/+166