ci fixes

Author: paulb777

FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h

@@ -21,7 +21,7 @@
 @class RCNConfigDBManager;
 
 /// This internal class contains a set of variables that are unique among all the config instances.
-/// It also handles all metadata and internal metadata. This class is not thread safe and does not
+/// It also handles all metadata. This class is not thread safe and does not
 /// inherently allow for synchronized access. Callers are responsible for synchronization
 /// (currently using serial dispatch queues).
 @interface RCNConfigSettings : NSObject
@@ -55,11 +55,6 @@
 /// Custom variable (aka App context digest). This is the pending custom variables request before
 /// fetching.
 @property(nonatomic, copy) NSDictionary *customVariables;
-/// Cached internal metadata from internal metadata table. It contains customized information such
-/// as HTTP connection timeout, HTTP read timeout, success/failure throttling rate and time
-/// interval. Client has the default value of each parameters, they are only saved in
-/// internalMetadata if they have been customize by developers.
-@property(nonatomic, readonly, copy) NSDictionary *internalMetadata;
 /// Device conditions since last successful fetch from the backend. Device conditions including
 /// app
 /// version, iOS version, device localte, language, GMP project ID and Game project ID. Used for
@@ -128,9 +123,6 @@
 /// Returns metadata from metadata table.
 - (void)loadConfigFromMetadataTable;
 
-/// Updates internal content with the latest successful config response.
-- (void)updateInternalContentWithResponse:(NSDictionary *)response;
-
 /// Updates the metadata table with the current fetch status.
 /// @param fetchSuccess True if fetch was successful.
 - (void)updateMetadataWithFetchSuccessStatus:(BOOL)fetchSuccess

FirebaseRemoteConfig/Sources/RCNConfigSettings.m

@@ -213,31 +213,6 @@ - (void)loadConfigFromMetadataTable {
 
 #pragma mark - update DB/cached
 
-// Update internal metadata content to cache and DB.
-- (void)updateInternalContentWithResponse:(NSDictionary *)response {
-  // Remove all the keys with current package name.
-  [_DBManager deleteRecordWithBundleIdentifier:_bundleIdentifier
-                                     namespace:_FIRNamespace
-                                  isInternalDB:YES];
-
-  for (NSString *key in _internalMetadata.allKeys) {
-    if ([key hasPrefix:_bundleIdentifier]) {
-      [_internalMetadata removeObjectForKey:key];
-    }
-  }
-
-  for (NSString *entry in response) {
-    NSData *val = [response[entry] dataUsingEncoding:NSUTF8StringEncoding];
-    NSArray *values = @[ entry, val ];
-    _internalMetadata[entry] = response[entry];
-    [self updateInternalMetadataTableWithValues:values];
-  }
-}
-
-- (void)updateInternalMetadataTableWithValues:(NSArray *)values {
-  [_DBManager insertInternalMetadataTableWithValues:values completionHandler:nil];
-}
-
 /// If the last fetch was not successful, update the (exponential backoff) period that we wait until
 /// fetching again. Any subsequent fetch requests will be checked and allowed only if past this
 /// throttle end time.
@@ -338,9 +313,7 @@ - (void)updateFetchTimeWithSuccessFetch:(BOOL)isSuccessfulFetch {
 }
 
 - (void)updateMetadataTable {
-  [_DBManager deleteRecordWithBundleIdentifier:_bundleIdentifier
-                                     namespace:_FIRNamespace
-                                  isInternalDB:NO];
+  [_DBManager deleteRecordWithBundleIdentifier:_bundleIdentifier namespace:_FIRNamespace];
   NSError *error;
   // Objects to be serialized cannot be invalid.
   if (!_bundleIdentifier) {

FirebaseRemoteConfig/SwiftNew/ConfigDBManager.swift

@@ -313,40 +313,39 @@ open class ConfigDBManager: NSObject {
                     bundleIdentifier: String,
                     fromSource source: DBSource) {
     let params = [bundleIdentifier, namespace]
-    var sql = "DELETE FROM main WHERE bundle_identifier = ? and namespace = ?"
-    if source == .default {
-      sql = "DELETE FROM main_default WHERE bundle_identifier = ? and namespace = ?"
-    } else if source == .active {
-      sql = "DELETE FROM main_active WHERE bundle_identifier = ? and namespace = ?"
-    }
+    let sql =
+      if source == .default {
+        "DELETE FROM main_default WHERE bundle_identifier = ? and namespace = ?"
+      } else if source == .active {
+        "DELETE FROM main_active WHERE bundle_identifier = ? and namespace = ?"
+      } else {
+        "DELETE FROM main WHERE bundle_identifier = ? and namespace = ?"
+      }
     Task {
       await self.databaseActor.executeQuery(sql, withParams: params)
     }
   }
 
   @objc public
   func deleteRecord(withBundleIdentifier bundleIdentifier: String,
-                    namespace: String,
-                    isInternalDB: Bool) {
-    var sql = "DELETE FROM internal_metadata WHERE key LIKE ?"
-    var params = [bundleIdentifier]
-    if !isInternalDB {
-      sql = "DELETE FROM fetch_metadata WHERE bundle_identifier = ? and namespace = ?"
-      params = [bundleIdentifier, namespace]
-    }
+                    namespace: String) {
+    let sql = "DELETE FROM fetch_metadata WHERE bundle_identifier = ? and namespace = ?"
+    let params = [bundleIdentifier, namespace]
     Task {
       await self.databaseActor.executeQuery(sql, withParams: params)
     }
   }
 
   @objc public
   func deleteAllRecords(fromTableWithSource source: DBSource) {
-    var sql = "DELETE FROM main"
-    if source == .default {
-      sql = "DELETE FROM main_default"
-    } else if source == .active {
-      sql = "DELETE FROM main_active"
-    }
+    let sql =
+      if source == .default {
+        "DELETE FROM main_default"
+      } else if source == .active {
+        "DELETE FROM main_active"
+      } else {
+        "DELETE FROM main"
+      }
     Task {
       await self.databaseActor.executeQuery(sql)
     }