From 4a0e216466e433bb54349e382b4ecb8699721683 Mon Sep 17 00:00:00 2001 From: khdkls Date: Thu, 23 Sep 2021 19:40:38 +0700 Subject: [PATCH 1/3] following https://github.com/react-native-webrtc/react-native-callkeep/pull/486 --- android/build.gradle | 1 + android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java | 1 + 2 files changed, 2 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 3accf1c6..ae980716 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,4 +32,5 @@ repositories { dependencies { implementation 'com.facebook.react:react-native:+' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' } diff --git a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java index 5336c9c9..ae11005e 100644 --- a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java +++ b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java @@ -678,6 +678,7 @@ public void openPhoneAccountSettings() { } Intent intent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS); + intent.setComponent(new ComponentName("com.android.server.telecom","com.android.server.telecom.settings.EnableAccountPreferenceActivity")); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); this.getAppContext().startActivity(intent); } From fc020b596d6579d131de2b993a9ae931436de91a Mon Sep 17 00:00:00 2001 From: khdkls Date: Thu, 23 Sep 2021 22:27:06 +0700 Subject: [PATCH 2/3] try hiding flags --- android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java index ae11005e..fb23116a 100644 --- a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java +++ b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java @@ -658,7 +658,7 @@ public void openPhoneAccounts() { if (Build.MANUFACTURER.equalsIgnoreCase("Samsung")) { Intent intent = new Intent(); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + // intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); intent.setComponent(new ComponentName("com.android.server.telecom", "com.android.server.telecom.settings.EnableAccountPreferenceActivity")); @@ -678,7 +678,6 @@ public void openPhoneAccountSettings() { } Intent intent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS); - intent.setComponent(new ComponentName("com.android.server.telecom","com.android.server.telecom.settings.EnableAccountPreferenceActivity")); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); this.getAppContext().startActivity(intent); } From 721d52bf281cbd28353b275c130bbc75089df1e2 Mon Sep 17 00:00:00 2001 From: khdkls Date: Thu, 23 Sep 2021 22:35:35 +0700 Subject: [PATCH 3/3] Revert "Merge pull request #494 from react-native-webrtc/dependabot/npm_and_yarn/example/tmpl-1.0.5" This reverts commit e680d35bdd2f894ff05ca8e96ff0b6bb6901508c, reversing changes made to 0fa1ba875e8760cd353b7241cae8eaf47af3ad21. --- example/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example/yarn.lock b/example/yarn.lock index acc4826d..251e5af5 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -5190,9 +5190,9 @@ tmp@^0.0.33: os-tmpdir "~1.0.2" tmpl@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" - integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + version "1.0.4" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= to-fast-properties@^2.0.0: version "2.0.0"