1.0.52

FilenCloudDienste · Aug 23, 2021 · f573762 · f573762
1 parent e1d1969
commit f573762
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 119 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.filen.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 51
-        versionName "1.0.51"
+        versionCode 52
+        versionName "1.0.52"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -347,12 +347,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 51;
+				CURRENT_PROJECT_VERSION = 52;
 				DEVELOPMENT_TEAM = 7YTW5D2K7P;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.51;
+				MARKETING_VERSION = 1.0.52;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.filen.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -370,12 +370,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 51;
+				CURRENT_PROJECT_VERSION = 52;
 				DEVELOPMENT_TEAM = 7YTW5D2K7P;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.51;
+				MARKETING_VERSION = 1.0.52;
 				PRODUCT_BUNDLE_IDENTIFIER = io.filen.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = io.filen.app;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "io.filen.app",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "private": true,
   "dependencies": {
     "@capacitor/android": "^2.4.2",

diff --git a/src/components/download.js b/src/components/download.js
@@ -613,6 +613,8 @@ export async function queueFileDownload(file, isOfflineRequest = false){
 
             isRemovedFromState = true
 
+            window.customVariables.downloadSemaphore.release()
+
             try{
                 let currentDownloads = this.state.downloads
 
@@ -725,7 +727,6 @@ export async function queueFileDownload(file, isOfflineRequest = false){
                         if(err){
                             console.log(err)
 
-                            window.customVariables.downloadSemaphore.release()
                             window.customVariables.currentWriteThreads -= 1
 
                             removeFromState()
@@ -763,8 +764,6 @@ export async function queueFileDownload(file, isOfflineRequest = false){
                                 if(err){
                                     console.log(err)
 
-                                    window.customVariables.downloadSemaphore.release()
-
                                     removeFromState()
 
                                     if(err == "stopped"){
@@ -792,8 +791,6 @@ export async function queueFileDownload(file, isOfflineRequest = false){
 
                                 try{
                                     if(window.customVariables.downloads[uuid].chunksWritten >= window.customVariables.downloads[uuid].chunks){
-                                        window.customVariables.downloadSemaphore.release()
-
                                         if(window.customVariables.downloads[uuid].makeOffline){
                                             window.customVariables.offlineSavedFiles[file.uuid] = true
 

diff --git a/src/components/items.js b/src/components/items.js
@@ -581,113 +581,6 @@ export async function updateItemList(showLoader = true, bypassItemsCache = false
 				window.customVariables.cachedFiles[file.uuid] = item
 			}
 		}
-		else if(routeEx[1] == "favorites"){
-			try{
-				var res = await utils.apiRequest("POST", "/v1/dir/content", {
-					apiKey: this.state.userAPIKey,
-					uuid: "favorites",
-					folders: JSON.stringify(["favorites"]),
-					page: 1,
-					app: "true"
-				})
-			}
-			catch(e){
-				console.log(e)
-
-				window.customFunctions.dismissLoader()
-
-				let alert = await alertController.create({
-					header: "",
-					subHeader: "",
-					message: language.get(this.state.lang, "apiRequestError"),
-					buttons: [language.get(this.state.lang, "alertOkButton").toUpperCase()]
-				})
-
-				return alert.present()
-			}
-
-			if(!res.status){
-				console.log(res.message)
-
-				window.customFunctions.dismissLoader()
-
-				let alert = await alertController.create({
-					header: "",
-					subHeader: "",
-					message: language.get(this.state.lang, "apiRequestError"),
-					buttons: [language.get(this.state.lang, "alertOkButton").toUpperCase()]
-				})
-
-				return alert.present()
-			}
-
-			for(let i = 0; i < res.data.folders.length; i++){
-				let folder = res.data.folders[i]
-
-				let folderName = await utils.decryptFolderName(folder.name, this.state.userMasterKeys, folder.uuid)
-				let uploadDate = (new Date(folder.timestamp * 1000)).toString().split(" ")
-
-				let item = {
-					type: "folder",
-					uuid: folder.uuid,
-					name: utils.sanitizeHTML(folderName),
-					date: uploadDate[1] + " " + uploadDate[2] + " " + uploadDate[3] + " " + uploadDate[4],
-					timestamp: folder.timestamp,
-					parent: folder.parent,
-					receiverId: 0,
-					receiverEmail: "",
-					sharerId: 0,
-					sharerEmail: "",
-					favorited: folder.favorited,
-					color: folder.color || null
-				}
-
-				items.push(item)
-
-				window.customVariables.cachedFolders[folder.uuid] = item
-			}
-
-			for(let i = 0; i < res.data.uploads.length; i++){
-				let file = res.data.uploads[i]
-
-				let metadata = await utils.decryptFileMetadata(file.metadata, this.state.userMasterKeys, file.uuid)
-				let uploadDate = (new Date(file.timestamp * 1000)).toString().split(" ")
-
-				let offline = false
-
-				if(typeof window.customVariables.offlineSavedFiles[file.uuid] !== "undefined"){
-					offline = true
-				}
-
-				let item = {
-					type: "file",
-					uuid: file.uuid,
-					name: utils.sanitizeHTML(metadata.name),
-					mime: utils.sanitizeHTML(metadata.mime),
-					size: parseInt(metadata.size),
-					key: utils.sanitizeHTML(metadata.key),
-					bucket: file.bucket,
-					region: file.region,
-					parent: file.parent,
-					rm: file.rm,
-					chunks: file.chunks,
-					date: uploadDate[1] + " " + uploadDate[2] + " " + uploadDate[3] + " " + uploadDate[4],
-					timestamp: file.timestamp,
-					receiverId: 0,
-					receiverEmail: "",
-					sharerId: 0,
-					sharerEmail: "",
-					offline: offline,
-					version: file.version,
-					favorited: file.favorited,
-					thumbnail: (typeof window.customVariables.thumbnailBlobCache[file.uuid] !== "undefined" ? window.customVariables.thumbnailBlobCache[file.uuid] : undefined)
-				}
-
-				items.push(item)
-
-				window.customVariables.cachedFiles[file.uuid] = item
-			}
-		}
 		else{
 			try{
 				var res = await utils.apiRequest("POST", "/v1/dir/content", {