| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/android/webapk/webapk_update_manager.h" | 5 #include "chrome/browser/android/webapk/webapk_update_manager.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 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 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 using base::android::JavaParamRef; | 23 using base::android::JavaParamRef; |
| 24 | 24 |
| 25 // static | 25 // static |
| 26 bool WebApkUpdateManager::Register(JNIEnv* env) { | 26 bool WebApkUpdateManager::Register(JNIEnv* env) { |
| 27 return RegisterNativesImpl(env); | 27 return RegisterNativesImpl(env); |
| 28 } | 28 } |
| 29 | 29 |
| 30 // static | 30 // static |
| 31 void WebApkUpdateManager::OnBuiltWebApk(const std::string& id, | 31 void WebApkUpdateManager::OnBuiltWebApk(const std::string& id, |
| 32 bool success, | 32 WebApkInstallResult result, |
| 33 bool relax_updates, | 33 bool relax_updates, |
| 34 const std::string& webapk_package) { | 34 const std::string& webapk_package) { |
| 35 JNIEnv* env = base::android::AttachCurrentThread(); | 35 JNIEnv* env = base::android::AttachCurrentThread(); |
| 36 | 36 |
| 37 if (success) { | |
| 38 DVLOG(1) | |
| 39 << "Sent request to update WebAPK to server. Seems to have worked."; | |
| 40 } else { | |
| 41 LOG(WARNING) << "Server request to update WebAPK failed."; | |
| 42 } | |
| 43 | |
| 44 base::android::ScopedJavaLocalRef<jstring> java_id = | 37 base::android::ScopedJavaLocalRef<jstring> java_id = |
| 45 base::android::ConvertUTF8ToJavaString(env, id); | 38 base::android::ConvertUTF8ToJavaString(env, id); |
| 46 Java_WebApkUpdateManager_onBuiltWebApk(env, java_id.obj(), success, | 39 Java_WebApkUpdateManager_onBuiltWebApk( |
| 47 relax_updates); | 40 env, java_id.obj(), static_cast<int>(result), relax_updates); |
| 48 } | 41 } |
| 49 | 42 |
| 50 // static JNI method. | 43 // static JNI method. |
| 51 static void UpdateAsync( | 44 static void UpdateAsync( |
| 52 JNIEnv* env, | 45 JNIEnv* env, |
| 53 const JavaParamRef<jclass>& clazz, | 46 const JavaParamRef<jclass>& clazz, |
| 54 const JavaParamRef<jstring>& java_id, | 47 const JavaParamRef<jstring>& java_id, |
| 55 const JavaParamRef<jstring>& java_start_url, | 48 const JavaParamRef<jstring>& java_start_url, |
| 56 const JavaParamRef<jstring>& java_scope, | 49 const JavaParamRef<jstring>& java_scope, |
| 57 const JavaParamRef<jstring>& java_name, | 50 const JavaParamRef<jstring>& java_name, |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock); | 104 gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock); |
| 112 best_primary_icon_bitmap.setImmutable(); | 105 best_primary_icon_bitmap.setImmutable(); |
| 113 | 106 |
| 114 std::string webapk_package; | 107 std::string webapk_package; |
| 115 ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package); | 108 ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package); |
| 116 | 109 |
| 117 WebApkInstallService* install_service = WebApkInstallService::Get(profile); | 110 WebApkInstallService* install_service = WebApkInstallService::Get(profile); |
| 118 if (install_service->IsInstallInProgress(info.manifest_url)) { | 111 if (install_service->IsInstallInProgress(info.manifest_url)) { |
| 119 base::ThreadTaskRunnerHandle::Get()->PostTask( | 112 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 120 FROM_HERE, | 113 FROM_HERE, |
| 121 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id, false /* success */, | 114 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id, |
| 122 false /* relax_updates */, "" /* webapk_package */)); | 115 WebApkInstallResult::FAILURE, false /* relax_updates */, |
| 116 "" /* webapk_package */)); |
| 123 return; | 117 return; |
| 124 } | 118 } |
| 125 install_service->UpdateAsync( | 119 install_service->UpdateAsync( |
| 126 info, best_primary_icon_bitmap, webapk_package, java_webapk_version, | 120 info, best_primary_icon_bitmap, webapk_package, java_webapk_version, |
| 127 icon_url_to_murmur2_hash, java_is_manifest_stale, | 121 icon_url_to_murmur2_hash, java_is_manifest_stale, |
| 128 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id)); | 122 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id)); |
| 129 } | 123 } |
| OLD | NEW |