bug fixes in app and timeout problems

jannisborn · Nov 17, 2023 · f37b9e6 · f37b9e6
1 parent db92e32
commit f37b9e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/PennyMe/PinViewController.swift b/PennyMe/PinViewController.swift
@@ -463,7 +463,7 @@ class PinViewController: UITableViewController, UIImagePickerControllerDelegate,
 
 
     func uploadImageWithTimeout(_ image: UIImage) {
-        let uploadTimeout: TimeInterval = 5
+        let uploadTimeout: TimeInterval = 10
         var task: URLSessionDataTask?
 
         guard let imageData = image.jpegData(compressionQuality: 1.0) else {

diff --git a/backend/pennyme/github_update.py b/backend/pennyme/github_update.py
@@ -148,7 +148,7 @@ def push_newmachine_to_github(
     Returns:
         The id of the new machine.
     """
-    server_locations, latest_commit_sha = load_latest_json(branch_name=branch_name)
+    server_locations, latest_commit_sha = load_latest_json()
 
     machine_id = get_next_free_machine_id(
         "../data/all_locations.json", server_locations["features"]

diff --git a/backend/pennyme/slack.py b/backend/pennyme/slack.py
@@ -2,10 +2,10 @@
 import os
 from typing import Dict
 
-from flask import FileStorage
 from PIL import Image, ImageOps
 from slack import WebClient
 from slack.errors import SlackApiError
+from werkzeug.datastructures import FileStorage
 
 CLIENT = WebClient(token=os.environ["SLACK_TOKEN"])
 IMG_PORT = "http://37.120.179.15:8000/"