ref: Move storeData into storeEnvelope (#2966)

The storeData method was only used by storeEnvelope. Both
methods used @synchronized. Now the storeData is moved
into storeEnvelope and only one invocation of @ synchronized
is needed.

Author: philipphofmann

Sources/Sentry/SentryFileManager.m

@@ -254,11 +254,19 @@ - (void)removeFileAtPath:(NSString *)path
 
 - (NSString *)storeEnvelope:(SentryEnvelope *)envelope
 {
+    NSData *envelopeData = [SentrySerialization dataWithEnvelope:envelope error:nil];
+    NSString *path =
+        [self.envelopesPath stringByAppendingPathComponent:[self uniqueAscendingJsonName]];
+
     @synchronized(self) {
-        NSString *result = [self storeData:[SentrySerialization dataWithEnvelope:envelope error:nil]
-                          toUniqueJSONPath:self.envelopesPath];
+        SENTRY_LOG_DEBUG(@"Writing envelope to path: %@", path);
+
+        if (![self writeData:envelopeData toPath:path]) {
+            SENTRY_LOG_WARN(@"Failed to store envelope.");
+        }
+
         [self handleEnvelopesLimit];
-        return result;
+        return path;
     }
 }
 
@@ -418,18 +426,6 @@ - (NSDate *_Nullable)readTimestampLastInForeground
     return [NSDate sentry_fromIso8601String:timestampString];
 }
 
-- (NSString *)storeData:(NSData *)data toUniqueJSONPath:(NSString *)path
-{
-    @synchronized(self) {
-        NSString *finalPath = [path stringByAppendingPathComponent:[self uniqueAscendingJsonName]];
-        SENTRY_LOG_DEBUG(@"Writing to file: %@", finalPath);
-        if (![self writeData:data toPath:finalPath]) {
-            SENTRY_LOG_WARN(@"Failed to store data.");
-        }
-        return finalPath;
-    }
-}
-
 - (BOOL)writeData:(NSData *)data toPath:(NSString *)path
 {
     NSError *error;