diff --git a/app/lib/constants/environment.ts b/app/lib/constants/environment.ts index 43a1dc49f..099d27d1c 100644 --- a/app/lib/constants/environment.ts +++ b/app/lib/constants/environment.ts @@ -1,5 +1,3 @@ import RNConfigReader from 'react-native-config-reader'; export const isFDroidBuild = RNConfigReader.FDROID_BUILD; - -export const isOfficial = RNConfigReader.IS_OFFICIAL; diff --git a/app/lib/database/index.ts b/app/lib/database/index.ts index dfcf21a2f..ae7ceeef3 100644 --- a/app/lib/database/index.ts +++ b/app/lib/database/index.ts @@ -3,7 +3,6 @@ import SQLiteAdapter from '@nozbe/watermelondb/adapters/sqlite'; import logger from '@nozbe/watermelondb/utils/common/logger'; import { appGroupPath } from './appGroup'; -import { isOfficial } from '../constants'; import Subscription from './model/Subscription'; import Room from './model/Room'; import Message from './model/Message'; @@ -30,7 +29,7 @@ if (__DEV__) { console.log(`📂 ${appGroupPath}`); } -const getDatabasePath = (name: string) => `${appGroupPath}${name}${isOfficial ? '' : '-experimental'}.db`; +const getDatabasePath = (name: string) => `${appGroupPath}${name}.db`; export const getDatabase = (database = ''): Database => { const path = database.replace(/(^\w+:|^)\/\//, '').replace(/\//g, '.'); diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index 0b649883e..d2f1244d4 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -22,8 +22,6 @@ $(MARKETING_VERSION) CFBundleVersion 1 - IS_OFFICIAL - KeychainGroup $(AppIdentifierPrefix)chat.rocket.reactnative NSExtension diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index 9a43f1d06..df9ed48fb 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -37,8 +37,6 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) - IS_OFFICIAL - ITSAppUsesNonExemptEncryption KeychainGroup diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index e3cf14b14..1ee2b4085 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -22,8 +22,6 @@ 4.40.0 CFBundleVersion 1 - IS_OFFICIAL - KeychainGroup $(AppIdentifierPrefix)chat.rocket.reactnative NSAppTransportSecurity diff --git a/ios/Shared/RocketChat/Database.swift b/ios/Shared/RocketChat/Database.swift index 7e7928506..1b2b57934 100644 --- a/ios/Shared/RocketChat/Database.swift +++ b/ios/Shared/RocketChat/Database.swift @@ -25,8 +25,7 @@ final class Database { init(server: String) { if let url = URL(string: server) { if let domain = url.domain, let directory = directory { - let isOfficial = Bundle.main.object(forInfoDictionaryKey: "IS_OFFICIAL") as? Bool ?? false - self.database = WatermelonDB.Database(path: "\(directory)/\(domain)\(isOfficial ? "" : "-experimental").db") + self.database = WatermelonDB.Database(path: "\(directory)/\(domain).db") } } }