Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: net/android/network_library.cc

Issue 2363653002: Cleanup unreachable cert adding code (Closed)
Patch Set: Rebased Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/android/network_library.h ('k') | net/base/mime_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/android/network_library.h" 5 #include "net/android/network_library.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 ToJavaByteArray(env, public_key, public_len); 72 ToJavaByteArray(env, public_key, public_len);
73 ScopedJavaLocalRef<jbyteArray> private_array = 73 ScopedJavaLocalRef<jbyteArray> private_array =
74 ToJavaByteArray(env, private_key, private_len); 74 ToJavaByteArray(env, private_key, private_len);
75 jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair( 75 jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair(
76 env, GetApplicationContext(), public_array, private_array); 76 env, GetApplicationContext(), public_array, private_array);
77 LOG_IF(WARNING, !ret) << 77 LOG_IF(WARNING, !ret) <<
78 "Call to Java_AndroidNetworkLibrary_storeKeyPair failed"; 78 "Call to Java_AndroidNetworkLibrary_storeKeyPair failed";
79 return ret; 79 return ret;
80 } 80 }
81 81
82 void StoreCertificate(net::CertificateMimeType cert_type,
83 const void* data,
84 size_t data_len) {
85 JNIEnv* env = AttachCurrentThread();
86 ScopedJavaLocalRef<jbyteArray> data_array =
87 ToJavaByteArray(env, reinterpret_cast<const uint8_t*>(data), data_len);
88 jboolean ret = Java_AndroidNetworkLibrary_storeCertificate(
89 env, GetApplicationContext(), cert_type, data_array);
90 LOG_IF(WARNING, !ret) <<
91 "Call to Java_AndroidNetworkLibrary_storeCertificate"
92 " failed";
93 // Intentionally do not return 'ret', there is little the caller can
94 // do in case of failure (the CertInstaller itself will deal with
95 // incorrect data and display the appropriate toast).
96 }
97
98 bool HaveOnlyLoopbackAddresses() { 82 bool HaveOnlyLoopbackAddresses() {
99 JNIEnv* env = AttachCurrentThread(); 83 JNIEnv* env = AttachCurrentThread();
100 return Java_AndroidNetworkLibrary_haveOnlyLoopbackAddresses(env); 84 return Java_AndroidNetworkLibrary_haveOnlyLoopbackAddresses(env);
101 } 85 }
102 86
103 bool GetMimeTypeFromExtension(const std::string& extension, 87 bool GetMimeTypeFromExtension(const std::string& extension,
104 std::string* result) { 88 std::string* result) {
105 JNIEnv* env = AttachCurrentThread(); 89 JNIEnv* env = AttachCurrentThread();
106 90
107 ScopedJavaLocalRef<jstring> extension_string = 91 ScopedJavaLocalRef<jstring> extension_string =
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 129
146 std::string GetWifiSSID() { 130 std::string GetWifiSSID() {
147 return base::android::ConvertJavaStringToUTF8( 131 return base::android::ConvertJavaStringToUTF8(
148 Java_AndroidNetworkLibrary_getWifiSSID( 132 Java_AndroidNetworkLibrary_getWifiSSID(
149 base::android::AttachCurrentThread(), 133 base::android::AttachCurrentThread(),
150 base::android::GetApplicationContext())); 134 base::android::GetApplicationContext()));
151 } 135 }
152 136
153 } // namespace android 137 } // namespace android
154 } // namespace net 138 } // namespace net
OLDNEW
« no previous file with comments | « net/android/network_library.h ('k') | net/base/mime_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698