projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This wraps the android.util.logging into Log_OC which , if its enabled
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
network
/
AdvancedX509TrustManager.java
diff --git
a/src/com/owncloud/android/network/AdvancedX509TrustManager.java
b/src/com/owncloud/android/network/AdvancedX509TrustManager.java
index
35fadb7
..
671e98b
100644
(file)
--- a/
src/com/owncloud/android/network/AdvancedX509TrustManager.java
+++ b/
src/com/owncloud/android/network/AdvancedX509TrustManager.java
@@
-1,9
+1,9
@@
/* ownCloud Android client application
/* ownCloud Android client application
- * Copyright (C) 2012
Bartek Przybylski
+ * Copyright (C) 2012
-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version
3
of the License, or
+ * the Free Software Foundation, either version
2
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-32,6
+32,8
@@
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
+import com.owncloud.android.Log_OC;
+
import android.util.Log;
/**
import android.util.Log;
/**
@@
-139,7
+141,7
@@
public class AdvancedX509TrustManager implements X509TrustManager {
try {
return (mKnownServersKeyStore.getCertificateAlias(cert) != null);
} catch (KeyStoreException e) {
try {
return (mKnownServersKeyStore.getCertificateAlias(cert) != null);
} catch (KeyStoreException e) {
- Log.d(TAG, "Fail while checking certificate in the known-servers store");
+ Log
_OC
.d(TAG, "Fail while checking certificate in the known-servers store");
return false;
}
}
return false;
}
}