@stream-io/video-react-native-sdk 0.7.8 → 0.7.10

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+### [0.7.10](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.7.9...@stream-io/video-react-native-sdk-0.7.10) (2024-05-23)
+
+### Dependency Updates
+
+* `@stream-io/video-client` updated to version `1.0.8`
+* `@stream-io/video-react-bindings` updated to version `0.4.34`
+### [0.7.9](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.7.8...@stream-io/video-react-native-sdk-0.7.9) (2024-05-22)
+
+
+### Bug Fixes
+
+* workaround for samsung device ringtone quirks ([#1362](https://github.com/GetStream/stream-video-js/issues/1362)) ([d15380a](https://github.com/GetStream/stream-video-js/commit/d15380a4aac2bd9b7b6dc6b9de337739710c97b8))
+
 ### [0.7.8](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-native-sdk-0.7.7...@stream-io/video-react-native-sdk-0.7.8) (2024-05-21)
 
 ### Dependency Updates

package/android/src/main/java/com/streamvideo/reactnative/StreamVideoReactNativeModule.kt

@@ -4,6 +4,7 @@ import android.app.AppOpsManager
 import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Process
 import android.util.Rational
@@ -13,8 +14,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.facebook.react.bridge.Promise;
-import android.media.RingtoneManager;
-
+import com.streamvideo.reactnative.util.RingtoneUtil
 
 class StreamVideoReactNativeModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -26,7 +26,7 @@ class StreamVideoReactNativeModule(reactContext: ReactApplicationContext) : Reac
 
     override fun initialize() {
         super.initialize()
-        StreamVideoReactNative.pipListeners.add {isInPictureInPictureMode ->
+        StreamVideoReactNative.pipListeners.add { isInPictureInPictureMode ->
             reactApplicationContext.getJSModule(
                 RCTDeviceEventEmitter::class.java
             ).emit(PIP_CHANGE_EVENT, isInPictureInPictureMode)
@@ -36,7 +36,13 @@ class StreamVideoReactNativeModule(reactContext: ReactApplicationContext) : Reac
 
     @ReactMethod
     fun getDefaultRingtoneUrl(promise: Promise) {
-        promise.resolve(RingtoneManager.getActualDefaultRingtoneUri(reactApplicationContext, RingtoneManager.TYPE_RINGTONE).toString());
+        val defaultRingtoneUri: Uri? =
+            RingtoneUtil.getActualDefaultRingtoneUri(reactApplicationContext);
+        if (defaultRingtoneUri != null) {
+            promise.resolve(defaultRingtoneUri.toString());
+        } else {
+            promise.reject(NAME, "Cannot get default ringtone in Android - check native logs for more info");
+        }
     }
 
     @ReactMethod
@@ -65,9 +71,9 @@ class StreamVideoReactNativeModule(reactContext: ReactApplicationContext) : Reac
         }
     }
 
-    override fun onCatalystInstanceDestroy() {
-        StreamVideoReactNative.pipListeners.clear()
-        super.onCatalystInstanceDestroy()
+    override fun invalidate() {
+        StreamVideoReactNative.pipListeners.clear();
+        super.invalidate()
     }
 
     @ReactMethod

package/android/src/main/java/com/streamvideo/reactnative/util/RingtoneUtil.java

@@ -0,0 +1,121 @@
+package com.streamvideo.reactnative.util;
+
+import android.annotation.SuppressLint;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Original source: https://github.com/signalapp/Signal-Android/blob/main/app/src/main/java/org/thoughtcrime/securesms/util/RingtoneUtil.java
+ * Some custom ROMs and some Samsung Android 11 devices have quirks around accessing the default ringtone. This attempts to deal
+ * with them with progressively worse approaches.
+ */
+public final class RingtoneUtil {
+
+    private static final String TAG = "RingtoneUtil";
+
+    private RingtoneUtil() {}
+
+    public static @Nullable Ringtone getRingtone(@NonNull Context context, @NonNull Uri uri) {
+        Ringtone tone;
+        try {
+            tone = RingtoneManager.getRingtone(context, uri);
+        } catch (SecurityException e) {
+            Log.w(TAG, "Unable to get default ringtone due to permission", e);
+            tone = RingtoneManager.getRingtone(context, RingtoneUtil.getActualDefaultRingtoneUri(context));
+        }
+        return tone;
+    }
+
+    public static @Nullable Uri getActualDefaultRingtoneUri(@NonNull Context context) {
+        Log.i(TAG, "Attempting to get default ringtone directly via normal way");
+        try {
+            return RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_RINGTONE);
+        } catch (SecurityException e) {
+            Log.w(TAG, "Failed to get ringtone with first fallback approach", e);
+        }
+
+        Log.i(TAG, "Attempting to get default ringtone directly via reflection");
+        String uriString   = getStringForUser(context.getContentResolver(), getUserId(context));
+        Uri ringtoneUri = uriString != null ? Uri.parse(uriString) : null;
+
+        if (ringtoneUri != null && getUserIdFromAuthority(ringtoneUri.getAuthority(), getUserId(context)) == getUserId(context)) {
+            ringtoneUri = getUriWithoutUserId(ringtoneUri);
+        }
+
+        return ringtoneUri;
+    }
+
+    @SuppressWarnings("JavaReflectionMemberAccess")
+    @SuppressLint("DiscouragedPrivateApi")
+    private static @Nullable String getStringForUser(@NonNull ContentResolver resolver, int userHandle) {
+        try {
+            Method getStringForUser = Settings.System.class.getMethod("getStringForUser", ContentResolver.class, String.class, int.class);
+            return (String) getStringForUser.invoke(Settings.System.class, resolver, Settings.System.RINGTONE, userHandle);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            Log.w(TAG, "Unable to getStringForUser via reflection", e);
+        }
+        return null;
+    }
+
+    @SuppressWarnings("JavaReflectionMemberAccess")
+    @SuppressLint("DiscouragedPrivateApi")
+    private static int getUserId(@NonNull Context context) {
+        try {
+            Object userId = Context.class.getMethod("getUserId").invoke(context);
+            if (userId instanceof Integer) {
+                return (Integer) userId;
+            } else {
+                Log.w(TAG, "getUserId did not return an integer");
+            }
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            Log.w(TAG, "Unable to getUserId via reflection", e);
+        }
+        return 0;
+    }
+
+    private static @Nullable Uri getUriWithoutUserId(@Nullable Uri uri) {
+        if (uri == null) {
+            return null;
+        }
+        Uri.Builder builder = uri.buildUpon();
+        builder.authority(getAuthorityWithoutUserId(uri.getAuthority()));
+        return builder.build();
+    }
+
+    private static @Nullable String getAuthorityWithoutUserId(@Nullable String auth) {
+        if (auth == null) {
+            return null;
+        }
+        int end = auth.lastIndexOf('@');
+        return auth.substring(end + 1);
+    }
+
+    private static int getUserIdFromAuthority(@Nullable String authority, int defaultUserId) {
+        if (authority == null) {
+            return defaultUserId;
+        }
+
+        int end = authority.lastIndexOf('@');
+        if (end == -1) {
+            return defaultUserId;
+        }
+
+        String userIdString = authority.substring(0, end);
+        try {
+            return Integer.parseInt(userIdString);
+        } catch (NumberFormatException e) {
+            return defaultUserId;
+        }
+    }
+}

package/dist/commonjs/utils/getAndroidDefaultRingtoneUrl.js

@@ -6,11 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.getAndroidDefaultRingtoneUrl = getAndroidDefaultRingtoneUrl;
 var _reactNative = require("react-native");
 async function getAndroidDefaultRingtoneUrl() {
-  var _NativeModules$Stream;
   if (_reactNative.Platform.OS !== 'android') {
     return undefined;
   }
-  const url = await ((_NativeModules$Stream = _reactNative.NativeModules.StreamVideoReactNative) === null || _NativeModules$Stream === void 0 ? void 0 : _NativeModules$Stream.getDefaultRingtoneUrl());
-  return url;
+  try {
+    var _NativeModules$Stream;
+    const url = await ((_NativeModules$Stream = _reactNative.NativeModules.StreamVideoReactNative) === null || _NativeModules$Stream === void 0 ? void 0 : _NativeModules$Stream.getDefaultRingtoneUrl());
+    return url;
+  } catch (e) {
+    console.info(e);
+  }
+  return undefined;
 }
 //# sourceMappingURL=getAndroidDefaultRingtoneUrl.js.map

package/dist/commonjs/utils/getAndroidDefaultRingtoneUrl.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","getAndroidDefaultRingtoneUrl","_NativeModules$Stream","Platform","OS","undefined","url","NativeModules","StreamVideoReactNative","getDefaultRingtoneUrl"],"sourceRoot":"../../../src","sources":["utils/getAndroidDefaultRingtoneUrl.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,eAAeC,4BAA4BA,CAAA,EAEhD;EAAA,IAAAC,qBAAA;EACA,IAAIC,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOC,SAAS;EAClB;EACA,MAAMC,GAAG,GACP,QAAAJ,qBAAA,GAAMK,0BAAa,CAACC,sBAAsB,cAAAN,qBAAA,uBAApCA,qBAAA,CAAsCO,qBAAqB,CAAC,CAAC;EACrE,OAAOH,GAAG;AACZ"}
+{"version":3,"names":["_reactNative","require","getAndroidDefaultRingtoneUrl","Platform","OS","undefined","_NativeModules$Stream","url","NativeModules","StreamVideoReactNative","getDefaultRingtoneUrl","e","console","info"],"sourceRoot":"../../../src","sources":["utils/getAndroidDefaultRingtoneUrl.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,eAAeC,4BAA4BA,CAAA,EAEhD;EACA,IAAIC,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOC,SAAS;EAClB;EACA,IAAI;IAAA,IAAAC,qBAAA;IACF,MAAMC,GAAG,GACP,QAAAD,qBAAA,GAAME,0BAAa,CAACC,sBAAsB,cAAAH,qBAAA,uBAApCA,qBAAA,CAAsCI,qBAAqB,CAAC,CAAC;IACrE,OAAOH,GAAG;EACZ,CAAC,CAAC,OAAOI,CAAC,EAAE;IACVC,OAAO,CAACC,IAAI,CAACF,CAAC,CAAC;EACjB;EAEA,OAAON,SAAS;AAClB"}

package/dist/commonjs/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-const version = exports.version = '0.7.8';
+const version = exports.version = '0.7.10';
 //# sourceMappingURL=version.js.map

package/dist/commonjs/version.js.map

@@ -1 +1 @@
-{"version":3,"names":["version","exports"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":";;;;;;AAAO,MAAMA,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,OAAO"}
+{"version":3,"names":["version","exports"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":";;;;;;AAAO,MAAMA,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG,QAAQ"}

package/dist/module/utils/getAndroidDefaultRingtoneUrl.js

@@ -1,10 +1,15 @@
 import { NativeModules, Platform } from 'react-native';
 export async function getAndroidDefaultRingtoneUrl() {
-  var _NativeModules$Stream;
   if (Platform.OS !== 'android') {
     return undefined;
   }
-  const url = await ((_NativeModules$Stream = NativeModules.StreamVideoReactNative) === null || _NativeModules$Stream === void 0 ? void 0 : _NativeModules$Stream.getDefaultRingtoneUrl());
-  return url;
+  try {
+    var _NativeModules$Stream;
+    const url = await ((_NativeModules$Stream = NativeModules.StreamVideoReactNative) === null || _NativeModules$Stream === void 0 ? void 0 : _NativeModules$Stream.getDefaultRingtoneUrl());
+    return url;
+  } catch (e) {
+    console.info(e);
+  }
+  return undefined;
 }
 //# sourceMappingURL=getAndroidDefaultRingtoneUrl.js.map

package/dist/module/utils/getAndroidDefaultRingtoneUrl.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","getAndroidDefaultRingtoneUrl","_NativeModules$Stream","OS","undefined","url","StreamVideoReactNative","getDefaultRingtoneUrl"],"sourceRoot":"../../../src","sources":["utils/getAndroidDefaultRingtoneUrl.ts"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,OAAO,eAAeC,4BAA4BA,CAAA,EAEhD;EAAA,IAAAC,qBAAA;EACA,IAAIF,QAAQ,CAACG,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOC,SAAS;EAClB;EACA,MAAMC,GAAG,GACP,QAAAH,qBAAA,GAAMH,aAAa,CAACO,sBAAsB,cAAAJ,qBAAA,uBAApCA,qBAAA,CAAsCK,qBAAqB,CAAC,CAAC;EACrE,OAAOF,GAAG;AACZ"}
+{"version":3,"names":["NativeModules","Platform","getAndroidDefaultRingtoneUrl","OS","undefined","_NativeModules$Stream","url","StreamVideoReactNative","getDefaultRingtoneUrl","e","console","info"],"sourceRoot":"../../../src","sources":["utils/getAndroidDefaultRingtoneUrl.ts"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,OAAO,eAAeC,4BAA4BA,CAAA,EAEhD;EACA,IAAID,QAAQ,CAACE,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOC,SAAS;EAClB;EACA,IAAI;IAAA,IAAAC,qBAAA;IACF,MAAMC,GAAG,GACP,QAAAD,qBAAA,GAAML,aAAa,CAACO,sBAAsB,cAAAF,qBAAA,uBAApCA,qBAAA,CAAsCG,qBAAqB,CAAC,CAAC;IACrE,OAAOF,GAAG;EACZ,CAAC,CAAC,OAAOG,CAAC,EAAE;IACVC,OAAO,CAACC,IAAI,CAACF,CAAC,CAAC;EACjB;EAEA,OAAOL,SAAS;AAClB"}

package/dist/module/version.js

@@ -1,2 +1,2 @@
-export const version = '0.7.8';
+export const version = '0.7.10';
 //# sourceMappingURL=version.js.map

package/dist/module/version.js.map

@@ -1 +1 @@
-{"version":3,"names":["version"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":"AAAA,OAAO,MAAMA,OAAO,GAAG,OAAO"}
+{"version":3,"names":["version"],"sourceRoot":"../../src","sources":["version.ts"],"mappings":"AAAA,OAAO,MAAMA,OAAO,GAAG,QAAQ"}

package/dist/typescript/utils/getAndroidDefaultRingtoneUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAndroidDefaultRingtoneUrl.d.ts","sourceRoot":"","sources":["../../../src/utils/getAndroidDefaultRingtoneUrl.ts"],"names":[],"mappings":"AAEA,wBAAsB,4BAA4B,IAAI,OAAO,CAC3D,MAAM,GAAG,SAAS,CACnB,CAOA"}
+{"version":3,"file":"getAndroidDefaultRingtoneUrl.d.ts","sourceRoot":"","sources":["../../../src/utils/getAndroidDefaultRingtoneUrl.ts"],"names":[],"mappings":"AAEA,wBAAsB,4BAA4B,IAAI,OAAO,CAC3D,MAAM,GAAG,SAAS,CACnB,CAaA"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.7.8";
+export declare const version = "0.7.10";
 //# sourceMappingURL=version.d.ts.map

package/dist/typescript/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "packageManager": "yarn@3.2.4",
   "main": "dist/commonjs/index.js",
   "module": "dist/module/index.js",
@@ -45,8 +45,8 @@
     "!**/.*"
   ],
   "dependencies": {
-    "@stream-io/video-client": "^1.0.7",
-    "@stream-io/video-react-bindings": "^0.4.33",
+    "@stream-io/video-client": "^1.0.8",
+    "@stream-io/video-react-bindings": "^0.4.34",
     "intl-pluralrules": "2.0.1",
     "lodash.merge": "^4.6.2",
     "react-native-url-polyfill": "1.3.0",

package/src/utils/getAndroidDefaultRingtoneUrl.ts

@@ -6,7 +6,13 @@ export async function getAndroidDefaultRingtoneUrl(): Promise<
   if (Platform.OS !== 'android') {
     return undefined;
   }
-  const url =
-    await NativeModules.StreamVideoReactNative?.getDefaultRingtoneUrl();
-  return url;
+  try {
+    const url =
+      await NativeModules.StreamVideoReactNative?.getDefaultRingtoneUrl();
+    return url;
+  } catch (e) {
+    console.info(e);
+  }
+
+  return undefined;
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = '0.7.8';
+export const version = '0.7.10';