Compare commits

..

1 Commits

Author SHA1 Message Date
spaced4ndy 1f8eb1d638 update simplexmq (xftp fixes) 2024-03-15 12:48:55 +04:00
4 changed files with 5 additions and 40 deletions
@@ -19,7 +19,6 @@ enum DatabaseAlert: Identifiable {
case chatDeleted
case deleteLegacyDatabase
case deleteFilesAndMedia
case deleteTempFiles
case setChatItemTTL(ttl: ChatItemTTL)
case error(title: LocalizedStringKey, error: String = "")
@@ -34,7 +33,6 @@ enum DatabaseAlert: Identifiable {
case .chatDeleted: return "chatDeleted"
case .deleteLegacyDatabase: return "deleteLegacyDatabase"
case .deleteFilesAndMedia: return "deleteFilesAndMedia"
case .deleteTempFiles: return "deleteTempFiles"
case .setChatItemTTL: return "setChatItemTTL"
case let .error(title, _): return "error \(title)"
}
@@ -51,7 +49,6 @@ struct DatabaseView: View {
@State private var progressIndicator = false
@AppStorage(DEFAULT_CHAT_ARCHIVE_NAME) private var chatArchiveName: String?
@AppStorage(DEFAULT_CHAT_ARCHIVE_TIME) private var chatArchiveTime: Double = 0
@AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
@State private var dbContainer = dbContainerGroupDefault.get()
@State private var legacyDatabase = hasLegacyDatabase()
@State private var useKeychain = storeDBPassphraseGroupDefault.get()
@@ -194,16 +191,6 @@ struct DatabaseView: View {
}
}
}
if developerTools {
Section {
Button("Delete temporary files", role: .destructive) {
alert = .deleteTempFiles
}
} header: {
Text("Temp files")
}
}
}
.onAppear {
runChat = m.chatRunning ?? true
@@ -303,15 +290,6 @@ struct DatabaseView: View {
},
secondaryButton: .cancel()
)
case .deleteTempFiles:
return Alert(
title: Text("Delete temporary files?"),
message: Text("This action cannot be undone - all temporary files will be deleted."),
primaryButton: .destructive(Text("Delete")) {
deleteAppTempFiles()
},
secondaryButton: .cancel()
)
case let .setChatItemTTL(ttl):
return Alert(
title: Text("Enable automatic message deletion?"),
+3 -16
View File
@@ -82,7 +82,9 @@ public func deleteAppDatabaseAndFiles() {
}
try? fm.removeItem(atPath: dbPath + CHAT_DB_BAK)
try? fm.removeItem(atPath: dbPath + AGENT_DB_BAK)
deleteAppTempFiles()
try? fm.removeItem(at: getTempFilesDirectory())
try? fm.removeItem(at: getMigrationTempFilesDirectory())
try? fm.createDirectory(at: getTempFilesDirectory(), withIntermediateDirectories: true)
deleteAppFiles()
_ = kcDatabasePassword.remove()
storeDBPassphraseGroupDefault.set(true)
@@ -98,21 +100,6 @@ public func deleteAppFiles() {
}
}
public func deleteAppTempFiles() {
let fm = FileManager.default
do {
try fm.removeItem(at: getTempFilesDirectory())
try fm.createDirectory(at: getTempFilesDirectory(), withIntermediateDirectories: true)
} catch {
logger.error("FileUtils deleteAppTempFiles error: \(error.localizedDescription)")
}
do {
try fm.removeItem(at: getMigrationTempFilesDirectory())
} catch {
logger.error("FileUtils deleteAppTempFiles fm.removeItem(at: getMigrationTempFilesDirectory()) error: \(error.localizedDescription)")
}
}
public func fileSize(_ url: URL) -> Int? { // in bytes
do {
let val = try url.resourceValues(forKeys: [.totalFileAllocatedSizeKey, .fileAllocatedSizeKey])
+1 -1
View File
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
source-repository-package
type: git
location: https://github.com/simplex-chat/simplexmq.git
tag: 293a2ca3f10232fa8a5221388344acf68643ad92
tag: ca68eca86ef92ae266a4005ab1ad57b589f83933
source-repository-package
type: git
+1 -1
View File
@@ -1,5 +1,5 @@
{
"https://github.com/simplex-chat/simplexmq.git"."293a2ca3f10232fa8a5221388344acf68643ad92" = "13khaadp6w66rn9pfifd779amcyj6lap2f2c0kns4ijjqqb2c5j5";
"https://github.com/simplex-chat/simplexmq.git"."ca68eca86ef92ae266a4005ab1ad57b589f83933" = "10p1bn42hbmisdjk272q6jshrcx1vq1072r50n80hj6n6z1a0szf";
"https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
"https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
"https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";