Merge pull request #682 from stakwork/aa/fix/large-heap

General Fixes
stakwork · Nov 17, 2023 · 95f8e86 · 95f8e86
2 parents 2cb9b97 + 2723cd2
commit 95f8e86
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/sphinx/activity/main/activitymain/src/main/AndroidManifest.xml b/sphinx/activity/main/activitymain/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
             android:theme="@style/AppLaunchTheme"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"
+            android:largeHeap="true"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/sphinx/application/sphinx/src/main/AndroidManifest.xml b/sphinx/application/sphinx/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:label="@string/app_name"
         android:resizeableActivity="false"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:largeHeap="true"
         tools:replace="android:allowBackup"
         tools:targetApi="n" />
 

diff --git a/...chats/chat-common/chat-common/src/main/res/layout/layout_message_type_attachment_file.xml b/...chats/chat-common/chat-common/src/main/res/layout/layout_message_type_attachment_file.xml
@@ -100,8 +100,7 @@
             app:layout_constraintBottom_toBottomOf="@id/button_attachment_file_download"
             app:layout_constraintEnd_toEndOf="@id/button_attachment_file_download"
             app:layout_constraintStart_toStartOf="@id/button_attachment_file_download"
-            app:layout_constraintTop_toTopOf="@id/button_attachment_file_download"
-            tools:visibility="visible" />
+            app:layout_constraintTop_toTopOf="@id/button_attachment_file_download" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/sphinx/screens/chats/chat-contact/chat-contact/src/main/res/layout/fragment_chat_contact.xml b/sphinx/screens/chats/chat-contact/chat-contact/src/main/res/layout/fragment_chat_contact.xml
@@ -124,8 +124,7 @@
 
     <include
         android:id="@+id/include_chat_contact_selected_message"
-        layout="@layout/layout_selected_message"
-        tools:visibility="gone" />
+        layout="@layout/layout_selected_message"/>
 
     <include
         android:id="@+id/include_chat_contact_attachment_send_preview"

diff --git a/.../screens/dashboard/dashboard/src/main/java/chat/sphinx/dashboard/ui/DashboardViewModel.kt b/.../screens/dashboard/dashboard/src/main/java/chat/sphinx/dashboard/ui/DashboardViewModel.kt
@@ -136,6 +136,13 @@ internal class DashboardViewModel @Inject constructor(
         MutableStateFlow(null)
     }
 
+    private val _networkStateFlow: MutableStateFlow<Pair<LoadResponse<Boolean, ResponseError>, Boolean>> by lazy {
+        MutableStateFlow(Pair(LoadResponse.Loading, true))
+    }
+    val networkStateFlow: StateFlow<Pair<LoadResponse<Boolean, ResponseError>, Boolean>>
+        get() = _networkStateFlow.asStateFlow()
+
+
     private lateinit var signerManager: SignerManager
 
     init {
@@ -1031,10 +1038,6 @@ internal class DashboardViewModel @Inject constructor(
         }
     }
 
-    private val _networkStateFlow: MutableStateFlow<Pair<LoadResponse<Boolean, ResponseError>, Boolean>> by lazy {
-        MutableStateFlow(Pair(LoadResponse.Loading, true))
-    }
-
     private val _restoreProgressStateFlow: MutableStateFlow<RestoreProgressViewState?> by lazy {
         MutableStateFlow(null)
     }
@@ -1049,9 +1052,6 @@ internal class DashboardViewModel @Inject constructor(
         }
     }
 
-    val networkStateFlow: StateFlow<Pair<LoadResponse<Boolean, ResponseError>, Boolean>>
-        get() = _networkStateFlow.asStateFlow()
-
     val restoreProgressStateFlow: StateFlow<RestoreProgressViewState?>
         get() = _restoreProgressStateFlow.asStateFlow()