From 0c8276be9d37d78df1996eee96a3ef2faf7714a2 Mon Sep 17 00:00:00 2001 From: Chimaa123 <47809749+Chimaa123@users.noreply.github.com> Date: Thu, 5 Jan 2023 11:46:25 +0800 Subject: [PATCH 01/13] fix: android maven error android maven error --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 2d905b8..23b27fe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,7 +34,7 @@ android { repositories { google() mavenCentral() - maven { url 'http://devrepo.kakao.com:8088/nexus/content/groups/public/' } + maven { url 'https://devrepo.kakao.com:8088/nexus/content/groups/public/' } } dependencies { From 0172ba3ebb87c6833f086c4fef3b0fe1c249cd59 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 09:05:39 +0800 Subject: [PATCH 02/13] fix: no common kakao --- ios/ARNKakaoChannel.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 44947a7..b545f9d 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -14,19 +14,19 @@ import SafariServices @objc(ARNKakaoChannel) public class ARNKakaoChannel: NSObject { private var safariViewController: SFSafariViewController? - + public override init() { let appKey: String? = Bundle.main.object(forInfoDictionaryKey: "KAKAO_APP_KEY") as? String - KakaoSDKCommon.initSDK(appKey: appKey!) + KakaoSDK.initSDK(appKey: appKey!) } - + func presentSafari(url: URL, completion: @escaping (Bool) -> Void) -> Void { let queue = DispatchQueue(label: "KakaoChannel") self.safariViewController = SFSafariViewController(url: url) self.safariViewController?.modalTransitionStyle = .crossDissolve self.safariViewController?.modalPresentationStyle = .overCurrentContext - + queue.async { UIApplication.shared.open(url, options: [:], @@ -35,7 +35,7 @@ public class ARNKakaoChannel: NSObject { }) } } - + @objc(addFriend:resolve:reject:) func addFriend(_ friendId: NSString, resolver resolve: @escaping RCTPromiseResolveBlock, @@ -45,7 +45,7 @@ public class ARNKakaoChannel: NSObject { resolve(success); }) } - + @objc(chat:resolve:reject:) func chat(_ friendId: NSString, resolver resolve: @escaping RCTPromiseResolveBlock, From fe76697491d7dae3ab8705203cd26e1d54adfe3c Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 10:03:16 +0800 Subject: [PATCH 03/13] fix: warning requires main queue setup --- ios/ARNKakaoChannel.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index b545f9d..2ffc0c3 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -19,6 +19,10 @@ public class ARNKakaoChannel: NSObject { let appKey: String? = Bundle.main.object(forInfoDictionaryKey: "KAKAO_APP_KEY") as? String KakaoSDK.initSDK(appKey: appKey!) } + + override func requiresMainQueueSetup() { + return NO; + } func presentSafari(url: URL, completion: @escaping (Bool) -> Void) -> Void { From e822b5c8363ddb2413c95f7330f1582ea25971c6 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 10:18:07 +0800 Subject: [PATCH 04/13] fix: waning override main queue method --- ios/ARNKakaoChannel.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 2ffc0c3..5c89c0a 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -20,8 +20,9 @@ public class ARNKakaoChannel: NSObject { KakaoSDK.initSDK(appKey: appKey!) } - override func requiresMainQueueSetup() { - return NO; + @objc + static func requiresMainQueueSetup() -> Bool { + return true; } func presentSafari(url: URL, From e1482b5fd751b98d210f62b220dff71453483118 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 10:19:53 +0800 Subject: [PATCH 05/13] test: chat func resolver rejected not recognized --- ios/ARNKakaoChannelBridge.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/ARNKakaoChannelBridge.m b/ios/ARNKakaoChannelBridge.m index a9a308c..96484dc 100644 --- a/ios/ARNKakaoChannelBridge.m +++ b/ios/ARNKakaoChannelBridge.m @@ -16,7 +16,7 @@ @interface RCT_EXTERN_MODULE(ARNKakaoChannel, NSObject) rejecter: (RCTPromiseRejectBlock *)reject); RCT_EXTERN_METHOD(chat: (NSString *) friendId - resolver: (RCTPromiseResolveBlock *)resolve - rejecter: (RCTPromiseRejectBlock *)reject); + resolver: (RCTPromiseResolveBlock)resolve + rejecter: (RCTPromiseRejectBlock)reject); @end From b636a7f3df4fe30e7884c2a7637d453003d8bc47 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 10:42:29 +0800 Subject: [PATCH 06/13] test: chat is not obj c method --- ios/ARNKakaoChannelBridge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/ARNKakaoChannelBridge.h b/ios/ARNKakaoChannelBridge.h index 1ec9b90..c04f501 100644 --- a/ios/ARNKakaoChannelBridge.h +++ b/ios/ARNKakaoChannelBridge.h @@ -11,7 +11,7 @@ #import -@interface ARNKakaoLoginBridge: NSObject +@interface ARNKakaoChannelBridge: NSObject @end #endif /* ARNKakaoChannelBridge_h */ From 9128a75f7a9b8625829c1c104aa28b0fc9f16078 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 10:56:14 +0800 Subject: [PATCH 07/13] test: chat is not obj cmethod --- ios/ARNKakaoChannel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 5c89c0a..3f1ad6c 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -51,7 +51,7 @@ public class ARNKakaoChannel: NSObject { }) } - @objc(chat:resolve:reject:) + @objc func chat(_ friendId: NSString, resolver resolve: @escaping RCTPromiseResolveBlock, rejector reject: @escaping RCTPromiseRejectBlock) -> Void { From f0e4e3dd44d0796a70dbaa8e670caea98de366bb Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 11:55:29 +0800 Subject: [PATCH 08/13] test: dothis method --- ios/ARNKakaoChannel.swift | 4 ++++ ios/ARNKakaoChannelBridge.m | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 3f1ad6c..3705e62 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -60,5 +60,9 @@ public class ARNKakaoChannel: NSObject { resolve(success); }) } + + @objc func doThis() -> Void { + // w00t + } } diff --git a/ios/ARNKakaoChannelBridge.m b/ios/ARNKakaoChannelBridge.m index 96484dc..05ff636 100644 --- a/ios/ARNKakaoChannelBridge.m +++ b/ios/ARNKakaoChannelBridge.m @@ -11,6 +11,8 @@ @interface RCT_EXTERN_MODULE(ARNKakaoChannel, NSObject) +RCT_EXTERN_METHOD(doThis); + RCT_EXTERN_METHOD(addFriend: (NSString *) friendId resolver: (RCTPromiseResolveBlock *)resolve rejecter: (RCTPromiseRejectBlock *)reject); From cd76f78374463efdec84d7a455a351400a83fa88 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 12:29:58 +0800 Subject: [PATCH 09/13] test: dothis --- ios/ARNKakaoChannel.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 3705e62..fa3b33a 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -62,7 +62,10 @@ public class ARNKakaoChannel: NSObject { } @objc func doThis() -> Void { - // w00t - } + let url: URL? = TalkApi.shared.makeUrlForChannelChat(channelPublicId: friendId as String) + self.presentSafari(url: url!, completion: { + + }) + } } From 267c1264d0f9f45051fc7533d03696a608ae381a Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 12:36:57 +0800 Subject: [PATCH 10/13] test:dothis --- ios/ARNKakaoChannel.swift | 5 ++--- ios/ARNKakaoChannelBridge.m | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index fa3b33a..2bd2d8e 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -61,10 +61,9 @@ public class ARNKakaoChannel: NSObject { }) } - @objc func doThis() -> Void { + @objc func doThis(_ friendId: NSString) -> Void { let url: URL? = TalkApi.shared.makeUrlForChannelChat(channelPublicId: friendId as String) - self.presentSafari(url: url!, completion: { - + self.presentSafari(url: url!, completion: { success in }) } } diff --git a/ios/ARNKakaoChannelBridge.m b/ios/ARNKakaoChannelBridge.m index 05ff636..59af234 100644 --- a/ios/ARNKakaoChannelBridge.m +++ b/ios/ARNKakaoChannelBridge.m @@ -11,7 +11,7 @@ @interface RCT_EXTERN_MODULE(ARNKakaoChannel, NSObject) -RCT_EXTERN_METHOD(doThis); +RCT_EXTERN_METHOD(doThis: (NSString *) friendId); RCT_EXTERN_METHOD(addFriend: (NSString *) friendId resolver: (RCTPromiseResolveBlock *)resolve From 2d5b2f4a54ca8bb248b15141a99d4451877640dc Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 16:19:41 +0800 Subject: [PATCH 11/13] fix: add chat with no promise --- ios/ARNKakaoChannel.swift | 5 ++--- ios/ARNKakaoChannelBridge.m | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ios/ARNKakaoChannel.swift b/ios/ARNKakaoChannel.swift index 2bd2d8e..5261fd2 100644 --- a/ios/ARNKakaoChannel.swift +++ b/ios/ARNKakaoChannel.swift @@ -51,8 +51,7 @@ public class ARNKakaoChannel: NSObject { }) } - @objc - func chat(_ friendId: NSString, + @objc func chat(_ friendId: NSString, resolver resolve: @escaping RCTPromiseResolveBlock, rejector reject: @escaping RCTPromiseRejectBlock) -> Void { let url: URL? = TalkApi.shared.makeUrlForChannelChat(channelPublicId: friendId as String) @@ -61,7 +60,7 @@ public class ARNKakaoChannel: NSObject { }) } - @objc func doThis(_ friendId: NSString) -> Void { + @objc func chatNoPromise(_ friendId: NSString) -> Void { let url: URL? = TalkApi.shared.makeUrlForChannelChat(channelPublicId: friendId as String) self.presentSafari(url: url!, completion: { success in }) diff --git a/ios/ARNKakaoChannelBridge.m b/ios/ARNKakaoChannelBridge.m index 59af234..f0da574 100644 --- a/ios/ARNKakaoChannelBridge.m +++ b/ios/ARNKakaoChannelBridge.m @@ -11,7 +11,7 @@ @interface RCT_EXTERN_MODULE(ARNKakaoChannel, NSObject) -RCT_EXTERN_METHOD(doThis: (NSString *) friendId); +RCT_EXTERN_METHOD(chatNoPromise: (NSString *) friendId); RCT_EXTERN_METHOD(addFriend: (NSString *) friendId resolver: (RCTPromiseResolveBlock *)resolve From ed5fdee8a645e07a37960fcc0b14b839c9fe45b9 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 16:36:53 +0800 Subject: [PATCH 12/13] fix: add chatnopromise func --- index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.js b/index.js index c7c0cba..ed01041 100644 --- a/index.js +++ b/index.js @@ -10,7 +10,12 @@ export const chat = id => { return ARNKakaoChannel.chat(id); }; +export const chatNoPromise = id => { + return ARNKakaoChannel.chatNoPromise(id); +}; + export default { addFriend, chat, + chatNoPromise, }; From 9f9767ffb7d28766d6ff9650d235449555d044f5 Mon Sep 17 00:00:00 2001 From: Chimaa123 Date: Mon, 3 Apr 2023 16:39:08 +0800 Subject: [PATCH 13/13] fix: chatno promise rename to chat --- index.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/index.js b/index.js index ed01041..324677c 100644 --- a/index.js +++ b/index.js @@ -7,15 +7,10 @@ export const addFriend = id => { }; export const chat = id => { - return ARNKakaoChannel.chat(id); -}; - -export const chatNoPromise = id => { return ARNKakaoChannel.chatNoPromise(id); }; export default { addFriend, chat, - chatNoPromise, };