lint fixes

--HG--
extra : rebase_source : 3255789b1dc3b39dddf101f46ac78d68b01ec5e4

2 files changed, 15 insertions, 10 deletions

diff --git a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index c42ac065..928a85eb 100644
--- a/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/src/de/blinkt/openvpn/api/ExternalOpenVPNService.java
@@ -6,6 +6,7 @@ import java.lang.ref.WeakReference;
 import java.util.LinkedList;

 import java.util.List;

 

+import android.annotation.TargetApi;

 import android.app.Service;

 import android.content.ComponentName;

 import android.content.Context;

@@ -15,12 +16,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;

 import android.content.pm.PackageManager.NameNotFoundException;

 import android.net.VpnService;

-import android.os.Binder;

-import android.os.Handler;

-import android.os.IBinder;

-import android.os.Message;

-import android.os.RemoteCallbackList;

-import android.os.RemoteException;

+import android.os.*;

 import de.blinkt.openvpn.R;

 import de.blinkt.openvpn.VpnProfile;

 import de.blinkt.openvpn.core.ConfigParser;

@@ -33,6 +29,7 @@ import de.blinkt.openvpn.core.OpenVpnService.LocalBinder;
 import de.blinkt.openvpn.core.ProfileManager;

 import de.blinkt.openvpn.core.VPNLaunchHelper;

 

+@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)

 public class ExternalOpenVPNService extends Service implements StateListener {

 

     private static final int SEND_TOALL = 0;

diff --git a/src/de/blinkt/openvpn/fragments/Settings_Basic.java b/src/de/blinkt/openvpn/fragments/Settings_Basic.java
index cd8730dd..d18a2ed1 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Basic.java
+++ b/src/de/blinkt/openvpn/fragments/Settings_Basic.java
@@ -1,5 +1,6 @@
 package de.blinkt.openvpn.fragments;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -13,6 +14,7 @@ import android.os.Handler.Callback;
 import android.os.Message;
 import android.security.KeyChain;
 import android.security.KeyChainAliasCallback;
+import android.security.KeyChainException;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -87,10 +89,10 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On
                     X509Certificate cert = KeyChain.getCertificateChain(getActivity(), mProfile.mAlias)[0];
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                            String algorithm=  KeyChain.getPrivateKey(getActivity(),mProfile.mAlias).getAlgorithm();
-                            if (KeyChain.isBoundKeyAlgorithm(algorithm))
+                        {
+                            if (isInHardwareKeystore())
                                 certstr+=getString(R.string.hwkeychain);
-
+                        }
                     }
 
                     certstr+=X509Utils.getCertificateFriendlyName(cert);
@@ -111,7 +113,13 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On
         }.start();
     }
 
-	@Override
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    private boolean isInHardwareKeystore() throws KeyChainException, InterruptedException {
+        String algorithm = KeyChain.getPrivateKey(getActivity(), mProfile.mAlias).getAlgorithm();
+        return KeyChain.isBoundKeyAlgorithm(algorithm);
+    }
+
+    @Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {