fix

src/react_native/cameraroll.cljs

@@ -1,5 +1,6 @@
 (ns react-native.cameraroll
   (:require ["@react-native-community/cameraroll" :as CameraRoll]
+            [react-native.fs :as fs]
             [utils.transforms :as transforms]
             [taoensso.timbre :as log]))
 
@@ -14,3 +15,9 @@
   (-> (.getAlbums CameraRoll (clj->js opts))
       (.then #(callback (transforms/js->clj %)))
       (.catch #(log/warn "could not get camera roll albums" %))))
+
+(defn save-image
+  [path]
+  (-> (.save CameraRoll (clj->js path))
+      (.then #(fs/unlink path))
+      (.catch #(fs/unlink path))))

src/status_im/chat/models/images.cljs

@@ -1,16 +1,13 @@
 (ns status-im.chat.models.images
-  (:require ["@react-native-community/cameraroll" :as CameraRoll]
-            ["react-native-blob-util" :default ReactNativeBlobUtil]
+  (:require ["react-native-blob-util" :default ReactNativeBlobUtil]
             [re-frame.core :as re-frame]
             [react-native.share :as share]
-            [utils.i18n :as i18n]
-            [react-native.permissions :as permissions]
+            [react-native.cameraroll :as cameraroll]
             [status-im.ui.components.react :as react]
             [status-im2.config :as config]
             [react-native.fs :as fs]
             [utils.re-frame :as rf]
             [status-im.utils.platform :as platform]
-            [status-im.utils.utils :as utils]
             [taoensso.timbre :as log]))
 
 (def temp-image-url (str (fs/cache-dir) "/StatusIm_Image.jpeg"))
@@ -22,7 +19,7 @@
                          :path   temp-image-url}))
       (.fetch "GET" base64-uri)
       (.then #(on-success (.path %)))
-      (.catch #(log/error "could not save image"))))
+      (.catch #(log/error "could not download image" {:error %}))))
 
 (defn share-image
   [uri]
@@ -33,55 +30,43 @@
                                      #(fs/unlink downloaded-url)
                                      #(fs/unlink downloaded-url)))))
 
-(defn save-to-gallery [path] (.save CameraRoll path))
+(defn save-image-to-gallery
+  [base64-uri on-success]
+  (-> (download-image-http base64-uri cameraroll/save-image)
+      (.then on-success)
+      (.catch #(log/error (str "could not save image to gallery" %)))))
 
 (re-frame/reg-fx
- ::save-image-to-gallery
- (fn [base64-uri]
-   (if platform/ios?
-     (-> (download-image-http base64-uri save-to-gallery)
-         (.catch #(utils/show-popup (i18n/label :t/error)
-                                    (i18n/label :t/external-storage-denied))))
-     (permissions/request-permissions
-      {:permissions [:write-external-storage]
-       :on-allowed  #(download-image-http base64-uri save-to-gallery)
-       :on-denied   (fn []
-                      (utils/set-timeout
-                       #(utils/show-popup (i18n/label :t/error)
-                                          (i18n/label :t/external-storage-denied))
-                       50))}))))
-
-(re-frame/reg-fx
- ::chat-open-image-picker-camera
- (fn [current-chat-id]
-   (react/show-image-picker-camera
-    #(re-frame/dispatch [:chat.ui/image-captured current-chat-id (.-path %)])
-    {})))
+  ::chat-open-image-picker-camera
+  (fn [current-chat-id]
+    (react/show-image-picker-camera
+      #(re-frame/dispatch [:chat.ui/image-captured current-chat-id (.-path %)])
+      {})))
 
 (rf/defn image-captured
-  {:events [:chat.ui/image-captured]}
-  [{:keys [db]} chat-id uri]
-  (let [current-chat-id (or chat-id (:current-chat-id db))
-        images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
-    (when (and (< (count images) config/max-images-batch)
-               (not (get images uri)))
-      {::image-selected [uri current-chat-id]})))
+         {:events [:chat.ui/image-captured]}
+         [{:keys [db]} chat-id uri]
+         (let [current-chat-id (or chat-id (:current-chat-id db))
+               images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
+           (when (and (< (count images) config/max-images-batch)
+                      (not (get images uri)))
+             {::image-selected [uri current-chat-id]})))
 
 (rf/defn clear-sending-images
-  {:events [:chat.ui/clear-sending-images]}
-  [{:keys [db]}]
-  {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})})
+         {:events [:chat.ui/clear-sending-images]}
+         [{:keys [db]}]
+         {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})})
 
 (rf/defn image-unselected
-  {:events [:chat.ui/image-unselected]}
-  [{:keys [db]} original]
-  (let [current-chat-id (:current-chat-id db)]
-    {:db (update-in db [:chat/inputs current-chat-id :metadata :sending-image] dissoc (:uri original))}))
+         {:events [:chat.ui/image-unselected]}
+         [{:keys [db]} original]
+         (let [current-chat-id (:current-chat-id db)]
+           {:db (update-in db [:chat/inputs current-chat-id :metadata :sending-image] dissoc (:uri original))}))
 
 (rf/defn chat-show-image-picker-camera
-  {:events [:chat.ui/show-image-picker-camera]}
-  [{:keys [db]} chat-id]
-  (let [current-chat-id (or chat-id (:current-chat-id db))
-        images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
-    (when (< (count images) config/max-images-batch)
-      {::chat-open-image-picker-camera current-chat-id})))
+         {:events [:chat.ui/show-image-picker-camera]}
+         [{:keys [db]} chat-id]
+         (let [current-chat-id (or chat-id (:current-chat-id db))
+               images          (get-in db [:chat/inputs current-chat-id :metadata :sending-image])]
+           (when (< (count images) config/max-images-batch)
+             {::chat-open-image-picker-camera current-chat-id})))

src/status_im2/contexts/chat/lightbox/top_view.cljs

@@ -10,9 +10,10 @@
     [status-im2.contexts.chat.lightbox.animations :as anim]
     [status-im2.contexts.chat.lightbox.style :as style]
     [utils.datetime :as datetime]
+    [utils.i18n :as i18n]
     [utils.re-frame :as rf]
-    [status-im2.contexts.chat.lightbox.constants :as c]
-    [status-im.chat.models.images :as images]))
+    [status-im.chat.models.images :as images]
+    [status-im2.contexts.chat.lightbox.constants :as c]))
 
 (defn animate-rotation
   [result screen-width screen-height insets
@@ -41,6 +42,26 @@
         (anim/animate top-view-width screen-width)
         (anim/animate top-view-bg colors/neutral-100-opa-0)))))
 
+(defn drawer
+  [content]
+  (let [uri (http/replace-port (:image content)
+                               (rf/sub [:mediaserver/port]))]
+    [quo/action-drawer
+     [[{:icon                :i/save
+        :accessibility-label :save-image
+        :label               (i18n/label :t/save-image-library)
+        :on-press            (fn []
+                               (rf/dispatch [:hide-bottom-sheet])
+                               (images/save-image-to-gallery
+                                uri
+                                #(rf/dispatch [:toasts/upsert
+                                               {:id              :random-id
+                                                :icon            :correct
+                                                :icon-color      colors/success-50
+                                                :container-style {:bottom (when platform/android? 20)}
+                                                :text            (i18n/label :t/photo-saved)}]))
+                               )}]]]))
+
 (defn top-view
   [messages insets index animations derived landscape? screen-width]
   (let [{:keys [from timestamp content]}   (nth @messages @index)
@@ -89,5 +110,6 @@
        [quo/icon :share {:size 20 :color colors/white}]]
       [rn/touchable-opacity
        {:active-opacity 1
+        :on-press       #(rf/dispatch [:show-bottom-sheet {:content (fn [] [drawer content])}])
         :style          style/close-container}
        [quo/icon :options {:size 20 :color colors/white}]]]]))