[ios] Backport removal of dispatch_once_t as an instance variable

expo · Apr 1, 2020 · d08b03c · d08b03c
1 parent 97ffd8a
commit d08b03c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 36 deletions.
diff --git a/ios/versioned-react-native/ABI34_0_0/UMCore/ABI34_0_0UMCore/ABI34_0_0UMExportedModule.m b/ios/versioned-react-native/ABI34_0_0/UMCore/ABI34_0_0UMCore/ABI34_0_0UMExportedModule.m
@@ -18,7 +18,6 @@
 @interface ABI34_0_0UMExportedModule ()
 
 @property (nonatomic, strong) dispatch_queue_t methodQueue;
-@property (nonatomic, assign) dispatch_once_t methodQueueSetupOnce;
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *exportedMethods;
 
 @end
@@ -55,14 +54,10 @@ - (NSDictionary *)constantsToExport
 
 - (dispatch_queue_t)methodQueue
 {
-  __weak ABI34_0_0UMExportedModule *weakSelf = self;
-  dispatch_once(&_methodQueueSetupOnce, ^{
-    __strong ABI34_0_0UMExportedModule *strongSelf = weakSelf;
-    if (strongSelf) {
-      NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[strongSelf class] exportedModuleName]];
-      strongSelf.methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
-    }
-  });
+  if (!_methodQueue) {
+    NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[self class] exportedModuleName]];
+    _methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
+  }
   return _methodQueue;
 }
 

diff --git a/ios/versioned-react-native/ABI35_0_0/UMCore/ABI35_0_0UMCore/ABI35_0_0UMExportedModule.m b/ios/versioned-react-native/ABI35_0_0/UMCore/ABI35_0_0UMCore/ABI35_0_0UMExportedModule.m
@@ -18,7 +18,6 @@
 @interface ABI35_0_0UMExportedModule ()
 
 @property (nonatomic, strong) dispatch_queue_t methodQueue;
-@property (nonatomic, assign) dispatch_once_t methodQueueSetupOnce;
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *exportedMethods;
 
 @end
@@ -55,14 +54,10 @@ - (NSDictionary *)constantsToExport
 
 - (dispatch_queue_t)methodQueue
 {
-  __weak ABI35_0_0UMExportedModule *weakSelf = self;
-  dispatch_once(&_methodQueueSetupOnce, ^{
-    __strong ABI35_0_0UMExportedModule *strongSelf = weakSelf;
-    if (strongSelf) {
-      NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[strongSelf class] exportedModuleName]];
-      strongSelf.methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
-    }
-  });
+  if (!_methodQueue) {
+    NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[self class] exportedModuleName]];
+    _methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
+  }
   return _methodQueue;
 }
 

diff --git a/ios/versioned-react-native/ABI36_0_0/Expo/UMCore/ABI36_0_0UMCore/ABI36_0_0UMExportedModule.m b/ios/versioned-react-native/ABI36_0_0/Expo/UMCore/ABI36_0_0UMCore/ABI36_0_0UMExportedModule.m
@@ -18,7 +18,6 @@
 @interface ABI36_0_0UMExportedModule ()
 
 @property (nonatomic, strong) dispatch_queue_t methodQueue;
-@property (nonatomic, assign) dispatch_once_t methodQueueSetupOnce;
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *exportedMethods;
 
 @end
@@ -55,14 +54,10 @@ - (NSDictionary *)constantsToExport
 
 - (dispatch_queue_t)methodQueue
 {
-  __weak ABI36_0_0UMExportedModule *weakSelf = self;
-  dispatch_once(&_methodQueueSetupOnce, ^{
-    __strong ABI36_0_0UMExportedModule *strongSelf = weakSelf;
-    if (strongSelf) {
-      NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[strongSelf class] exportedModuleName]];
-      strongSelf.methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
-    }
-  });
+  if (!_methodQueue) {
+    NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[self class] exportedModuleName]];
+    _methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
+  }
   return _methodQueue;
 }
 

diff --git a/ios/versioned-react-native/ABI37_0_0/Expo/UMCore/ABI37_0_0UMCore/ABI37_0_0UMExportedModule.m b/ios/versioned-react-native/ABI37_0_0/Expo/UMCore/ABI37_0_0UMCore/ABI37_0_0UMExportedModule.m
@@ -18,7 +18,6 @@
 @interface ABI37_0_0UMExportedModule ()
 
 @property (nonatomic, strong) dispatch_queue_t methodQueue;
-@property (nonatomic, assign) dispatch_once_t methodQueueSetupOnce;
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *exportedMethods;
 
 @end
@@ -55,14 +54,10 @@ - (NSDictionary *)constantsToExport
 
 - (dispatch_queue_t)methodQueue
 {
-  __weak ABI37_0_0UMExportedModule *weakSelf = self;
-  dispatch_once(&_methodQueueSetupOnce, ^{
-    __strong ABI37_0_0UMExportedModule *strongSelf = weakSelf;
-    if (strongSelf) {
-      NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[strongSelf class] exportedModuleName]];
-      strongSelf.methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
-    }
-  });
+  if (!_methodQueue) {
+    NSString *queueName = [NSString stringWithFormat:@"org.unimodules.%@Queue", [[self class] exportedModuleName]];
+    _methodQueue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL);
+  }
   return _methodQueue;
 }