v1.4.3(69)

lithium0003 · Jul 21, 2020 · ceebd8d · ceebd8d
1 parent 756e7b6
commit ceebd8d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/RemoteCloud/RemoteCloud/Storages/CryptCarotDAV.swift b/RemoteCloud/RemoteCloud/Storages/CryptCarotDAV.swift
@@ -337,7 +337,7 @@ public class CryptCarotDAV: ChildStorage {
         guard status == kCCSuccess else {
             return ""
         }
-        var encrypted = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
+        var encrypted = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
         if encrypted.count >= BlockSizeByte * 2 {
             let pos = encrypted.count - BlockSizeByte * 2
             let cryptbuf1 = encrypted.subdata(in: pos..<pos+BlockSizeByte)
@@ -411,7 +411,7 @@ public class CryptCarotDAV: ChildStorage {
             guard status == kCCSuccess else {
                 return nil
             }
-            var cryptbuf1 = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
+            var cryptbuf1 = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
             cryptbuf1.replaceSubrange(0..<lastblock.count, with: lastblock)
             crypt = crypt.subdata(in: 0..<pos)
             crypt.append(cryptbuf1)
@@ -441,7 +441,7 @@ public class CryptCarotDAV: ChildStorage {
         guard status == kCCSuccess else {
             return nil
         }
-        let plain = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
+        let plain = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
         return String(data: plain, encoding: .utf8)?.replacingOccurrences(of: "\0", with: "")
     }
 
@@ -629,7 +629,7 @@ public class RemoteCryptCarotDAVStream: SlotStream {
         guard status == kCCSuccess else {
             return nil
         }
-        return Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
+        return withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
     }
 
     override func subFillBuffer(pos1: Int64, onFinish: @escaping ()->Void) {

diff --git a/RemoteCloud/RemoteCloud/Storages/Cryptomator.swift b/RemoteCloud/RemoteCloud/Storages/Cryptomator.swift
@@ -1564,7 +1564,7 @@ public class Cryptomator: ChildStorage {
         }
 
         var parentPath1: String?
-        var parentId = c.parent
+        let parentId = c.parent
         if parentId != "" {
             if Thread.isMainThread {
                 let viewContext = CloudFactory.shared.data.persistentContainer.viewContext

diff --git a/RemoteCloud/RemoteCloud/SubItem/CueSheet.swift b/RemoteCloud/RemoteCloud/SubItem/CueSheet.swift
@@ -210,28 +210,28 @@ class RemoteWaveFile {
         var ret = Data()
         ret += "RIFF".data(using: .ascii)!
         var ChunkSize = UInt32(wavbytes + 36)
-        ret += Data(buffer: UnsafeBufferPointer(start: &ChunkSize, count: 1))
+        ret += withUnsafePointer(to: &ChunkSize, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         ret += "WAVE".data(using: .ascii)!
 
         ret += "fmt ".data(using: .ascii)!
         var SubChunk1Size = UInt32(16)
-        ret += Data(buffer: UnsafeBufferPointer(start: &SubChunk1Size, count: 1))
+        ret += withUnsafePointer(to: &SubChunk1Size, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var AudioFormat = UInt16(1)
-        ret += Data(buffer: UnsafeBufferPointer(start: &AudioFormat, count: 1))
+        ret += withUnsafePointer(to: &AudioFormat, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var NumChannels = UInt16(wavFormat.NumChannels)
-        ret += Data(buffer: UnsafeBufferPointer(start: &NumChannels, count: 1))
+        ret += withUnsafePointer(to: &NumChannels, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var SampleRate = UInt32(wavFormat.SampleRate)
-        ret += Data(buffer: UnsafeBufferPointer(start: &SampleRate, count: 1))
+        ret += withUnsafePointer(to: &SampleRate, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var ByteRate = UInt32(wavFormat.ByteRate)
-        ret += Data(buffer: UnsafeBufferPointer(start: &ByteRate, count: 1))
+        ret += withUnsafePointer(to: &ByteRate, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var BlockAlign = UInt16(wavFormat.BlockAlign)
-        ret += Data(buffer: UnsafeBufferPointer(start: &BlockAlign, count: 1))
+        ret += withUnsafePointer(to: &BlockAlign, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
         var BitsPerSample = UInt16(wavFormat.BitsPerSample)
-        ret += Data(buffer: UnsafeBufferPointer(start: &BitsPerSample, count: 1))
+        ret += withUnsafePointer(to: &BitsPerSample, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
 
         ret += "data".data(using: .ascii)!
         var SubChunk2Size = UInt32(wavbytes)
-        ret += Data(buffer: UnsafeBufferPointer(start: &SubChunk2Size, count: 1))
+        ret += withUnsafePointer(to: &SubChunk2Size, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
 
         return ret
     }

diff --git a/ccViewer/CryptCloudViewer.xcodeproj/project.pbxproj b/ccViewer/CryptCloudViewer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -60,8 +60,8 @@
 		3F19BC22232455C80040ED19 /* RemoteCloud.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F19BC21232455C80040ED19 /* RemoteCloud.framework */; };
 		3F19BC23232455C80040ED19 /* RemoteCloud.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F19BC21232455C80040ED19 /* RemoteCloud.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3F3D274423743B00009A4C52 /* TimePickerKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3D274323743B00009A4C52 /* TimePickerKeyboard.swift */; };
-		3F754D5424C6174A00BF2636 /* GoogleCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; };
-		3F754D5524C6174A00BF2636 /* GoogleCast.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		3F754D5424C6174A00BF2636 /* GoogleCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; platformFilter = ios; };
+		3F754D5524C6174A00BF2636 /* GoogleCast.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; platformFilter = ios; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3F84578A238E5039004E78EC /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F845789238E5039004E78EC /* SceneDelegate.swift */; };
 		3F84578C238E622C004E78EC /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F84578B238E622C004E78EC /* About.storyboard */; };
 		3F84578E238E6896004E78EC /* ViewControllerAbout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F84578D238E6896004E78EC /* ViewControllerAbout.swift */; };
@@ -748,7 +748,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 69;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
@@ -783,7 +783,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 67;
+				CURRENT_PROJECT_VERSION = 69;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;

diff --git a/ccViewer/ccViewer/About.storyboard b/ccViewer/ccViewer/About.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="xtF-rE-Hxd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="xtF-rE-Hxd">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -144,16 +144,16 @@
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Ief-KP-b3p">
                                         <rect key="frame" x="0.0" y="50" width="394" height="758"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                                        <string key="text">FFmpeg version 4.2.1  GNU LESSER GENERAL PUBLIC LICENSE
+                                        <mutableString key="text">FFmpeg version 4.3.1  GNU LESSER GENERAL PUBLIC LICENSE
 Version 2.1, February 1999
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-  Google Cast SDK (iOS Sender v4.4.6)  Google Cast SDK Additional Developer Terms of Service
+  Google Cast SDK (iOS Sender v4.4.7)  Google Cast SDK Additional Developer Terms of Service
 https://developers.google.com/cast/docs/terms
 Chrome Sender, Media Player Library and Receiver use the Closure library, which is licensed under the Apache 2.0 License, and the lit-html library, which is licensed under the BSD 3-Clause License.
-</string>
+</mutableString>
                                         <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -186,6 +186,6 @@ Chrome Sender, Media Player Library and Receiver use the Closure library, which
         </scene>
     </scenes>
     <resources>
-        <image name="app" width="341.33334350585938" height="341.33334350585938"/>
+        <image name="app" width="340" height="340"/>
     </resources>
 </document>
diff --git a/ccViewer/ccViewer/ja.lproj/Localizable.strings b/ccViewer/ccViewer/ja.lproj/Localizable.strings
@@ -94,3 +94,6 @@
 "Delete" = "削除";
 "Clear all Auth and Cache" = "全ての認証情報とキャッシュの削除";
 "Delete all Auth infomation, Delete all internal cache, Delete all user setting in this app" = "全ての認証情報、内部キャッシュ、このアプリの設定を削除します";
+
+"Purge cache" = "キャッシュを消去";
+"Delete all internal cache" = "内部キャッシュをすべて削除します";