diff --git a/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Icon.webp b/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Icon.webp index 176a477..3482140 100644 Binary files a/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Icon.webp and b/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Icon.webp differ diff --git a/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Thumbnail.webp b/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Thumbnail.webp index 089867a..db359c2 100644 Binary files a/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Thumbnail.webp and b/AppStoreImages/iOS/iPhone/1.pxd/QuickLook/Thumbnail.webp differ diff --git a/AppStoreImages/iOS/iPhone/1.pxd/metadata.info b/AppStoreImages/iOS/iPhone/1.pxd/metadata.info index 985b848..b4c4534 100644 Binary files a/AppStoreImages/iOS/iPhone/1.pxd/metadata.info and b/AppStoreImages/iOS/iPhone/1.pxd/metadata.info differ diff --git a/NearbyShare/Connection/NearbyConnectionManager.swift b/NearbyShare/Connection/NearbyConnectionManager.swift index 3b9bf41..fb20124 100644 --- a/NearbyShare/Connection/NearbyConnectionManager.swift +++ b/NearbyShare/Connection/NearbyConnectionManager.swift @@ -7,7 +7,7 @@ #if os(iOS) import UIKit -import RNDeviceName +import DeviceKit #endif import Foundation @@ -59,7 +59,7 @@ public class NearbyConnectionManager: NSObject, NetServiceDelegate, InboundNearb #if os(macOS) self.deviceInfo = EndpointInfo(name: Host.current().localizedName ?? "Mac", deviceType: .computer) #else - let marketingName = UIDevice.current.marketingName.withoutBracketedContent + let marketingName = Device.current.description.withoutBracketedContent let isiPad = UIDevice.current.model == "iPad" self.deviceInfo = EndpointInfo(name: marketingName, deviceType: isiPad ? .tablet : .phone) diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index b047ac3..547c15b 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -168,7 +168,6 @@ EB950B612E520674002D68FA /* SwiftECC in Frameworks */ = {isa = PBXBuildFile; productRef = EB950B602E520674002D68FA /* SwiftECC */; }; EB950B632E52067A002D68FA /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = EB950B622E52067A002D68FA /* QRCode */; }; EB950B652E52067D002D68FA /* LUI in Frameworks */ = {isa = PBXBuildFile; productRef = EB950B642E52067D002D68FA /* LUI */; }; - EB950B672E520680002D68FA /* RNDeviceName in Frameworks */ = {isa = PBXBuildFile; productRef = EB950B662E520680002D68FA /* RNDeviceName */; }; EB950B6F2E5206E2002D68FA /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB950B6B2E5206E2002D68FA /* ShareViewController.swift */; }; EB950B702E520734002D68FA /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = EB5C36922E34EBBD0052EFD7 /* Localizable.xcstrings */; }; EB950B742E520957002D68FA /* Attachments.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB950B732E520954002D68FA /* Attachments.swift */; }; @@ -189,7 +188,6 @@ EB979F9A2E50CAA6008B8C5C /* PieProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB979F992E50CAA6008B8C5C /* PieProgressView.swift */; }; EB97A00F2E511124008B8C5C /* ReceiveModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB97A00E2E511120008B8C5C /* ReceiveModel.swift */; }; EB97A0102E51CD13008B8C5C /* ReceiveModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB97A00E2E511120008B8C5C /* ReceiveModel.swift */; }; - EB97A0132E51D6B2008B8C5C /* RNDeviceName in Frameworks */ = {isa = PBXBuildFile; productRef = EB97A0122E51D6B2008B8C5C /* RNDeviceName */; }; EB97A0142E51DD00008B8C5C /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = EB5C36E32E34EC0E0052EFD7 /* License.txt */; }; EB97A0152E51DD00008B8C5C /* timeIsNow.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EBC05C8A2E33B59E00EECC18 /* timeIsNow.mp3 */; }; EB97A01A2E51EAA2008B8C5C /* UIAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB97A0192E51EA9C008B8C5C /* UIAlert.swift */; }; @@ -199,6 +197,8 @@ EB9925852E45EF0900357055 /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = EB9925842E45EF0900357055 /* QRCode */; }; EB9925872E45F12F00357055 /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = EB9925862E45F12F00357055 /* QRCode */; }; EB9925892E45F13500357055 /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = EB9925882E45F13500357055 /* QRCode */; }; + EBADEB8F2E8029750021B5E4 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = EBADEB8E2E8029750021B5E4 /* DeviceKit */; }; + EBADEB912E802A830021B5E4 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = EBADEB902E802A830021B5E4 /* DeviceKit */; }; EBC05C5B2E33937200EECC18 /* ErrorAlertHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */; }; EBC05C5C2E3394EF00EECC18 /* ErrorAlertHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */; }; EBC05C712E33B57D00EECC18 /* Converter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C6D2E33B57D00EECC18 /* Converter.swift */; }; @@ -401,8 +401,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EB97A0132E51D6B2008B8C5C /* RNDeviceName in Frameworks */, EB5C37F02E377C3F0052EFD7 /* SwiftECC in Frameworks */, + EBADEB8F2E8029750021B5E4 /* DeviceKit in Frameworks */, EB886E582E4E66420052B7D9 /* LUI in Frameworks */, EB5C37EE2E377C3F0052EFD7 /* SwiftProtobuf in Frameworks */, EB9925892E45F13500357055 /* QRCode in Frameworks */, @@ -413,8 +413,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EB950B672E520680002D68FA /* RNDeviceName in Frameworks */, EB950B612E520674002D68FA /* SwiftECC in Frameworks */, + EBADEB912E802A830021B5E4 /* DeviceKit in Frameworks */, EB950B652E52067D002D68FA /* LUI in Frameworks */, EB950B5F2E520671002D68FA /* SwiftProtobuf in Frameworks */, EB950B632E52067A002D68FA /* QRCode in Frameworks */, @@ -724,7 +724,7 @@ EB5C37EF2E377C3F0052EFD7 /* SwiftECC */, EB9925882E45F13500357055 /* QRCode */, EB886E572E4E66420052B7D9 /* LUI */, - EB97A0122E51D6B2008B8C5C /* RNDeviceName */, + EBADEB8E2E8029750021B5E4 /* DeviceKit */, ); productName = QuickDropiOS; productReference = EB5C37E22E377C2E0052EFD7 /* QuickDropiOS.app */; @@ -748,7 +748,7 @@ EB950B602E520674002D68FA /* SwiftECC */, EB950B622E52067A002D68FA /* QRCode */, EB950B642E52067D002D68FA /* LUI */, - EB950B662E520680002D68FA /* RNDeviceName */, + EBADEB902E802A830021B5E4 /* DeviceKit */, ); productName = iOSShareExtension; productReference = EB950B2D2E52027F002D68FA /* iOSShareExtension.appex */; @@ -810,7 +810,7 @@ EB2F9BFC2DA05F48004010A2 /* XCRemoteSwiftPackageReference "BezelNotification" */, EB9925832E45EF0900357055 /* XCRemoteSwiftPackageReference "qrcode" */, EB886E562E4E66420052B7D9 /* XCRemoteSwiftPackageReference "LUI" */, - EB97A0112E51D6B2008B8C5C /* XCRemoteSwiftPackageReference "RNDeviceName" */, + EBADEB8B2E8029420021B5E4 /* XCRemoteSwiftPackageReference "DeviceKit" */, ); productRefGroup = 69DA9A0F29E0BF5100A442DA /* Products */; projectDirPath = ""; @@ -1634,14 +1634,6 @@ kind = branch; }; }; - EB97A0112E51D6B2008B8C5C /* XCRemoteSwiftPackageReference "RNDeviceName" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/souzainf3/RNDeviceName"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 2.1.0; - }; - }; EB9925832E45EF0900357055 /* XCRemoteSwiftPackageReference "qrcode" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/dagronf/qrcode.git"; @@ -1650,6 +1642,14 @@ minimumVersion = 26.10.0; }; }; + EBADEB8B2E8029420021B5E4 /* XCRemoteSwiftPackageReference "DeviceKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/devicekit/DeviceKit"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.7.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1713,16 +1713,6 @@ package = EB886E562E4E66420052B7D9 /* XCRemoteSwiftPackageReference "LUI" */; productName = LUI; }; - EB950B662E520680002D68FA /* RNDeviceName */ = { - isa = XCSwiftPackageProductDependency; - package = EB97A0112E51D6B2008B8C5C /* XCRemoteSwiftPackageReference "RNDeviceName" */; - productName = RNDeviceName; - }; - EB97A0122E51D6B2008B8C5C /* RNDeviceName */ = { - isa = XCSwiftPackageProductDependency; - package = EB97A0112E51D6B2008B8C5C /* XCRemoteSwiftPackageReference "RNDeviceName" */; - productName = RNDeviceName; - }; EB9925842E45EF0900357055 /* QRCode */ = { isa = XCSwiftPackageProductDependency; package = EB9925832E45EF0900357055 /* XCRemoteSwiftPackageReference "qrcode" */; @@ -1738,6 +1728,16 @@ package = EB9925832E45EF0900357055 /* XCRemoteSwiftPackageReference "qrcode" */; productName = QRCode; }; + EBADEB8E2E8029750021B5E4 /* DeviceKit */ = { + isa = XCSwiftPackageProductDependency; + package = EBADEB8B2E8029420021B5E4 /* XCRemoteSwiftPackageReference "DeviceKit" */; + productName = DeviceKit; + }; + EBADEB902E802A830021B5E4 /* DeviceKit */ = { + isa = XCSwiftPackageProductDependency; + package = EBADEB8B2E8029420021B5E4 /* XCRemoteSwiftPackageReference "DeviceKit" */; + productName = DeviceKit; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 69DA9A0629E0BF5100A442DA /* Project object */; diff --git a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a24e279..f0e78c1 100644 --- a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "212cf044c2b0bab89578ca93a3666a656e0c44fb54a69f813c4cc4fae07827d7", + "originHash" : "2300836aed6b8c40d3dd5a381b8b335723fedee317f36875e3e194b158f8ce9e", "pins" : [ { "identity" : "applewatchscreensize", @@ -37,6 +37,15 @@ "version" : "1.21.0" } }, + { + "identity" : "devicekit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/devicekit/DeviceKit", + "state" : { + "revision" : "581df61650bc457ec00373a592a84be3e7468eb1", + "version" : "5.7.0" + } + }, { "identity" : "lui", "kind" : "remoteSourceControl", @@ -55,15 +64,6 @@ "version" : "26.10.0" } }, - { - "identity" : "rndevicename", - "kind" : "remoteSourceControl", - "location" : "https://github.com/souzainf3/RNDeviceName", - "state" : { - "revision" : "68ada02a7135381425b01778aeb8719ce3bf8f62", - "version" : "2.1.0" - } - }, { "identity" : "swift-cross-kit-types", "kind" : "remoteSourceControl", diff --git a/Resources/License.txt b/Resources/License.txt index d37c4c9..eb9ea28 100644 --- a/Resources/License.txt +++ b/Resources/License.txt @@ -896,9 +896,9 @@ Neither the name of Google Inc. nor the names of its contributors may be used to THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -RNDeviceName -https://github.com/souzainf3/RNDeviceName -Copyright (c) 2014 Romilson Nunes +DeviceKit +https://github.com/devicekit/DeviceKit +Copyright (c) 2015 Dennis Weissmann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal