diff --git a/AppShared/AppName.swift b/AppShared/AppName.swift
index 9dbca78d8..e2d356263 100644
--- a/AppShared/AppName.swift
+++ b/AppShared/AppName.swift
@@ -8,5 +8,5 @@
import Foundation
public enum AppName {
- public static let groupID = "group.org.joinmastodon.mastodon-temp"
+ public static let groupID = "group.org.joinmastodon.app"
}
diff --git a/AppShared/AppSecret.swift b/AppShared/AppSecret.swift
index e2305ef1a..7ef7a0821 100644
--- a/AppShared/AppSecret.swift
+++ b/AppShared/AppSecret.swift
@@ -13,7 +13,7 @@ import Keys
public final class AppSecret {
- public static let keychain = Keychain(service: "org.joinmastodon.Mastodon.keychain", accessGroup: AppName.groupID)
+ public static let keychain = Keychain(service: "org.joinmastodon.app.keychain", accessGroup: AppName.groupID)
static let notificationPrivateKeyName = "notification-private-key-base64"
static let notificationAuthName = "notification-auth-base64"
diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 3aca3eb7b..90d2a1358 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -3614,16 +3614,16 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 9;
+ CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.6.0;
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3641,16 +3641,16 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 9;
+ CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.6.0;
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
@@ -3664,7 +3664,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3685,7 +3685,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3705,7 +3705,7 @@
baseConfigurationReference = 459EA4F43058CAB47719E963 /* Pods-Mastodon-MastodonUITests.debug.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3725,7 +3725,7 @@
baseConfigurationReference = BB482D32A7B9825BF5327C4F /* Pods-Mastodon-MastodonUITests.release.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3749,7 +3749,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3760,7 +3760,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon.AppShared;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.AppShared;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3780,7 +3780,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3791,7 +3791,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon.AppShared;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.AppShared;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
@@ -3808,7 +3808,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3837,7 +3837,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -3863,7 +3863,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = CoreDataStackTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3883,7 +3883,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = CoreDataStackTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3904,8 +3904,8 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 9;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ CURRENT_PROJECT_VERSION = 10;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3913,7 +3913,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 0.6.0;
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon.NotificationService;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
@@ -3927,8 +3927,8 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 9;
- DEVELOPMENT_TEAM = 7LFDZ96332;
+ CURRENT_PROJECT_VERSION = 10;
+ DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -3936,7 +3936,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 0.6.0;
- PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.Mastodon.NotificationService;
+ PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index 217fe1993..6d27be6ae 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
AppShared.xcscheme_^#shared#^_
orderHint
- 18
+ 14
CoreDataStack.xcscheme_^#shared#^_
@@ -27,12 +27,12 @@
Mastodon.xcscheme_^#shared#^_
orderHint
- 1
+ 13
NotificationService.xcscheme_^#shared#^_
orderHint
- 16
+ 12
SuppressBuildableAutocreation
diff --git a/Mastodon/Activity/SafariActivity.swift b/Mastodon/Activity/SafariActivity.swift
index e10a0b082..a43e34f9a 100644
--- a/Mastodon/Activity/SafariActivity.swift
+++ b/Mastodon/Activity/SafariActivity.swift
@@ -18,7 +18,7 @@ final class SafariActivity: UIActivity {
}
override var activityType: UIActivity.ActivityType? {
- return UIActivity.ActivityType("org.joinmastodon.Mastodon.safari-activity")
+ return UIActivity.ActivityType("org.joinmastodon.app.safari-activity")
}
override var activityTitle: String? {
diff --git a/Mastodon/Mastodon.entitlements b/Mastodon/Mastodon.entitlements
index 8917adbf4..0135ecdd2 100644
--- a/Mastodon/Mastodon.entitlements
+++ b/Mastodon/Mastodon.entitlements
@@ -6,7 +6,7 @@
development
com.apple.security.application-groups
- group.org.joinmastodon.mastodon-temp
+ group.org.joinmastodon.app
diff --git a/Mastodon/Scene/Share/ViewModel/MosaicImageViewModel.swift b/Mastodon/Scene/Share/ViewModel/MosaicImageViewModel.swift
index 9563a19cd..7d3dd275d 100644
--- a/Mastodon/Scene/Share/ViewModel/MosaicImageViewModel.swift
+++ b/Mastodon/Scene/Share/ViewModel/MosaicImageViewModel.swift
@@ -46,7 +46,7 @@ struct MosaicMeta {
let blurhash: String?
let altText: String?
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.MosaicMeta.working-queue", qos: .userInitiated, attributes: .concurrent)
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.MosaicMeta.working-queue", qos: .userInitiated, attributes: .concurrent)
func blurhashImagePublisher() -> AnyPublisher {
return Future { promise in
diff --git a/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift b/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
index d34e73eba..6da59aef0 100644
--- a/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
+++ b/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
@@ -14,7 +14,7 @@ import UIKit
final class VideoPlayerViewModel {
var disposeBag = Set()
- static let appWillPlayVideoNotification = NSNotification.Name(rawValue: "org.joinmastodon.Mastodon.video-playback-service.appWillPlayVideo")
+ static let appWillPlayVideoNotification = NSNotification.Name(rawValue: "org.joinmastodon.app.video-playback-service.appWillPlayVideo")
// input
let previewImageURL: URL?
let videoURL: URL
diff --git a/Mastodon/Service/AudioPlaybackService.swift b/Mastodon/Service/AudioPlaybackService.swift
index 34ceb3bbe..274cd5598 100644
--- a/Mastodon/Service/AudioPlaybackService.swift
+++ b/Mastodon/Service/AudioPlaybackService.swift
@@ -14,7 +14,7 @@ import os.log
final class AudioPlaybackService: NSObject {
- static let appWillPlayAudioNotification = NSNotification.Name(rawValue: "org.joinmastodon.Mastodon.audio-playback-service.appWillPlayAudio")
+ static let appWillPlayAudioNotification = NSNotification.Name(rawValue: "org.joinmastodon.app.audio-playback-service.appWillPlayAudio")
var disposeBag = Set()
diff --git a/Mastodon/Service/EmojiService/EmojiService.swift b/Mastodon/Service/EmojiService/EmojiService.swift
index 3883d4bab..a11ebb8bc 100644
--- a/Mastodon/Service/EmojiService/EmojiService.swift
+++ b/Mastodon/Service/EmojiService/EmojiService.swift
@@ -15,7 +15,7 @@ final class EmojiService {
weak var apiService: APIService?
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.EmojiService.working-queue")
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.EmojiService.working-queue")
private(set) var customEmojiViewModelDict: [String: CustomEmojiViewModel] = [:]
init(apiService: APIService) {
diff --git a/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift b/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
index b302c0834..ede5c64b2 100644
--- a/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
+++ b/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
@@ -213,7 +213,7 @@ extension MastodonAttachmentService: Equatable, Hashable {
extension MastodonAttachmentService {
private static func createWorkingQueue() -> DispatchQueue {
- return DispatchQueue(label: "org.joinmastodon.Mastodon.MastodonAttachmentService.\(UUID().uuidString)")
+ return DispatchQueue(label: "org.joinmastodon.app.MastodonAttachmentService.\(UUID().uuidString)")
}
static func loadAttachment(url: URL) -> AnyPublisher {
diff --git a/Mastodon/Service/NotificationService.swift b/Mastodon/Service/NotificationService.swift
index e21a3cff8..f1a5bb49c 100644
--- a/Mastodon/Service/NotificationService.swift
+++ b/Mastodon/Service/NotificationService.swift
@@ -17,7 +17,7 @@ final class NotificationService {
var disposeBag = Set()
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.NotificationService.working-queue")
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.NotificationService.working-queue")
// input
weak var apiService: APIService?
diff --git a/Mastodon/Service/StatusPrefetchingService.swift b/Mastodon/Service/StatusPrefetchingService.swift
index e1337204b..7828c5cf7 100644
--- a/Mastodon/Service/StatusPrefetchingService.swift
+++ b/Mastodon/Service/StatusPrefetchingService.swift
@@ -16,7 +16,7 @@ final class StatusPrefetchingService {
typealias TaskID = String
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.StatusPrefetchingService.working-queue")
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.StatusPrefetchingService.working-queue")
var disposeBag = Set()
private(set) var statusPrefetchingDisposeBagDict: [TaskID: AnyCancellable] = [:]
diff --git a/Mastodon/Service/StatusPublishService.swift b/Mastodon/Service/StatusPublishService.swift
index 4728af8c1..f797d9f6a 100644
--- a/Mastodon/Service/StatusPublishService.swift
+++ b/Mastodon/Service/StatusPublishService.swift
@@ -16,7 +16,7 @@ final class StatusPublishService {
var disposeBag = Set()
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.StatusPublishService.working-queue")
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.StatusPublishService.working-queue")
// input
var viewModels = CurrentValueSubject<[ComposeViewModel], Never>([]) // use strong reference to retain the view models
diff --git a/Mastodon/Service/ViedeoPlaybackService.swift b/Mastodon/Service/ViedeoPlaybackService.swift
index 523af3103..a15431f01 100644
--- a/Mastodon/Service/ViedeoPlaybackService.swift
+++ b/Mastodon/Service/ViedeoPlaybackService.swift
@@ -14,7 +14,7 @@ import os.log
final class VideoPlaybackService {
var disposeBag = Set()
- let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.VideoPlaybackService.working-queue")
+ let workingQueue = DispatchQueue(label: "org.joinmastodon.app.VideoPlaybackService.working-queue")
private(set) var viewPlayerViewModelDict: [URL: VideoPlayerViewModel] = [:]
// only for video kind
diff --git a/Mastodon/State/AppContext.swift b/Mastodon/State/AppContext.swift
index 8c0fa364b..89771dfb7 100644
--- a/Mastodon/State/AppContext.swift
+++ b/Mastodon/State/AppContext.swift
@@ -111,7 +111,7 @@ extension AppContext {
return formatter
}()
- private static let purgeCacheWorkingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.AppContext.purgeCacheWorkingQueue")
+ private static let purgeCacheWorkingQueue = DispatchQueue(label: "org.joinmastodon.app.AppContext.purgeCacheWorkingQueue")
func purgeCache() -> AnyPublisher {
Publishers.MergeMany([
diff --git a/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift b/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift
index ad86033e7..cde09b71b 100644
--- a/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift
+++ b/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift
@@ -26,7 +26,7 @@ final class SerialStream: NSObject {
private var buffer: UnsafeMutablePointer
private var canWrite = false
- private let workingQueue = DispatchQueue(label: "org.joinmastodon.Mastodon.SerialStream.\(UUID().uuidString)")
+ private let workingQueue = DispatchQueue(label: "org.joinmastodon.app.SerialStream.\(UUID().uuidString)")
// bound pair stream
private(set) lazy var boundStreams: Streams = {
diff --git a/NotificationService/NotificationService.entitlements b/NotificationService/NotificationService.entitlements
index d334a5e6d..c3bc3f816 100644
--- a/NotificationService/NotificationService.entitlements
+++ b/NotificationService/NotificationService.entitlements
@@ -4,7 +4,7 @@
com.apple.security.application-groups
- group.org.joinmastodon.mastodon-temp
+ group.org.joinmastodon.app