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

Side by Side Diff: components/gcm_driver/gcm_driver_android.cc

Issue 1243563002: Teach the GCM Driver how to decrypt incoming messages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcm-push-keys
Patch Set: Created 5 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/gcm_driver/gcm_driver_android.h" 5 #include "components/gcm_driver/gcm_driver_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 message.collapse_key = ConvertJavaStringToUTF8(env, j_collapse_key); 72 message.collapse_key = ConvertJavaStringToUTF8(env, j_collapse_key);
73 // Expand j_data_keys_and_values from array to map. 73 // Expand j_data_keys_and_values from array to map.
74 std::vector<std::string> data_keys_and_values; 74 std::vector<std::string> data_keys_and_values;
75 AppendJavaStringArrayToStringVector(env, 75 AppendJavaStringArrayToStringVector(env,
76 j_data_keys_and_values, 76 j_data_keys_and_values,
77 &data_keys_and_values); 77 &data_keys_and_values);
78 for (size_t i = 0; i + 1 < data_keys_and_values.size(); i += 2) { 78 for (size_t i = 0; i + 1 < data_keys_and_values.size(); i += 2) {
79 message.data[data_keys_and_values[i]] = data_keys_and_values[i+1]; 79 message.data[data_keys_and_values[i]] = data_keys_and_values[i+1];
80 } 80 }
81 81
82 GetAppHandler(app_id)->OnMessage(app_id, message); 82 DispatchMessage(app_id, message);
83 } 83 }
84 84
85 void GCMDriverAndroid::OnMessagesDeleted(JNIEnv* env, 85 void GCMDriverAndroid::OnMessagesDeleted(JNIEnv* env,
86 jobject obj, 86 jobject obj,
87 jstring j_app_id) { 87 jstring j_app_id) {
88 std::string app_id = ConvertJavaStringToUTF8(env, j_app_id); 88 std::string app_id = ConvertJavaStringToUTF8(env, j_app_id);
89 89
90 GetAppHandler(app_id)->OnMessagesDeleted(app_id); 90 GetAppHandler(app_id)->OnMessagesDeleted(app_id);
91 } 91 }
92 92
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 ConvertUTF8ToJavaString(env, sender_id).Release()); 206 ConvertUTF8ToJavaString(env, sender_id).Release());
207 } 207 }
208 208
209 void GCMDriverAndroid::SendImpl(const std::string& app_id, 209 void GCMDriverAndroid::SendImpl(const std::string& app_id,
210 const std::string& receiver_id, 210 const std::string& receiver_id,
211 const OutgoingMessage& message) { 211 const OutgoingMessage& message) {
212 NOTIMPLEMENTED(); 212 NOTIMPLEMENTED();
213 } 213 }
214 214
215 } // namespace gcm 215 } // namespace gcm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698