aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-15 22:52:21 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-15 22:52:21 +0200
commit1e22b28c2e8a8da1bd045d40e3a3ae86ed13bbcf (patch)
treeb863a4a5cdb5385add165f1a20608ba79b765220 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
parentfdcc4c1d3d26ab3388705ed4be63e736afeeed48 (diff)
downloadopen-keychain-1e22b28c2e8a8da1bd045d40e3a3ae86ed13bbcf.tar.gz
open-keychain-1e22b28c2e8a8da1bd045d40e3a3ae86ed13bbcf.tar.bz2
open-keychain-1e22b28c2e8a8da1bd045d40e3a3ae86ed13bbcf.zip
Optimize imports
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java1
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java1
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java16
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java6
5 files changed, 20 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
index dd26ed559..2499f2571 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.util;
import android.annotation.SuppressLint;
import android.app.Activity;
+
import org.spongycastle.bcpg.HashAlgorithmTags;
import org.spongycastle.openpgp.PGPEncryptedData;
import org.sufficientlysecure.keychain.Constants;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 02149124c..b7f021646 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
@@ -29,7 +29,6 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
-
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.pgp.PgpHelper;
import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
index ae87deb31..ad1aab146 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
@@ -16,11 +16,11 @@
package org.sufficientlysecure.keychain.util;
-import com.google.zxing.integration.android.IntentIntegrator;
-
import android.content.Intent;
import android.support.v4.app.Fragment;
+import com.google.zxing.integration.android.IntentIntegrator;
+
/**
* IntentIntegrator for the V4 Android compatibility package.
*
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
index 2d8fbcd81..4414f2d71 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
@@ -14,8 +14,20 @@ import android.os.Build;
import android.os.Process;
import android.util.Log;
-import java.io.*;
-import java.security.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.SecureRandomSpi;
+import java.security.Security;
/**
* Fixes for the output of the default PRNG having low entropy.
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
index 7dd97e4ab..cd9e56394 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
@@ -18,6 +18,9 @@
package org.sufficientlysecure.keychain.util;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
@@ -25,9 +28,6 @@ import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-
import org.sufficientlysecure.keychain.Constants;
import java.util.Hashtable;