Skip to content

Commit ceebd8d

Browse files
lithium0003lithium0003
committed
v1.4.3(69)
1 parent 756e7b6 commit ceebd8d

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed

‎RemoteCloud/RemoteCloud/Storages/CryptCarotDAV.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public class CryptCarotDAV: ChildStorage {
337337
guard status == kCCSuccess else {
338338
return ""
339339
}
340-
var encrypted = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
340+
var encrypted = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
341341
if encrypted.count >= BlockSizeByte * 2 {
342342
let pos = encrypted.count - BlockSizeByte * 2
343343
let cryptbuf1 = encrypted.subdata(in: pos..<pos+BlockSizeByte)
@@ -411,7 +411,7 @@ public class CryptCarotDAV: ChildStorage {
411411
guard status == kCCSuccess else {
412412
return nil
413413
}
414-
var cryptbuf1 = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
414+
var cryptbuf1 = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
415415
cryptbuf1.replaceSubrange(0..<lastblock.count, with: lastblock)
416416
crypt = crypt.subdata(in: 0..<pos)
417417
crypt.append(cryptbuf1)
@@ -441,7 +441,7 @@ public class CryptCarotDAV: ChildStorage {
441441
guard status == kCCSuccess else {
442442
return nil
443443
}
444-
let plain = Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
444+
let plain = withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
445445
return String(data: plain, encoding: .utf8)?.replacingOccurrences(of: "\0", with: "")
446446
}
447447

@@ -629,7 +629,7 @@ public class RemoteCryptCarotDAVStream: SlotStream {
629629
guard status == kCCSuccess else {
630630
return nil
631631
}
632-
return Data(bytes: UnsafePointer<UInt8>(outBytes), count: outLength)
632+
return withUnsafePointer(to: &outBytes, { Data( buffer: UnsafeBufferPointer(start: $0, count: outLength)) })
633633
}
634634

635635
override func subFillBuffer(pos1: Int64, onFinish: @escaping ()->Void) {

‎RemoteCloud/RemoteCloud/Storages/Cryptomator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ public class Cryptomator: ChildStorage {
15641564
}
15651565

15661566
var parentPath1: String?
1567-
var parentId = c.parent
1567+
let parentId = c.parent
15681568
if parentId != "" {
15691569
if Thread.isMainThread {
15701570
let viewContext = CloudFactory.shared.data.persistentContainer.viewContext

‎RemoteCloud/RemoteCloud/SubItem/CueSheet.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,28 +210,28 @@ class RemoteWaveFile {
210210
var ret = Data()
211211
ret += "RIFF".data(using: .ascii)!
212212
var ChunkSize = UInt32(wavbytes + 36)
213-
ret += Data(buffer: UnsafeBufferPointer(start: &ChunkSize, count: 1))
213+
ret += withUnsafePointer(to: &ChunkSize, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
214214
ret += "WAVE".data(using: .ascii)!
215215

216216
ret += "fmt ".data(using: .ascii)!
217217
var SubChunk1Size = UInt32(16)
218-
ret += Data(buffer: UnsafeBufferPointer(start: &SubChunk1Size, count: 1))
218+
ret += withUnsafePointer(to: &SubChunk1Size, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
219219
var AudioFormat = UInt16(1)
220-
ret += Data(buffer: UnsafeBufferPointer(start: &AudioFormat, count: 1))
220+
ret += withUnsafePointer(to: &AudioFormat, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
221221
var NumChannels = UInt16(wavFormat.NumChannels)
222-
ret += Data(buffer: UnsafeBufferPointer(start: &NumChannels, count: 1))
222+
ret += withUnsafePointer(to: &NumChannels, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
223223
var SampleRate = UInt32(wavFormat.SampleRate)
224-
ret += Data(buffer: UnsafeBufferPointer(start: &SampleRate, count: 1))
224+
ret += withUnsafePointer(to: &SampleRate, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
225225
var ByteRate = UInt32(wavFormat.ByteRate)
226-
ret += Data(buffer: UnsafeBufferPointer(start: &ByteRate, count: 1))
226+
ret += withUnsafePointer(to: &ByteRate, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
227227
var BlockAlign = UInt16(wavFormat.BlockAlign)
228-
ret += Data(buffer: UnsafeBufferPointer(start: &BlockAlign, count: 1))
228+
ret += withUnsafePointer(to: &BlockAlign, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
229229
var BitsPerSample = UInt16(wavFormat.BitsPerSample)
230-
ret += Data(buffer: UnsafeBufferPointer(start: &BitsPerSample, count: 1))
230+
ret += withUnsafePointer(to: &BitsPerSample, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
231231

232232
ret += "data".data(using: .ascii)!
233233
var SubChunk2Size = UInt32(wavbytes)
234-
ret += Data(buffer: UnsafeBufferPointer(start: &SubChunk2Size, count: 1))
234+
ret += withUnsafePointer(to: &SubChunk2Size, { Data( buffer: UnsafeBufferPointer(start: $0, count: 1)) })
235235

236236
return ret
237237
}

‎ccViewer/CryptCloudViewer.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -60,8 +60,8 @@
6060
3F19BC22232455C80040ED19 /* RemoteCloud.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F19BC21232455C80040ED19 /* RemoteCloud.framework */; };
6161
3F19BC23232455C80040ED19 /* RemoteCloud.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F19BC21232455C80040ED19 /* RemoteCloud.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6262
3F3D274423743B00009A4C52 /* TimePickerKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3D274323743B00009A4C52 /* TimePickerKeyboard.swift */; };
63-
3F754D5424C6174A00BF2636 /* GoogleCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; };
64-
3F754D5524C6174A00BF2636 /* GoogleCast.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
63+
3F754D5424C6174A00BF2636 /* GoogleCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; platformFilter = ios; };
64+
3F754D5524C6174A00BF2636 /* GoogleCast.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F754D5224C6164D00BF2636 /* GoogleCast.framework */; platformFilter = ios; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6565
3F84578A238E5039004E78EC /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F845789238E5039004E78EC /* SceneDelegate.swift */; };
6666
3F84578C238E622C004E78EC /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F84578B238E622C004E78EC /* About.storyboard */; };
6767
3F84578E238E6896004E78EC /* ViewControllerAbout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F84578D238E6896004E78EC /* ViewControllerAbout.swift */; };
@@ -748,7 +748,7 @@
748748
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
749749
CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
750750
CODE_SIGN_STYLE = Automatic;
751-
CURRENT_PROJECT_VERSION = 67;
751+
CURRENT_PROJECT_VERSION = 69;
752752
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
753753
DEVELOPMENT_TEAM = 7A9X38B4YU;
754754
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
@@ -783,7 +783,7 @@
783783
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
784784
CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
785785
CODE_SIGN_STYLE = Automatic;
786-
CURRENT_PROJECT_VERSION = 67;
786+
CURRENT_PROJECT_VERSION = 69;
787787
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
788788
DEVELOPMENT_TEAM = 7A9X38B4YU;
789789
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;

‎ccViewer/ccViewer/About.storyboard‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -144,16 +144,16 @@
144144
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Ief-KP-b3p">
145145
<rect key="frame" x="0.0" y="50" width="394" height="758"/>
146146
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
147-
<string key="text">FFmpeg version 4.2.1

GNU LESSER GENERAL PUBLIC LICENSE
147+
<mutableString key="text">FFmpeg version 4.3.1

GNU LESSER GENERAL PUBLIC LICENSE
148148
Version 2.1, February 1999
149149
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
150150
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
151151
Everyone is permitted to copy and distribute verbatim copies
152152
of this license document, but changing it is not allowed.
153-


Google Cast SDK (iOS Sender v4.4.6)

Google Cast SDK Additional Developer Terms of Service
153+


Google Cast SDK (iOS Sender v4.4.7)

Google Cast SDK Additional Developer Terms of Service
154154
https://developers.google.com/cast/docs/terms
155155
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.
156-
</string>
156+
</mutableString>
157157
<color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
158158
<fontDescription key="fontDescription" type="system" pointSize="14"/>
159159
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -186,6 +186,6 @@ Chrome Sender, Media Player Library and Receiver use the Closure library, which
186186
</scene>
187187
</scenes>
188188
<resources>
189-
<image name="app" width="341.33334350585938" height="341.33334350585938"/>
189+
<image name="app" width="340" height="340"/>
190190
</resources>
191191
</document>

‎ccViewer/ccViewer/ja.lproj/Localizable.strings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,6 @@
9494
"Delete" = "削除";
9595
"Clear all Auth and Cache" = "全ての認証情報とキャッシュの削除";
9696
"Delete all Auth infomation, Delete all internal cache, Delete all user setting in this app" = "全ての認証情報、内部キャッシュ、このアプリの設定を削除します";
97+
98+
"Purge cache" = "キャッシュを消去";
99+
"Delete all internal cache" = "内部キャッシュをすべて削除します";

0 commit comments

Comments
 (0)