haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mobile: rename 'lool' -> 'cool' 

Change-Id: Icea136704eaf13c6da0ec455a9e6207b57e2a7f6
Signed-off-by: Henry Castro <hcastro@collabora.com>
pull/3649/head
Henry Castro 2021-11-15 12:25:18 -04:00 committed by Andras Timar
parent c2d60f3627
commit a8b628ee43
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/lib/src/main/cpp/androidapp.cpp
View File

@ -196,7 +196,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
if (string_value)
{
LOG_DBG("From JS: lool: " << string_value);
LOG_DBG("From JS: cool: " << string_value);
// we need a copy, because we can get a new one while we are still
// taking down the old one
@ -295,7 +295,7 @@ Java_org_libreoffice_androidlib_LOActivity_postMobileMessageNative(JNIEnv *env,
}
}
else
LOG_DBG("From JS: lool: some object");
LOG_DBG("From JS: cool: some object");
}
extern "C" jboolean libreofficekit_initialize(JNIEnv* env, jstring dataDir, jstring cacheDir, jstring apkFile, jobject assetManager);

2
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
View File

@ -93,7 +93,7 @@ public class LOActivity extends AppCompatActivity {
private static final String KEY_IS_EDITABLE = "isEditable";
private static final String KEY_INTENT_URI = "intentUri";
private static final String CLIPBOARD_FILE_PATH = "LibreofficeClipboardFile.data";
private static final String CLIPBOARD_LOOL_SIGNATURE = "lool-clip-magic-4a22437e49a8-";
private static final String CLIPBOARD_LOOL_SIGNATURE = "cool-clip-magic-4a22437e49a8-";
public static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST";
private static String USER_NAME_KEY = "USER_NAME";

8
gtk/mobile.cpp
View File

@ -153,7 +153,7 @@ static void handle_lool_message(WebKitUserContentManager *manager,
if (string_value)
{
LOG_TRC_NOFILE("From JS: lool: " << string_value);
LOG_TRC_NOFILE("From JS: cool: " << string_value);
if (strcmp(string_value, "HULLO") == 0)
{
@ -253,7 +253,7 @@ static void handle_lool_message(WebKitUserContentManager *manager,
g_free(string_value);
}
else
LOG_TRC_NOFILE("From JS: lool: some object");
LOG_TRC_NOFILE("From JS: cool: some object");
}
static void handle_debug_message(WebKitUserContentManager *manager,
@ -313,11 +313,11 @@ int main(int argc, char* argv[])
WebKitUserContentManager *userContentManager = WEBKIT_USER_CONTENT_MANAGER(webkit_user_content_manager_new());
g_signal_connect(userContentManager, "script-message-received::debug", G_CALLBACK(handle_debug_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::lool", G_CALLBACK(handle_lool_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::cool", G_CALLBACK(handle_lool_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::error", G_CALLBACK(handle_error_message), nullptr);
webkit_user_content_manager_register_script_message_handler(userContentManager, "debug");
webkit_user_content_manager_register_script_message_handler(userContentManager, "lool");
webkit_user_content_manager_register_script_message_handler(userContentManager, "cool");
webkit_user_content_manager_register_script_message_handler(userContentManager, "error");
webView = WEBKIT_WEB_VIEW(webkit_web_view_new_with_user_content_manager(userContentManager));

8
ios/Mobile/DocumentViewController.mm
View File

@ -80,7 +80,7 @@ static IMP standardImpOfInputAccessoryView = nil;
WKUserContentController *userContentController = [[WKUserContentController alloc] init];
[userContentController addScriptMessageHandler:self name:@"debug"];
[userContentController addScriptMessageHandler:self name:@"lool"];
[userContentController addScriptMessageHandler:self name:@"cool"];
[userContentController addScriptMessageHandler:self name:@"error"];
configuration.userContentController = userContentController;
@ -196,7 +196,7 @@ static IMP standardImpOfInputAccessoryView = nil;
[self.document closeWithCompletionHandler:^(BOOL success){
LOG_TRC("close completion handler gets " << (success?"YES":"NO"));
[self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"debug"];
[self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"lool"];
[self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"cool"];
[self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"error"];
self.webView.configuration.userContentController = nil;
[self.webView removeFromSuperview];
@ -277,7 +277,7 @@ static IMP standardImpOfInputAccessoryView = nil;
LOG_ERR("Error from WebView: " << [message.body UTF8String]);
} else if ([message.name isEqualToString:@"debug"]) {
std::cerr << "==> " << [message.body UTF8String] << std::endl;
} else if ([message.name isEqualToString:@"lool"]) {
} else if ([message.name isEqualToString:@"cool"]) {
NSString *subBody = [message.body substringToIndex:std::min(100ul, ((NSString*)message.body).length)];
if (subBody.length < ((NSString*)message.body).length)
subBody = [subBody stringByAppendingString:@"..."];
@ -387,7 +387,7 @@ static IMP standardImpOfInputAccessoryView = nil;
WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
WKUserContentController *userContentController = [[WKUserContentController alloc] init];
[userContentController addScriptMessageHandler:self name:@"lool"];
[userContentController addScriptMessageHandler:self name:@"cool"];
configuration.userContentController = userContentController;