You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SessionMessagingKit/Utilities
Morgan Pretty 1bc6b0bdba Merge remote-tracking branch 'upstream/dev' into feature/theming
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeVC.swift
#	Session/Home/Message Requests/MessageRequestsViewController.swift
#	Session/Media Viewing & Editing/MediaTileViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Onboarding/LandingVC.swift
#	SessionMessagingKitTests/_TestUtilities/MockGeneralCache.swift
3 years ago
..
AppReadiness.h Restructure 5 years ago
AppReadiness.m Make things compile again 5 years ago
Data+Utilities.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
DeviceSleepManager.swift Further work on migrations and message pipeline refactoring 3 years ago
Environment.swift Fixed the broken unit tests 3 years ago
FixedWidthInteger+BigEndian.swift Partially implement receiving pipeline 5 years ago
MessageWrapper.swift Re-organize files 5 years ago
NSData+messagePadding.h Allow admins to leave & fix remaining issues 4 years ago
NSData+messagePadding.m Allow admins to leave & fix remaining issues 4 years ago
OWSAES256Key+Utilities.swift Further work on SessionMessagingKit migrations 3 years ago
OWSAudioPlayer.h Fixed a few bugs and continued work on fixing unit tests 3 years ago
OWSAudioPlayer.m Added a simple migration progress indicator and animation (need timing tweaks) 3 years ago
OWSAudioSession.swift Fixed the broken unit tests 3 years ago
OWSWindowManager.h Make things compile again 5 years ago
OWSWindowManager.m Applied the "increase min version to iOS 13" changes 3 years ago
Preferences.swift Merge remote-tracking branch 'upstream/dev' into feature/theming 3 years ago
ProfileManager.swift Attempted to fix the notification & call reporting issues 3 years ago
ProfileManagerError.swift Removed a bunch of legacy database types 3 years ago
Promise+Utilities.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
ProximityMonitoringManager.swift Removed all the old Storage classes and YapDB extensions 3 years ago
SMKDependencies.swift Added fixes and defensive coding for a number of crashes 3 years ago
SNProtoEnvelope+Conversion.swift Removed all the old Storage classes and YapDB extensions 3 years ago
SSKReachabilityManager.swift Restructure 5 years ago
Sodium+Utilities.swift Updated the Sodium library to fix a production linker error 3 years ago
String+Utlities.swift More work on getting SOGS V4 integrated 3 years ago
Threading.swift Re-added a bunch of functionality to the home and message requests screens 3 years ago