token-import: first iteration

2017-09-04 23:54:56 +02:00
parent 21bc6f12f0
commit af7d36c038
35 changed files with 1098 additions and 77 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ImportKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ImportKeyringParcel.java
@@ -19,7 +19,6 @@
 package org.sufficientlysecure.keychain.service;


-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;