From 18b9e9a825dafdb957d35bc64512d79d9a4ec6cc Mon Sep 17 00:00:00 2001
From: wafa lakhal <4533152+wafalakhal@users.noreply.github.com>
Date: Tue, 25 Mar 2025 19:49:23 +0100
Subject: [PATCH 001/153] peer to peer navigation  (#372)

* add nearby share  option

* add send and receive file view

* wip on add nearbysharing navigation and start fragment

* fix pr comments

* fix pr comments

* fix PR comments
---
 mobile/src/main/AndroidManifest.xml           |  5 +-
 .../tella/mobile/domain/entity/ServerType.kt  |  2 +-
 .../peertopeer/StartNearBySharingFragment.kt  | 49 ++++++++++
 .../peertopeer/activity/PeerToPeerActivity.kt | 17 ++++
 .../adapters/connections/ServerViewHolder.kt  | 14 +++
 .../fragment/vault/home/HomeVaultFragment.kt  |  5 +
 mobile/src/main/res/drawable/ic_share.xml     | 10 ++
 mobile/src/main/res/drawable/ic_share_big.xml | 10 ++
 .../main/res/layout/activity_peer_to_peer.xml | 43 +++++++++
 .../res/layout/item_home_vault_server.xml     | 56 +++++++-----
 .../layout/start_near_by_sharing_fragment.xml | 91 +++++++++++++++++++
 mobile/src/main/res/navigation/home.xml       | 11 +++
 .../res/navigation/peer_to_peer_graph.xml     | 13 +++
 mobile/src/main/res/values/strings.xml        | 11 +++
 14 files changed, 312 insertions(+), 25 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
 create mode 100644 mobile/src/main/res/drawable/ic_share.xml
 create mode 100644 mobile/src/main/res/drawable/ic_share_big.xml
 create mode 100644 mobile/src/main/res/layout/activity_peer_to_peer.xml
 create mode 100644 mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
 create mode 100644 mobile/src/main/res/navigation/peer_to_peer_graph.xml

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index cc549d1b0..6cc4674bf 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -662,7 +662,10 @@
             android:name=".views.dialog.nextcloud.NextCloudLoginFlowActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar" />
-
+        <activity
+            android:name=".views.fragment.peertopeer.activity.PeerToPeerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar" />
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
index 31466c64b..5946e5bea 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
@@ -1,5 +1,5 @@
 package org.horizontal.tella.mobile.domain.entity
 
 enum class ServerType {
-    UNKNOWN, ODK_COLLECT, TELLA_UPLOAD, TELLA_RESORCES, UWAZI, GOOGLE_DRIVE, DROP_BOX, NEXTCLOUD,
+    UNKNOWN, ODK_COLLECT, TELLA_UPLOAD, TELLA_RESORCES, UWAZI, GOOGLE_DRIVE, DROP_BOX, NEXTCLOUD,PEERTOPEER
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
new file mode 100644
index 000000000..3ebe4c6e7
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
@@ -0,0 +1,49 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.isVisible
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.databinding.StartNearBySharingFragmentBinding
+import org.horizontal.tella.mobile.util.Util
+import org.horizontal.tella.mobile.util.hide
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmentBinding>(
+    StartNearBySharingFragmentBinding::inflate
+) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+    }
+
+    private fun initViews() {
+        binding?.apply {
+            nextBtn.hide()
+
+            learnMoreTextView.setOnClickListener {
+                baseActivity.maybeChangeTemporaryTimeout()
+                Util.startBrowserIntent(context, getString(R.string.peerToPeer_documentation_url))
+            }
+
+            sendFilesBtn.setOnClickListener { selectOption(true) }
+            receiveFilesBtn.setOnClickListener { selectOption(false) }
+            nextBtn.setOnClickListener { onNextClicked() }
+        }
+    }
+    private fun selectOption(isSend: Boolean) {
+        binding?.apply {
+            sendFilesBtn.isChecked = isSend
+            receiveFilesBtn.isChecked = !isSend
+            nextBtn.isVisible = true
+        }
+    }
+
+    private fun onNextClicked() {
+        // TODO: Implement navigation on "Next"
+    }
+
+}
+
+
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
new file mode 100644
index 000000000..81f8f350c
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -0,0 +1,17 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.activity
+
+import android.os.Bundle
+import org.horizontal.tella.mobile.databinding.ActivityPeerToPeerBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseLockActivity
+
+class PeerToPeerActivity  : BaseLockActivity() {
+    private lateinit var binding: ActivityPeerToPeerBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityPeerToPeerBinding.inflate(layoutInflater)
+        setContentView(binding.getRoot())
+        binding.toolbar.backClickListener = { this.onBackPressed() }
+
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
index 7dcb67d74..36b117ea0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
@@ -1,5 +1,6 @@
 package org.horizontal.tella.mobile.views.fragment.vault.adapters.connections
 
+import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -14,9 +15,12 @@ import org.horizontal.tella.mobile.views.fragment.vault.adapters.viewholders.bas
 class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
     private lateinit var reportTypeTextView: TextView
     private lateinit var reportTypeImg: ImageView
+    private lateinit var twoLinesReportTypeTextView: TextView
+
 
     override fun bind(item: ServerDataItem, vaultClickListener: VaultClickListener) {
         reportTypeTextView = view.findViewById(R.id.server_name_textView)
+        twoLinesReportTypeTextView = view.findViewById(R.id.two_line_server_name_textView)
         reportTypeImg = view.findViewById(R.id.server_img)
 
         // Set the default padding
@@ -94,6 +98,16 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+            ServerType.PEERTOPEER -> {
+                twoLinesReportTypeTextView.text = view.context.getText(R.string.NearBySharing)
+                reportTypeImg.setImageDrawable(
+                    ResourcesCompat.getDrawable(
+                        view.resources,
+                        R.drawable.ic_share,
+                        null
+                    )
+                )
+            }
             else -> { // todo create default server type
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
index 4b1ba9d2a..4d6f5fd22 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
@@ -463,6 +463,10 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
                 nav().navigate(R.id.action_homeScreen_to_next_cloud_screen)
             }
 
+            ServerType.PEERTOPEER -> {
+                nav().navigate(R.id.action_homeScreen_to_peerToPeer_screen)
+            }
+
             else -> {}
         }
     }
@@ -745,6 +749,7 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
      * This function show connections when all the server types are counted.
      **/
     private fun maybeShowConnections() {
+        serversList?.add(ServerDataItem(ArrayList(), ServerType.PEERTOPEER))
         // If the serversList is not empty, check if it has changed
         if (serversList?.isEmpty() == false) {
             // Use the vaultAdapter to check existing connections
diff --git a/mobile/src/main/res/drawable/ic_share.xml b/mobile/src/main/res/drawable/ic_share.xml
new file mode 100644
index 000000000..1938144ea
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M18.713,19.658C19.32,19.11 20.113,18.76 21,18.76C22.878,18.76 24.407,20.288 24.407,22.167C24.407,24.045 22.878,25.573 21,25.573C19.122,25.573 17.593,24.045 17.593,22.167C17.593,21.91 17.628,21.653 17.687,21.408L9.38,16.555C8.75,17.138 7.922,17.5 7,17.5C5.063,17.5 3.5,15.937 3.5,14C3.5,12.063 5.063,10.5 7,10.5C7.922,10.5 8.75,10.862 9.38,11.445L17.605,6.65C17.547,6.382 17.5,6.113 17.5,5.833C17.5,3.897 19.063,2.333 21,2.333C22.937,2.333 24.5,3.897 24.5,5.833C24.5,7.77 22.937,9.333 21,9.333C20.078,9.333 19.25,8.972 18.62,8.388L10.395,13.183C10.453,13.452 10.5,13.72 10.5,14C10.5,14.28 10.453,14.548 10.395,14.817L18.713,19.658ZM22.167,5.833C22.167,5.192 21.642,4.667 21,4.667C20.358,4.667 19.833,5.192 19.833,5.833C19.833,6.475 20.358,7 21,7C21.642,7 22.167,6.475 22.167,5.833ZM7,15.167C6.358,15.167 5.833,14.642 5.833,14C5.833,13.358 6.358,12.833 7,12.833C7.642,12.833 8.167,13.358 8.167,14C8.167,14.642 7.642,15.167 7,15.167ZM19.833,22.19C19.833,22.832 20.358,23.357 21,23.357C21.642,23.357 22.167,22.832 22.167,22.19C22.167,21.548 21.642,21.023 21,21.023C20.358,21.023 19.833,21.548 19.833,22.19Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_share_big.xml b/mobile/src/main/res/drawable/ic_share_big.xml
new file mode 100644
index 000000000..fd3222f58
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_share_big.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="81dp"
+    android:height="80dp"
+    android:viewportWidth="81"
+    android:viewportHeight="80">
+  <path
+      android:pathData="M53.967,56.167C55.7,54.6 57.967,53.6 60.5,53.6C65.867,53.6 70.233,57.967 70.233,63.333C70.233,68.7 65.867,73.067 60.5,73.067C55.133,73.067 50.767,68.7 50.767,63.333C50.767,62.6 50.867,61.867 51.033,61.167L27.3,47.3C25.5,48.967 23.133,50 20.5,50C14.967,50 10.5,45.533 10.5,40C10.5,34.467 14.967,30 20.5,30C23.133,30 25.5,31.033 27.3,32.7L50.8,19C50.633,18.233 50.5,17.467 50.5,16.667C50.5,11.133 54.967,6.667 60.5,6.667C66.033,6.667 70.5,11.133 70.5,16.667C70.5,22.2 66.033,26.667 60.5,26.667C57.867,26.667 55.5,25.633 53.7,23.967L30.2,37.667C30.367,38.433 30.5,39.2 30.5,40C30.5,40.8 30.367,41.567 30.2,42.333L53.967,56.167ZM63.833,16.667C63.833,14.833 62.333,13.333 60.5,13.333C58.667,13.333 57.167,14.833 57.167,16.667C57.167,18.5 58.667,20 60.5,20C62.333,20 63.833,18.5 63.833,16.667ZM20.5,43.333C18.667,43.333 17.167,41.833 17.167,40C17.167,38.167 18.667,36.667 20.5,36.667C22.333,36.667 23.833,38.167 23.833,40C23.833,41.833 22.333,43.333 20.5,43.333ZM57.167,63.4C57.167,65.233 58.667,66.733 60.5,66.733C62.333,66.733 63.833,65.233 63.833,63.4C63.833,61.567 62.333,60.067 60.5,60.067C58.667,60.067 57.167,61.567 57.167,63.4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/mobile/src/main/res/layout/activity_peer_to_peer.xml b/mobile/src/main/res/layout/activity_peer_to_peer.xml
new file mode 100644
index 000000000..098bc4fc4
--- /dev/null
+++ b/mobile/src/main/res/layout/activity_peer_to_peer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple"
+    android:fitsSystemWindows="true"
+    android:textDirection="locale"
+    tools:context="org.horizontal.tella.mobile.views.fragment.peertopeer.activity.PeerToPeerActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintBottom_toTopOf="@+id/my_nav_host_fragment"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <org.hzontal.shared_ui.appbar.ToolbarComponent
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+            app:startTitle="@string/nearby_sharing" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/my_nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appbar"
+        app:navGraph="@navigation/peer_to_peer_graph" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/mobile/src/main/res/layout/item_home_vault_server.xml b/mobile/src/main/res/layout/item_home_vault_server.xml
index f216f9e01..a2fb5e027 100644
--- a/mobile/src/main/res/layout/item_home_vault_server.xml
+++ b/mobile/src/main/res/layout/item_home_vault_server.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="100dp"
@@ -7,31 +8,40 @@
     android:layout_marginEnd="12dp"
     android:background="@drawable/bg_home_btn">
 
-    <LinearLayout
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/server_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/server_name_textView"
+        tools:src="@drawable/ic_google_drive_white" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/server_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="false"
-            tools:src="@drawable/ic_google_drive_white" />
+    <TextView
+        android:id="@+id/server_name_textView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/server_img"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Reports" />
 
-        <TextView
-            android:id="@+id/server_name_textView"
-            style="@style/Tella_Main_White_Text.Meduim"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            tools:text="Reports" />
-    </LinearLayout>
+    <TextView
+        android:id="@+id/two_line_server_name_textView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="5dp"
+        android:gravity="center"
+        android:maxLines="2"
+        android:ellipsize="end"
+        app:layout_constraintTop_toBottomOf="@id/server_img"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="This is a two-line example that wraps nicely." />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
new file mode 100644
index 000000000..9de4a3bf7
--- /dev/null
+++ b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+
+    <ImageView
+        android:id="@+id/setupImgV"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/ic_share_big"
+        app:layout_constraintBottom_toTopOf="@+id/shareFilesTitleTv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <TextView
+        android:id="@+id/shareFilesTitleTv"
+        style="@style/Tella_Main_White_Text.Bold"
+        android:layout_marginBottom="12dp"
+        android:text="@string/how_it_works"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/shareFilesDescriptionTv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/shareFilesDescriptionTv"
+        style="@style/Tella_Main_White_Text.Bold"
+        android:layout_marginTop="@dimen/lock_subtitle_desc_margin_top"
+        android:padding="24dp"
+        android:text="@string/share_files_description"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/sendFilesBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/setupImgV" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/sendFilesBtn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
+        android:layout_marginTop="50dp"
+        app:check_state="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shareFilesDescriptionTv"
+        app:text="@string/send_files" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/receiveFilesBtn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        app:check_state="false"
+        app:layout_constraintTop_toBottomOf="@+id/sendFilesBtn"
+        app:text="@string/receive_files" />
+
+    <TextView
+        android:id="@+id/learn_more_textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:fontFamily="@font/open_sans"
+        android:gravity="center"
+        android:text="@string/learn_more_about_nearby_sharing"
+        android:textColor="@color/wa_yellow"
+        android:textSize="11sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/receiveFilesBtn" />
+
+    <TextView
+        android:id="@+id/next_btn"
+        style="@style/Unlock_White_Text_Back"
+        android:layout_marginEnd="34dp"
+        android:text="@string/action_next"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/navigation/home.xml b/mobile/src/main/res/navigation/home.xml
index 451360d73..1e1ca86f9 100644
--- a/mobile/src/main/res/navigation/home.xml
+++ b/mobile/src/main/res/navigation/home.xml
@@ -65,6 +65,11 @@
             app:destination="@id/next_cloud_graph"
             app:enterAnim="@anim/slide_in_start"
             app:exitAnim="@anim/fade_out" />
+        <action
+            android:id="@+id/action_homeScreen_to_peerToPeer_screen"
+            app:destination="@id/peerToPeerScreen"
+            app:enterAnim="@anim/slide_in_start"
+            app:exitAnim="@anim/fade_out" />
 
     </fragment>
     <fragment
@@ -115,4 +120,10 @@
         android:name="org.horizontal.tella.mobile.views.fragment.resources.ResourcesListFragment"
         android:label="@string/Home_BottomNav_Resources"
         tools:layout="@layout/fragment_resources_list" />
+
+    <activity
+        android:id="@+id/peerToPeerScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.activity.PeerToPeerActivity"
+        android:label="PeerToPeer"
+        tools:layout="@layout/activity_peer_to_peer"/>
 </navigation>
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
new file mode 100644
index 000000000..df4dd7c20
--- /dev/null
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/peer_to_peer_graph"
+    app:startDestination="@id/startNearBySharingFragment">
+
+    <fragment
+        android:id="@+id/startNearBySharingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.StartNearBySharingFragment"
+        tools:layout="@layout/start_near_by_sharing_fragment"
+        android:label="StartNearBySharingFragment" />
+</navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index ab332ec15..8132cdc06 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1003,4 +1003,15 @@ Would you like to share analytics with the Tella team?</string>
   <string name="delete_report">Delete report?</string>
   <string name="report_submitted_msg">Your report have successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
+    <string name="NearBySharing">Nearby sharing</string>
+  <string name="share_files_description">
+    Share files with nearby devices without an Internet connection\n  1. Both devices must be connected to the same Wifi network\n  2. Make sure you trust the person you are sharing files with
+</string>
+  <string name="send_files">Send files</string>
+  <string name="receive_files">Receive files</string>
+  <string name="learn_more_about_nearby_sharing">Learn more about nearby sharing</string>
+  <string name="nearby_sharing">Nearby sharing</string>
+  <string name="how_it_works">How it works</string>
+  <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
+
 </resources>

From 0e0b53a79303b49ac181360e6e48242655cde2e3 Mon Sep 17 00:00:00 2001
From: wafa lakhal <4533152+wafalakhal@users.noreply.github.com>
Date: Wed, 21 May 2025 11:44:21 +0100
Subject: [PATCH 002/153] peerToPeer register and prepare upload implementation
 (#375)

* WIP qr code design

* WIP qr code generation

* add dual text checkbox custom view

* WIP add show device info design

* WIP device info ligic

* WIP verification info design

* show device wifi hotspot

* wip complete hotspot logic/design

* add navigation to connect screen

* fix design

* fix design

* Fix hotspot name

* WIP generate certificate

* Fix certificate generation

* WIP generate code and start server

* Finish QrCode generation

* Finish scan and start qr code scanning

* add register endpoint logic in the server side

* change endpoint naming

* wip register from the sender side

* wip register api

* handle back button

* refactor code

* WIP code refactor

* wip implement prepare upload

* WIP refactor

* handle register response

* Fix serialization problem

* wip fix server issue

* Fix ktor parsin

* add file

* wip prepare upload handle happy path api

---------

Co-authored-by: Ahlem <ahlem.jarrar@hotmail.com>
---
 build.gradle                                  |   1 +
 mobile/build.gradle                           |  16 +-
 mobile/proguard-rules.pro                     |   5 +-
 mobile/src/main/AndroidManifest.xml           |   7 +-
 mobile/src/main/assets/testDemo.txt           |   1 +
 .../tella/mobile/MyApplication.java           |  18 +-
 .../certificate/CertificateGenerator.kt       |  68 ++++++
 .../mobile/certificate/CertificateUtils.kt    |  85 +++++++
 .../tella/mobile/data/peertopeer/FileItem.kt  |  12 +
 .../data/peertopeer/PrepareUploadRequest.kt   |  10 +
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 183 +++++++++++++++
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 138 +++++++++++
 .../entity/peertopeer/DeviceMetadata.kt       |  12 +
 .../domain/entity/peertopeer/QRCodeInfos.kt   |  15 ++
 .../domain/peertopeer/KeyStoreConfig.kt       |  26 +++
 .../peertopeer/PeerConnectionPayload.kt       |  18 ++
 .../peertopeer/PeerPrepareUploadResponse.kt   |   8 +
 .../domain/peertopeer/PeerRegisterPayload.kt  |  10 +
 .../mobile/domain/peertopeer/PeerResponse.kt  |   8 +
 .../mobile/domain/peertopeer/TellaServer.kt   |   7 +
 .../tella/mobile/util/NavigationManager.kt    |  19 +-
 .../mobile/views/fragment/CameraFragment.kt   |  42 ----
 .../mobile/views/fragment/ReportsFragment.kt  |  58 -----
 .../peertopeer/PeerToPeerViewModel.kt         | 220 ++++++++++++++++++
 .../peertopeer/StartNearBySharingFragment.kt  |  26 ++-
 .../peertopeer/activity/PeerToPeerActivity.kt |   2 -
 .../peertopeer/data/ConnectionType.kt         |   5 +
 .../fragment/peertopeer/data/NetWorkInfo.kt   |   8 +
 .../fragment/peertopeer/di/PeerModule.kt      |  19 ++
 .../receipentflow/ConnectHotspotFragment.kt   |  83 +++++++
 .../receipentflow/QRCodeFragment.kt           |  89 +++++++
 .../receipentflow/ShowDeviceInfoFragment.kt   |  18 ++
 .../receipentflow/VerificationInfoFragment.kt |   4 +
 .../senderflow/ScanQrCodeFragment.kt          | 111 +++++++++
 .../mobile/views/settings/LanguageSettings.kt |   2 +-
 mobile/src/main/res/drawable/icon_wifi.xml    |  13 ++
 .../src/main/res/drawable/qr_scan_border.xml  |  10 +
 .../main/res/layout/activity_peer_to_peer.xml |  22 +-
 .../res/layout/connect_hotspot_layout.xml     | 134 +++++++++++
 .../src/main/res/layout/fragment_qr_code.xml  |  91 ++++++++
 mobile/src/main/res/layout/fragment_vault.xml |   1 +
 .../main/res/layout/peer_to_peer_layout.xml   |   8 +
 .../main/res/layout/scan_qrcode_fragment.xml  |  88 +++++++
 .../res/layout/show_device_info_layout.xml    | 113 +++++++++
 .../layout/start_near_by_sharing_fragment.xml |  36 ++-
 .../res/layout/verification_info_fragment.xml | 116 +++++++++
 .../res/navigation/peer_to_peer_graph.xml     |  38 ++-
 mobile/src/main/res/values/strings.xml        |  23 ++
 .../shared_ui/buttons/DualTextCheckView.kt    |  90 +++++++
 .../hzontal/shared_ui/buttons/RoundButton.kt  |  29 +--
 .../main/res/drawable/bg_dual_text_check.xml  |  16 ++
 shared-ui/src/main/res/drawable/device.xml    |  24 ++
 .../res/layout-hdpi/information_button.xml    |   4 +-
 .../res/layout-xhdpi/information_button.xml   |   4 +-
 .../res/layout/dual_text_check_layout.xml     |  53 +++++
 shared-ui/src/main/res/values/attrs.xml       |   7 +
 shared-ui/src/main/res/values/styles.xml      |   4 +
 tella-keys/build.gradle                       |   5 +
 .../tella/keys/key/LifecycleMainKey.java      |   4 -
 59 files changed, 2114 insertions(+), 173 deletions(-)
 create mode 100644 mobile/src/main/assets/testDemo.txt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/QRCodeInfos.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/KeyStoreConfig.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerResponse.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/TellaServer.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/CameraFragment.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/ReportsFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
 create mode 100644 mobile/src/main/res/drawable/icon_wifi.xml
 create mode 100644 mobile/src/main/res/drawable/qr_scan_border.xml
 create mode 100644 mobile/src/main/res/layout/connect_hotspot_layout.xml
 create mode 100644 mobile/src/main/res/layout/fragment_qr_code.xml
 create mode 100644 mobile/src/main/res/layout/peer_to_peer_layout.xml
 create mode 100644 mobile/src/main/res/layout/scan_qrcode_fragment.xml
 create mode 100644 mobile/src/main/res/layout/show_device_info_layout.xml
 create mode 100644 mobile/src/main/res/layout/verification_info_fragment.xml
 create mode 100644 shared-ui/src/main/java/org/hzontal/shared_ui/buttons/DualTextCheckView.kt
 create mode 100644 shared-ui/src/main/res/drawable/bg_dual_text_check.xml
 create mode 100644 shared-ui/src/main/res/drawable/device.xml
 create mode 100644 shared-ui/src/main/res/layout/dual_text_check_layout.xml

diff --git a/build.gradle b/build.gradle
index fcee3f3e7..2bacd942a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,6 +102,7 @@ buildscript {
         classpath "com.google.firebase:firebase-crashlytics-gradle:$versions.crashlyticsGradle"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.50'
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$versions.kotlin"
     }
 }
 
diff --git a/mobile/build.gradle b/mobile/build.gradle
index e452de71a..29bb8a07c 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id 'dagger.hilt.android.plugin'
     id 'com.google.firebase.crashlytics'
     id 'com.google.gms.google-services'
+    id 'org.jetbrains.kotlin.plugin.serialization'
 }
 
 android {
@@ -88,7 +89,7 @@ android {
     }
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
-
+        exclude 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
     }
     namespace 'org.horizontal.tella.mobile'
 }
@@ -233,6 +234,19 @@ dependencies {
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$versions.fidoVersion"
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$versions.fidoVersion"
 
+    //QR CODE SCAN/GENERATE LIBRARY
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+
+    //ktor imp
+    implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.9")
+    implementation("io.ktor:ktor-server-core:2.3.9")
+    implementation("io.ktor:ktor-server-netty:2.3.9")
+    implementation("io.ktor:ktor-server-content-negotiation:2.3.9")
+    implementation("io.ktor:ktor-server-cio:2.3.9")
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3' // Use the latest version
+
+
 }
 
 def getLocalProperties() {
diff --git a/mobile/proguard-rules.pro b/mobile/proguard-rules.pro
index d114ab925..acb937b3a 100644
--- a/mobile/proguard-rules.pro
+++ b/mobile/proguard-rules.pro
@@ -246,4 +246,7 @@
 -if class androidx.credentials.CredentialManager
 -keep class androidx.credentials.playservices.** {
   *;
-}
\ No newline at end of file
+}
+
+-keep class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
\ No newline at end of file
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 6cc4674bf..428d36e0d 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -49,9 +49,9 @@
         android:icon="@mipmap/tella_icon"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/configure_localhost_media_file_http_server"
         android:roundIcon="@mipmap/tella_icon_round"
-        android:localeConfig="@xml/locales_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
@@ -701,6 +701,11 @@
 
         </activity>
 
+        <activity
+            android:name=".views.fragment.peertopeer.activity.PeerToPeerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/mobile/src/main/assets/testDemo.txt b/mobile/src/main/assets/testDemo.txt
new file mode 100644
index 000000000..f6983e619
--- /dev/null
+++ b/mobile/src/main/assets/testDemo.txt
@@ -0,0 +1 @@
+                                       This is a test yo
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java b/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
index 509ff254b..b7a6fc3d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
@@ -11,6 +11,7 @@
 import android.os.Build;
 import android.os.StrictMode;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -36,6 +37,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.hzontal.shared_ui.data.CommonPrefs;
 
 import org.conscrypt.Conscrypt;
@@ -53,6 +55,7 @@
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
 import java.security.Security;
 import java.util.Arrays;
 
@@ -63,6 +66,7 @@
 import dagger.hilt.android.HiltAndroidApp;
 import io.reactivex.functions.Consumer;
 import io.reactivex.plugins.RxJavaPlugins;
+
 import org.horizontal.tella.mobile.bus.TellaBus;
 import org.horizontal.tella.mobile.data.database.KeyDataSource;
 import org.horizontal.tella.mobile.data.nextcloud.TempFileManager;
@@ -99,8 +103,6 @@ public class MyApplication extends MultiDexApplication implements IUnlockRegistr
     Vault.Config vaultConfig;
     private static final String TAG = MyApplication.class.getSimpleName();
     public static final String DOT = ".";
-    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_17;
-    private static WeakReference<Context> appContext;
     private long startTime;
     private long totalTimeSpent = 0; // Store total time spent in the app
     private int activityReferences = 0;
@@ -235,6 +237,7 @@ public void accept(Throwable throwable) {
         TellaKeysUI.initialize(mainKeyStore, mainKeyHolder, unlockRegistry, this, Preferences.getFailedUnlockOption(), Preferences.getUnlockRemainingAttempts(), Preferences.isShowUnlockRemainingAttempts());
         insertConscrypt();
         enableStrictMode();
+        setupBouncyCastleProvider();
     }
 
     private void configureCrashlytics() {
@@ -437,4 +440,15 @@ private void enableStrictMode() {
     }
 
 
+    private void setupBouncyCastleProvider() {
+        try {
+            if (Security.getProvider("BC") == null) {
+                Security.addProvider(new BouncyCastleProvider());
+                Timber.i("BouncyCastle provider registered");
+            }
+        } catch (Exception e) {
+            Timber.e(e, "Failed to register BouncyCastle provider");
+        }
+    }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
new file mode 100644
index 000000000..766bcd477
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
@@ -0,0 +1,68 @@
+package org.horizontal.tella.mobile.certificate
+
+import org.bouncycastle.asn1.x500.X500Name
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
+import org.bouncycastle.jce.provider.BouncyCastleProvider
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
+import java.security.KeyPair
+import java.security.KeyPairGenerator
+import java.security.Security
+import java.security.cert.X509Certificate
+import java.util.Date
+
+object CertificateGenerator {
+
+    init {
+        if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
+            Security.addProvider(BouncyCastleProvider())
+        }
+    }
+
+    fun generateCertificate(
+        commonName: String = "Tella Android",
+        organization: String = "Tella",
+        validityDays: Int = 365,
+        ipAddress: String
+    ): Pair<KeyPair, X509Certificate> {
+        val keyGen = KeyPairGenerator.getInstance("RSA")
+        keyGen.initialize(2048)
+        val keyPair = keyGen.generateKeyPair()
+
+        val now = Date()
+        val validTo = Date(now.time + validityDays * 86400000L)
+
+        val issuer = X500Name("CN=$commonName,O=$organization")
+        val subject = issuer
+
+        val serialNumber = CertificateUtils.generateSerialNumber()
+
+        val certBuilder = JcaX509v3CertificateBuilder(
+            issuer, serialNumber, now, validTo, subject, keyPair.public
+        )
+
+        if (ipAddress.isNotEmpty()) {
+            val san = org.bouncycastle.asn1.x509.GeneralNames(
+                org.bouncycastle.asn1.x509.GeneralName(
+                    org.bouncycastle.asn1.x509.GeneralName.iPAddress, ipAddress
+                )
+            )
+            certBuilder.addExtension(
+                org.bouncycastle.asn1.x509.Extension.subjectAlternativeName,
+                false,
+                san
+            )
+        }
+
+        val signer = JcaContentSignerBuilder("SHA256withRSA")
+            .build(keyPair.private)
+
+        val holder = certBuilder.build(signer)
+
+        val certificate = JcaX509CertificateConverter()
+            .getCertificate(holder)
+
+        return Pair(keyPair, certificate)
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
new file mode 100644
index 000000000..53cb67a5e
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -0,0 +1,85 @@
+package org.horizontal.tella.mobile.certificate
+
+import android.util.Base64
+import java.math.BigInteger
+import java.security.KeyPair
+import java.security.SecureRandom
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.security.KeyStore
+import java.util.UUID
+import javax.net.ssl.KeyManagerFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+
+object CertificateUtils {
+
+    fun generateSerialNumber(): BigInteger {
+        return BigInteger(128, SecureRandom())
+    }
+
+    fun certificateToPem(certificate: X509Certificate): String {
+        val encoded = Base64.encodeToString(certificate.encoded, Base64.NO_WRAP)
+        return "-----BEGIN CERTIFICATE-----\n$encoded\n-----END CERTIFICATE-----"
+    }
+
+    fun pemToCertificate(pemString: String): X509Certificate {
+        val cleanPem = pemString
+            .replace("-----BEGIN CERTIFICATE-----", "")
+            .replace("-----END CERTIFICATE-----", "")
+            .replace("\\s".toRegex(), "")
+        val decoded = Base64.decode(cleanPem, Base64.DEFAULT)
+        val certFactory = CertificateFactory.getInstance("X.509")
+        return certFactory.generateCertificate(decoded.inputStream()) as X509Certificate
+    }
+
+    fun encodeBase64(data: ByteArray): String =
+        Base64.encodeToString(data, Base64.NO_WRAP)
+
+    fun decodeBase64(encodedString: String): ByteArray =
+        Base64.decode(encodedString, Base64.NO_WRAP)
+
+    fun getPublicKeyHash(certificate: X509Certificate): String {
+        val digest = java.security.MessageDigest.getInstance("SHA-256")
+        val hash = digest.digest(certificate.publicKey.encoded)
+        return hash.joinToString("") { "%02x".format(it) }
+    }
+
+    fun createSSLContext(
+        keyPair: KeyPair,
+        certificate: X509Certificate
+    ): SSLContext {
+        val keyStore = KeyStore.getInstance("PKCS12")
+        val keyPassword =  UUID.randomUUID().toString()
+        keyStore.load(null, null)
+        keyStore.setKeyEntry(
+            "alias",
+            keyPair.private,
+            keyPassword.toCharArray(),
+            arrayOf(certificate)
+        )
+
+        val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
+        kmf.init(keyStore, keyPassword.toCharArray())
+
+        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+        tmf.init(keyStore)
+
+        val sslContext = SSLContext.getInstance("TLS")
+        sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
+
+        return sslContext
+    }
+
+    fun getTrustManager(certificate: X509Certificate): X509TrustManager {
+        val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
+        keyStore.load(null, null)
+        keyStore.setCertificateEntry("alias", certificate)
+
+        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+        tmf.init(keyStore)
+
+        return tmf.trustManagers[0] as X509TrustManager
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
new file mode 100644
index 000000000..1c0d3c2dd
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
@@ -0,0 +1,12 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FileItem(
+    val id: String,
+    val fileName: String,
+    val size: Long,
+    val fileType: String,
+    val sha256: String
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
new file mode 100644
index 000000000..e6e8b9aa8
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
@@ -0,0 +1,10 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PrepareUploadRequest(
+    val title: String,
+    val sessionId: String,
+    val files: List<FileItem>
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
new file mode 100644
index 000000000..6345097b1
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -0,0 +1,183 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import android.util.Log
+import kotlinx.serialization.encodeToString
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
+import org.json.JSONObject
+import java.io.File
+import java.security.SecureRandom
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+class TellaPeerToPeerClient {
+
+    private fun getClientWithFingerprintValidation(expectedFingerprint: String): OkHttpClient {
+        val trustManager = object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+
+            override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String?) {}
+
+            override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String?) {
+                val serverCert = chain[0]
+                val actualFingerprint = CertificateUtils.getPublicKeyHash(serverCert)
+
+                if (!actualFingerprint.equals(expectedFingerprint, ignoreCase = true)) {
+                    throw CertificateException(
+                        "Server certificate fingerprint mismatch.\nExpected: $expectedFingerprint\nGot: $actualFingerprint"
+                    )
+                }
+            }
+        }
+
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
+        }
+
+        return OkHttpClient.Builder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .writeTimeout(30, TimeUnit.SECONDS)
+            .sslSocketFactory(sslContext.socketFactory, trustManager)
+            .build()
+    }
+
+    suspend fun registerPeerDevice(
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        pin: String
+    ): Result<String> = withContext(Dispatchers.IO) {
+        val url = "https://$ip:$port/api/v1/register"
+        Log.d("PeerClient", "Connecting to: $url")
+
+        try {
+            val payload = PeerRegisterPayload(
+                pin = pin,
+                nonce = UUID.randomUUID().toString()
+            )
+
+            val jsonPayload = Json.encodeToString(payload)
+            val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
+            Log.d("PeerClient", "Request payload: $requestBody")
+
+            val client = getClientWithFingerprintValidation(expectedFingerprint)
+            val request = Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .addHeader("Content-Type", "application/json")
+                .build()
+
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    val errorBody = response.body.string()
+                    Log.e(
+                        "PeerClient", """
+                    HTTP ${response.code} Error
+                    URL: $url
+                    Headers: ${response.headers}
+                    Body: $errorBody
+                """.trimIndent()
+                    )
+                    return@use Result.failure(Exception("HTTP ${response.code}: $errorBody"))
+                }
+
+                val contentType = response.header("Content-Type") ?: ""
+                if (!contentType.contains("application/json")) {
+                    Log.w("PeerClient", "Unexpected Content-Type: $contentType")
+                }
+
+                val body = response.body?.string() ?: ""
+                return@use try {
+                    val json = JSONObject(body)
+                    Result.success(json.getString("sessionId"))
+                } catch (e: Exception) {
+                    Result.failure(Exception("Invalid JSON response: ${e.message}"))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("PeerClient", "Request failed", e)
+            Result.failure(e)
+        }
+    }
+
+    suspend fun prepareUpload(
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        title: String = "Title of the report",
+        file: File,
+        fileId: String,
+        sha256: String,
+        sessionId: String
+    ): Result<String> {
+        return withContext(Dispatchers.IO) {
+            val url = "https://$ip:$port/api/v1/prepare-upload"
+
+            val fileItem = FileItem(
+                id = fileId,
+                fileName = file.name,
+                size = file.length(),
+                fileType = "application/octet-stream",
+                sha256 = sha256
+            )
+
+            val requestPayload = PrepareUploadRequest(
+                title = title,
+                sessionId = sessionId,
+                files = listOf(fileItem)
+            )
+
+            val jsonPayload = Json.encodeToString(requestPayload)
+            val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
+            Log.d("PeerClient", "Request payload: $requestBody")
+            val client = getClientWithFingerprintValidation(expectedFingerprint)
+
+            try {
+                val request = Request.Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .addHeader("Content-Type", "application/json")
+                    .build()
+
+                client.newCall(request).execute().use { response ->
+                    if (response.isSuccessful) {
+                        val responseBody = response.body?.string()
+                        responseBody?.let {
+                            val jsonObject = JSONObject(it)
+                            val transmissionId = jsonObject.getString("transmissionId")
+                            Log.d("PrepareUpload", "Transmission ID: $transmissionId")
+                            return@use Result.success(transmissionId)
+                        }
+                    } else {
+                        Log.e("PrepareUpload", "Error ${response.code}: ${response.message}")
+                        when (response.code) {
+                            409 -> {
+                                Log.e("PrepareUpload", "Conflict: Try canceling active sessions.")
+                            }
+
+                            else -> {}
+                        }
+                    }
+                }
+                Result.failure(Exception("Unsuccessful response"))
+            } catch (e: Exception) {
+                Log.e("PrepareUpload", "Exception: ${e.message}", e)
+                Result.failure(e)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
new file mode 100644
index 000000000..3a56cb036
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -0,0 +1,138 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import android.util.Log
+import com.google.gson.Gson
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
+import io.ktor.serialization.kotlinx.json.json
+import io.ktor.server.application.call
+import io.ktor.server.application.install
+import io.ktor.server.engine.ApplicationEngine
+import io.ktor.server.engine.applicationEngineEnvironment
+import io.ktor.server.engine.embeddedServer
+import io.ktor.server.engine.sslConnector
+import io.ktor.server.netty.Netty
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.request.receive
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondText
+import io.ktor.server.routing.get
+import io.ktor.server.routing.post
+import io.ktor.server.routing.routing
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
+import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
+import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
+import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
+import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
+import java.security.KeyPair
+import java.security.KeyStore
+import java.security.cert.X509Certificate
+import java.util.UUID
+import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType
+
+const val port = 53317
+
+class TellaPeerToPeerServer(
+    private val ip: String,
+    private val serverPort: Int = port,
+    private val keyPair: KeyPair,
+    private val certificate: X509Certificate,
+    private val keyStoreConfig: KeyStoreConfig
+) : TellaServer {
+
+    private var engine: ApplicationEngine? = null
+
+    override val certificatePem: String
+        get() = CertificateUtils.certificateToPem(certificate)
+
+    override fun start() {
+        val keyStore = KeyStore.getInstance("PKCS12").apply {
+            load(null, null)
+            setKeyEntry(
+                keyStoreConfig.alias,
+                keyPair.private,
+                keyStoreConfig.password,
+                arrayOf(certificate)
+            )
+        }
+
+        engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
+            sslConnector(
+                keyStore = keyStore,
+                keyAlias = keyStoreConfig.alias,
+                keyStorePassword = { keyStoreConfig.password },
+                privateKeyPassword = { keyStoreConfig.password }
+            ) {
+                this.host = ip
+                this.port = serverPort
+            }
+
+            module {
+                install(ContentNegotiation) {
+                    json()
+                }
+                routing {
+                    // Root route to confirm the server is running
+                    get("/") {
+                        Log.i("Test", "Server started")
+                        call.respondText("The server is running securely over HTTPS.")
+                    }
+
+                    post("/api/v1/register") {
+                        val request = try {
+                            call.receive<PeerRegisterPayload>()
+                        } catch (e: Exception) {
+                            call.respondText(
+                                """{"error": "Invalid request body"}""",
+                                ContentType.Application.Json,
+                                HttpStatusCode.BadRequest
+                            )
+                            return@post
+                        }
+
+                        val sessionId = UUID.randomUUID().toString()
+                        call.respondText(
+                            Gson().toJson(PeerResponse(sessionId)),
+                            ContentType.Application.Json,
+                            HttpStatusCode.OK
+                        )
+                    }
+
+
+                    post("/api/v1/prepare-upload") {
+                        val request = try {
+                            call.receive<PrepareUploadRequest>()
+                        } catch (e: Exception) {
+                            call.respondText("Invalid body", status = HttpStatusCode.BadRequest)
+                            return@post
+                        }
+
+                        if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
+                            call.respondText(
+                                "Missing required fields",
+                                status = HttpStatusCode.BadRequest
+                            )
+                            return@post
+                        }
+
+                        // we can process the files or store metadata here
+                        val transmissionId = UUID.randomUUID().toString()
+                        call.respondText(
+                            Gson().toJson(PeerPrepareUploadResponse(transmissionId)),
+                            ContentType.Application.Json,
+                            HttpStatusCode.OK
+                        )
+                    }
+                }
+
+            }
+        }).start(wait = false)
+    }
+
+    override fun stop() {
+        engine?.stop(1000, 5000)
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt
new file mode 100644
index 000000000..90662f51a
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt
@@ -0,0 +1,12 @@
+package org.horizontal.tella.mobile.domain.entity.peertopeer
+
+data class DeviceMetadata(
+    val deviceType: String = "mobile",
+    val version: String = "2.0",
+    val fingerprint: String,
+    val serverPort: Int = 53317,
+    val protocol: String = "https",
+    val download: Boolean = true,
+    val deviceModel: String = android.os.Build.MODEL ?: "Android",
+    val alias: String = "AndroidDevice"
+)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/QRCodeInfos.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/QRCodeInfos.kt
new file mode 100644
index 000000000..2a85a6eb7
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/QRCodeInfos.kt
@@ -0,0 +1,15 @@
+package org.horizontal.tella.mobile.domain.entity.peertopeer
+
+data class QRCodeInfos(
+    val ipAddress: String,
+    val pin: String,
+    val hash: String
+) {
+    override fun equals(other: Any?): Boolean {
+        return (other as? QRCodeInfos)?.ipAddress == ipAddress
+    }
+
+    override fun hashCode(): Int {
+        return ipAddress.hashCode()
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/KeyStoreConfig.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/KeyStoreConfig.kt
new file mode 100644
index 000000000..8d067c115
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/KeyStoreConfig.kt
@@ -0,0 +1,26 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import java.util.UUID
+
+data class KeyStoreConfig(
+    val alias: String = "tella-alias",
+    val password: CharArray = UUID.randomUUID().toString().toCharArray()
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as KeyStoreConfig
+
+        if (alias != other.alias) return false
+        if (!password.contentEquals(other.password)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = alias.hashCode()
+        result = 31 * result + password.contentHashCode()
+        return result
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
new file mode 100644
index 000000000..7a28595c5
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
@@ -0,0 +1,18 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import com.google.gson.annotations.SerializedName
+
+data class PeerConnectionPayload(
+    @SerializedName("connect_code")
+    val connectCode: String,
+
+    @SerializedName("port")
+    val port: Int,
+
+    @SerializedName("certificate_hash")
+    val certificateHash: String,
+
+    @SerializedName("pin")
+    val pin: String
+)
+
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
new file mode 100644
index 000000000..acfc25782
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PeerPrepareUploadResponse(
+    val transmissionId: String
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
new file mode 100644
index 000000000..d9c399056
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
@@ -0,0 +1,10 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import kotlinx.serialization.Serializable
+import java.util.UUID
+
+@Serializable
+data class PeerRegisterPayload(
+    val pin: String,
+    val nonce: String = UUID.randomUUID().toString()
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerResponse.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerResponse.kt
new file mode 100644
index 000000000..9891126b7
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerResponse.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PeerResponse(
+    val sessionId: String
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/TellaServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/TellaServer.kt
new file mode 100644
index 000000000..655edf426
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/TellaServer.kt
@@ -0,0 +1,7 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+interface TellaServer {
+    fun start()
+    fun stop()
+    val certificatePem: String
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index f6ffc4a05..a69026b15 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -55,9 +55,11 @@ class NavigationManager(
     fun navigateFromGoogleDriveEntryScreenToGoogleDriveSendScreen() {
         navigateToWithBundle(R.id.action_newGoogleDriveScreen_to_googleDriveSendScreen)
     }
+
     fun navigateFromNextCloudEntryScreenToNextCloudSendScreen() {
         navigateToWithBundle(R.id.action_newNextCloudScreen_to_nextCloudSendScreen)
     }
+
     fun navigateFromGoogleDriveMainScreenToGoogleDriveSendScreen() {
         navigateToWithBundle(R.id.action_googleDriveScreen_to_googleDriveSendScreen)
     }
@@ -65,6 +67,7 @@ class NavigationManager(
     fun navigateFromNextCloudMainScreenToNextCloudSendScreen() {
         navigateToWithBundle(R.id.action_nextCloudScreen_to_nextCloudSendScreen)
     }
+
     fun navigateFromGoogleDriveScreenToGoogleDriveSubmittedScreen() {
         navigateToWithBundle(R.id.action_googleDriveScreen_to_googleDriveSubmittedScreen)
     }
@@ -72,6 +75,7 @@ class NavigationManager(
     fun navigateFromNextCloudScreenToNextCloudSubmittedScreen() {
         navigateToWithBundle(R.id.action_nextCloudScreen_to_nextCloudSubmittedScreen)
     }
+
     fun navigateFromDropBoxScreenToDropBoxSubmittedScreen() {
         navigateToWithBundle(R.id.action_dropBoxScreen_to_dropBoxSubmittedScreen)
     }
@@ -136,7 +140,8 @@ class NavigationManager(
     fun navigateToNextCloudCreateFolderScreen() {
         navigateToWithBundle(R.id.action_loginNextCloudScreen_to_nextCloudNewFolderScreen)
     }
-    fun actionNextCloudNewFolderScreenToSuccessfulScreen(){
+
+    fun actionNextCloudNewFolderScreenToSuccessfulScreen() {
         navigateToWithBundle(R.id.action_nextCloudNewFolderScreen_to_successfulSetServerFragment)
     }
 
@@ -160,4 +165,16 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_selectSharedDriveFragment_to_googleDriveConnectedServerFragment)
     }
 
+    fun navigateFromStartNearBySharingFragmentToConnectHotspotFragment() {
+        navigateToWithBundle(R.id.action_startNearBySharingFragment_to_connectHotspotFragment)
+    }
+
+    fun navigateFromActionConnectHotspotScreenToQrCodeScreen() {
+        navigateToWithBundle(R.id.action_connectHotspotScreen_to_qrCodeScreen)
+    }
+
+    fun navigateFromActionConnectHotspotScreenToScanQrCodeScreen() {
+        navigateToWithBundle(R.id.action_startNearBySharingFragment_to_scanQrCodeScreen)
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/CameraFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/CameraFragment.kt
deleted file mode 100644
index 7aa74f02c..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/CameraFragment.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import org.horizontal.tella.mobile.R
-
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-class CameraFragment : Fragment() {
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_camera, container, false)
-    }
-
-    companion object {
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-                CameraFragment().apply {
-                    arguments = Bundle().apply {
-                        putString(ARG_PARAM1, param1)
-                        putString(ARG_PARAM2, param2)
-                    }
-                }
-    }
-}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/ReportsFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/ReportsFragment.kt
deleted file mode 100644
index b604058d5..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/ReportsFragment.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import org.horizontal.tella.mobile.R
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [ReportsFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class ReportsFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_reports, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment ReportsFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-                ReportsFragment().apply {
-                    arguments = Bundle().apply {
-                        putString(ARG_PARAM1, param1)
-                        putString(ARG_PARAM2, param2)
-                    }
-                }
-    }
-}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
new file mode 100644
index 000000000..9faa3cb48
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -0,0 +1,220 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiInfo
+import android.net.wifi.WifiManager
+import android.os.Build
+import android.text.format.Formatter
+import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
+import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import java.io.FileOutputStream
+import java.net.Inet4Address
+import java.net.NetworkInterface
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+@HiltViewModel
+class PeerToPeerViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val peerClient: TellaPeerToPeerClient
+) :
+    ViewModel() {
+
+    private val _networkInfo = MutableLiveData<NetworkInfo>()
+    val networkInfo: LiveData<NetworkInfo> = _networkInfo
+    var currentNetworkInfo: NetworkInfo? = null
+        private set
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
+    fun fetchCurrentNetworkInfo() {
+        val connectivityManager =
+            ContextCompat.getSystemService(context, ConnectivityManager::class.java)
+        val network = connectivityManager?.activeNetwork
+        val capabilities = connectivityManager?.getNetworkCapabilities(network)
+
+        when {
+            capabilities == null -> {
+                _networkInfo.value = NetworkInfo(ConnectionType.NONE, null, null)
+            }
+
+            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
+                val wifiManager =
+                    context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+                val wifiInfo = wifiManager.connectionInfo
+
+                val ssid =
+                    if (!wifiInfo.ssid.isNullOrEmpty() && wifiInfo.ssid != WifiManager.UNKNOWN_SSID) {
+                        wifiInfo.ssid.trim('"')
+                    } else {
+                        getWifiSsidFromCapabilities(capabilities) ?: "Hotspot"
+                    }
+
+                val ipAddress = Formatter.formatIpAddress(wifiInfo.ipAddress)
+                _networkInfo.value = NetworkInfo(ConnectionType.WIFI, ssid, ipAddress)
+            }
+
+            isDeviceHotspotEnabled(context) -> {
+                val hotspotSSID = getDeviceHotspotSSID(context) ?: "Hotspot"
+                val hotspotIpAddress = getDeviceHotspotIpAddress()
+                _networkInfo.value =
+                    NetworkInfo(ConnectionType.HOTSPOT, hotspotSSID, hotspotIpAddress)
+            }
+
+            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
+                _networkInfo.value = NetworkInfo(ConnectionType.CELLULAR, null, null)
+            }
+
+            else -> {
+                _networkInfo.value = NetworkInfo(ConnectionType.NONE, null, null)
+            }
+        }
+
+
+        currentNetworkInfo = _networkInfo.value
+    }
+
+    @SuppressLint("DiscouragedPrivateApi")
+    private fun getDeviceHotspotSSID(context: Context): String? {
+        return try {
+            val wifiManager =
+                context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+            val method = wifiManager.javaClass.getDeclaredMethod("getWifiApConfiguration")
+            method.isAccessible = true
+            val wifiConfig = method.invoke(wifiManager)
+            wifiConfig?.let {
+                val ssidField = it.javaClass.getDeclaredField("SSID")
+                ssidField.isAccessible = true
+                (ssidField.get(it) as? String)?.trim('"')
+            }
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    @SuppressLint("DiscouragedPrivateApi")
+    private fun isDeviceHotspotEnabled(context: Context): Boolean {
+        return try {
+            val wifiManager =
+                context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+            val method = wifiManager.javaClass.getDeclaredMethod("isWifiApEnabled")
+            method.isAccessible = true
+            method.invoke(wifiManager) as Boolean
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    private fun getWifiSsidFromCapabilities(capabilities: NetworkCapabilities): String? {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            (capabilities.transportInfo as? WifiInfo)?.ssid?.trim('"')
+        } else {
+            null
+        }
+    }
+
+    @SuppressLint("DiscouragedPrivateApi")
+    private fun getDeviceHotspotIpAddress(): String? {
+        return try {
+            val networkInterfaces = NetworkInterface.getNetworkInterfaces()
+            networkInterfaces.iterator().forEach { networkInterface ->
+                networkInterface.inetAddresses.iterator().forEach { inetAddress ->
+                    if (!inetAddress.isLoopbackAddress && inetAddress is Inet4Address) {
+                        if (networkInterface.displayName.contains("wlan") || networkInterface.displayName.contains(
+                                "ap"
+                            )
+                        ) {
+                            return inetAddress.hostAddress
+                        }
+                    }
+                }
+            }
+            null
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun onQrCodeParsed(ip: String, port: String, hash: String, pin: String) {
+        viewModelScope.launch {
+            val result = peerClient.registerPeerDevice(ip, port, hash, pin)
+            result.onSuccess {
+                Log.d("QRCode", "Registered successfully: $it")
+                val file = createFileFromAsset(context, "testDemo.txt")
+                peerClient.prepareUpload(ip,port,hash,"test report",file,UUID.randomUUID().toString(),calculateSha256(file),UUID.randomUUID().toString())
+                // update UI state
+            }.onFailure {
+                Log.e("QRCode", "Registration failed: ${it.message}")
+                // handle error (maybe post a value to LiveData)
+            }
+        }
+    }
+
+
+    private fun createFileFromAsset(context: Context, assetFileName: String): File {
+        // Create a temporary file in the cache directory
+        val tempFile = File(context.cacheDir, assetFileName)
+
+        if (!tempFile.exists()) {
+            Log.e("PrepareUpload", "File does not exist: ${tempFile.absolutePath}")
+        }
+
+        // Open the asset file
+        context.assets.open(assetFileName).use { inputStream ->
+            // Write the content of the asset to the temporary file
+            FileOutputStream(tempFile).use { outputStream ->
+                inputStream.copyTo(outputStream)
+            }
+        }
+
+        return tempFile
+    }
+
+
+
+    private fun calculateSha256(file: File): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+        file.inputStream().use { input ->
+            val buffer = ByteArray(8192)
+            var bytesRead: Int
+            while (input.read(buffer).also { bytesRead = it } != -1) {
+                digest.update(buffer, 0, bytesRead)
+            }
+        }
+        return digest.digest().joinToString("") { "%02x".format(it) }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
index 3ebe4c6e7..558712df8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
@@ -2,11 +2,10 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.isVisible
+import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.StartNearBySharingFragmentBinding
 import org.horizontal.tella.mobile.util.Util
-import org.horizontal.tella.mobile.util.hide
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 
 class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmentBinding>(
@@ -19,9 +18,9 @@ class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmen
     }
 
     private fun initViews() {
-        binding?.apply {
-            nextBtn.hide()
-
+        binding.apply {
+            nextBtn.setTextColor(getColor(baseActivity, R.color.wa_white_40))
+            toolbar.backClickListener = { baseActivity.onBackPressed() }
             learnMoreTextView.setOnClickListener {
                 baseActivity.maybeChangeTemporaryTimeout()
                 Util.startBrowserIntent(context, getString(R.string.peerToPeer_documentation_url))
@@ -29,21 +28,28 @@ class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmen
 
             sendFilesBtn.setOnClickListener { selectOption(true) }
             receiveFilesBtn.setOnClickListener { selectOption(false) }
-            nextBtn.setOnClickListener { onNextClicked() }
+            nextBtn.setOnClickListener { }
         }
     }
+
     private fun selectOption(isSend: Boolean) {
-        binding?.apply {
+        binding.apply {
             sendFilesBtn.isChecked = isSend
             receiveFilesBtn.isChecked = !isSend
-            nextBtn.isVisible = true
+            nextBtn.setOnClickListener { onNextClicked() }
+            nextBtn.setTextColor(getColor(baseActivity, R.color.wa_white))
         }
     }
 
     private fun onNextClicked() {
-        // TODO: Implement navigation on "Next"
+        with(binding) {
+            when {
+                sendFilesBtn.isChecked -> navManager().navigateFromActionConnectHotspotScreenToScanQrCodeScreen()
+                receiveFilesBtn.isChecked -> navManager().navigateFromStartNearBySharingFragmentToConnectHotspotFragment()
+                else -> {}
+            }
+        }
     }
-
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
index 81f8f350c..c44c043b7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -11,7 +11,5 @@ class PeerToPeerActivity  : BaseLockActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityPeerToPeerBinding.inflate(layoutInflater)
         setContentView(binding.getRoot())
-        binding.toolbar.backClickListener = { this.onBackPressed() }
-
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
new file mode 100644
index 000000000..4cca5a3b9
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
@@ -0,0 +1,5 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.data
+
+enum class ConnectionType {
+    WIFI, CELLULAR, HOTSPOT, NONE
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt
new file mode 100644
index 000000000..ffaf84136
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.data
+
+data class NetworkInfo(
+    val type: ConnectionType,
+    val networkName: String?,
+    val ipAddress: String?,
+    var port: String = "53317"
+)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
new file mode 100644
index 000000000..fefe59992
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -0,0 +1,19 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object PeerModule {
+
+    @Provides
+    @Singleton
+    fun providePeerClient(): TellaPeerToPeerClient {
+        return TellaPeerToPeerClient()
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
new file mode 100644
index 000000000..ecd84c81c
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -0,0 +1,83 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.activityViewModels
+import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
+import dagger.hilt.android.AndroidEntryPoint
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
+
+@AndroidEntryPoint
+class ConnectHotspotFragment :
+    BaseBindingFragment<ConnectHotspotLayoutBinding>(ConnectHotspotLayoutBinding::inflate) {
+
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private var isCheckboxChecked = false
+
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initObservers()
+        initListeners()
+        viewModel.fetchCurrentNetworkInfo()
+    }
+
+    private fun initObservers() {
+
+        viewModel.networkInfo.observe(viewLifecycleOwner) { info ->
+            when (info.type) {
+                ConnectionType.HOTSPOT, ConnectionType.WIFI, ConnectionType.CELLULAR -> {
+                    binding.currentWifiText.setRightText(info.networkName)
+                    updateNextButtonState(ConnectionType.HOTSPOT)
+                }
+
+                ConnectionType.NONE -> {
+                    binding.currentWifiText.setRightText("No network connected")
+                    updateNextButtonState(ConnectionType.NONE)
+                }
+            }
+        }
+    }
+
+    private fun initListeners() {
+
+        binding.currentWifi.setOnCheckedChangeListener { isChecked ->
+            isCheckboxChecked = isChecked
+            updateNextButtonState(viewModel.currentNetworkInfo?.type)
+        }
+
+        binding.toolbar.backClickListener = { baseActivity.onBackPressed() }
+
+        binding.nextBtn.setOnClickListener { }
+
+        binding.backBtn.setOnClickListener { baseActivity.onBackPressed() }
+    }
+
+    private fun updateNextButtonState(connectionType: ConnectionType?) {
+        val isEligibleConnection =
+            connectionType != ConnectionType.NONE && connectionType != ConnectionType.CELLULAR
+        val shouldEnable = isEligibleConnection && isCheckboxChecked
+
+        binding.nextBtn.setOnClickListener(if (shouldEnable) {
+            { onNextClicked() }
+        } else {
+            { }
+        })
+        binding.nextBtn.setTextColor(
+            getColor(baseActivity, if (shouldEnable) R.color.wa_white else R.color.wa_white_40)
+        )
+        binding.currentWifi.setCheckboxEnabled(isEligibleConnection)
+    }
+
+    private fun onNextClicked() {
+        navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
new file mode 100644
index 000000000..229783d68
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -0,0 +1,89 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import com.google.gson.Gson
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.WriterException
+import com.journeyapps.barcodescanner.BarcodeEncoder
+import org.horizontal.tella.mobile.certificate.CertificateGenerator
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
+import org.horizontal.tella.mobile.data.peertopeer.port
+import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
+import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
+import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+
+class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCodeBinding::inflate) {
+
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private var server: TellaServer? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val ip = viewModel.currentNetworkInfo?.ipAddress
+        if (!ip.isNullOrEmpty()) {
+            setupServerAndQr(ip)
+        }
+        handleBack()
+    }
+
+    private fun setupServerAndQr(ip: String) {
+        val (keyPair, certificate) = CertificateGenerator.generateCertificate(ipAddress = ip)
+        val config = KeyStoreConfig()
+
+        server = TellaPeerToPeerServer(
+            ip = ip,
+            keyPair = keyPair,
+            certificate = certificate,
+            keyStoreConfig = config
+        )
+        server?.start()
+
+        val certHash = CertificateUtils.getPublicKeyHash(certificate)
+        val pin = "111111"
+        val port = port
+
+        val payload = PeerConnectionPayload(
+            connectCode = ip,
+            port = port,
+            certificateHash = certHash,
+            pin = pin
+        )
+
+        val qrPayload = Gson().toJson(payload)
+        generateQrCode(qrPayload)
+    }
+
+
+    private fun generateQrCode(content: String) {
+        try {
+            val barcodeEncoder = BarcodeEncoder()
+            val bitmap: Bitmap = barcodeEncoder.encodeBitmap(
+                content,
+                BarcodeFormat.QR_CODE,
+                600,
+                600
+            )
+            binding.qrCodeImageView.setImageBitmap(bitmap)
+        } catch (e: WriterException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun handleBack() {
+        binding.toolbar.backClickListener = { nav().popBackStack() }
+        binding.backBtn.setOnClickListener { nav().popBackStack() }
+    }
+
+    // TODO NEXT STEPS
+    //TODO  WORK ON THE SENDER RESPONER
+    // TODO PREAPRE REGISTER RESPONE
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
new file mode 100644
index 000000000..698da492d
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -0,0 +1,18 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.os.Bundle
+import android.view.View
+import org.horizontal.tella.mobile.databinding.ShowDeviceInfoLayoutBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class ShowDeviceInfoFragment : BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initListeners()
+    }
+
+    private fun initListeners() {
+
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
new file mode 100644
index 000000000..5af7e3916
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
@@ -0,0 +1,4 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+class VerificationInfoFragment {
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
new file mode 100644
index 000000000..64a36f774
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -0,0 +1,111 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.activityViewModels
+import com.google.gson.Gson
+import com.journeyapps.barcodescanner.BarcodeCallback
+import com.journeyapps.barcodescanner.BarcodeResult
+import com.journeyapps.barcodescanner.CompoundBarcodeView
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
+import org.horizontal.tella.mobile.databinding.ScanQrcodeFragmentBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+
+class ScanQrCodeFragment :
+    BaseBindingFragment<ScanQrcodeFragmentBinding>(ScanQrcodeFragmentBinding::inflate) {
+
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private lateinit var barcodeView: CompoundBarcodeView
+
+    companion object {
+        private const val CAMERA_REQUEST_CODE = 1001
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        barcodeView = CompoundBarcodeView(requireContext())
+        barcodeView = binding.qrCodeScanView
+
+        if (ContextCompat.checkSelfPermission(
+                requireContext(),
+                Manifest.permission.CAMERA
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            startScanning()
+        } else {
+            baseActivity.maybeChangeTemporaryTimeout {
+                requestPermissions(arrayOf(Manifest.permission.CAMERA), CAMERA_REQUEST_CODE)
+            }
+        }
+        handleBack()
+    }
+
+    private fun startScanning() {
+        barcodeView.decodeContinuous(object : BarcodeCallback {
+
+            override fun barcodeResult(result: BarcodeResult?) {
+                result?.text?.let { qrContent ->
+                    barcodeView.pause()
+
+                    try {
+                        val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
+
+                        viewModel.onQrCodeParsed(
+                            ip = payload.connectCode,
+                            port = payload.port.toString(),
+                            hash = payload.certificateHash,
+                            pin = payload.pin
+                        )
+
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        // Show a message: Invalid QR Code
+                    }
+                }
+            }
+
+
+            override fun possibleResultPoints(resultPoints: MutableList<com.google.zxing.ResultPoint>?) {
+            }
+        })
+
+        barcodeView.resume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        barcodeView.pause()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        barcodeView.resume()
+    }
+
+    override fun onDestroyView() {
+        barcodeView.pauseAndWait()
+        super.onDestroyView()
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == CAMERA_REQUEST_CODE && grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
+            startScanning()
+        }
+    }
+
+    private fun handleBack() {
+        binding.toolbar.backClickListener = { nav().popBackStack() }
+        binding.backBtn.setOnClickListener { nav().popBackStack() }
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/settings/LanguageSettings.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/settings/LanguageSettings.kt
index 015e0d738..e166126d6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/settings/LanguageSettings.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/settings/LanguageSettings.kt
@@ -49,7 +49,7 @@ class LanguageSettings : BaseFragment(), View.OnClickListener {
     private fun createLangViews() {
         if (languages.isEmpty()) {
             languages =
-                ArrayList(Arrays.asList(*resources.getStringArray(R.array.ra_lang_codes)))
+                ArrayList(listOf(*resources.getStringArray(R.array.ra_lang_codes)))
             languages.add(0, null)
 
             val prefferedLang = LocaleManager.getInstance().languageSetting
diff --git a/mobile/src/main/res/drawable/icon_wifi.xml b/mobile/src/main/res/drawable/icon_wifi.xml
new file mode 100644
index 000000000..79f46f896
--- /dev/null
+++ b/mobile/src/main/res/drawable/icon_wifi.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="35dp"
+    android:viewportWidth="48"
+    android:viewportHeight="35">
+  <path
+      android:pathData="M10,17.6C13.953,14.307 18.935,12.504 24.08,12.504C29.225,12.504 34.207,14.307 38.16,17.6M2.84,10.5C8.685,5.348 16.208,2.505 24,2.505C31.791,2.505 39.315,5.348 45.16,10.5M17.06,24.72C19.09,23.278 21.519,22.503 24.01,22.503C26.5,22.503 28.929,23.278 30.96,24.72M24,32.5H24.02"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/qr_scan_border.xml b/mobile/src/main/res/drawable/qr_scan_border.xml
new file mode 100644
index 000000000..2ef2efe84
--- /dev/null
+++ b/mobile/src/main/res/drawable/qr_scan_border.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="10dp"
+        android:color="@color/calc_yellow_skin_yellow" />
+    <solid android:color="@android:color/white" />
+
+</shape>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/activity_peer_to_peer.xml b/mobile/src/main/res/layout/activity_peer_to_peer.xml
index 098bc4fc4..06985463c 100644
--- a/mobile/src/main/res/layout/activity_peer_to_peer.xml
+++ b/mobile/src/main/res/layout/activity_peer_to_peer.xml
@@ -9,35 +9,15 @@
     android:textDirection="locale"
     tools:context="org.horizontal.tella.mobile.views.fragment.peertopeer.activity.PeerToPeerActivity">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay"
-        app:layout_constraintBottom_toTopOf="@+id/my_nav_host_fragment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <org.hzontal.shared_ui.appbar.ToolbarComponent
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
-            app:startTitle="@string/nearby_sharing" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/my_nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appbar"
         app:navGraph="@navigation/peer_to_peer_graph" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
new file mode 100644
index 000000000..171c2009e
--- /dev/null
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+        app:startTitle="@string/wifi" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ImageView
+        android:id="@+id/deviceImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/icon_wifi"
+        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appbar"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/get_connected"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
+
+    <TextView
+        android:id="@+id/titleDescTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_small_margin"
+        android:gravity="start"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:text="@string/verify_sequence_match"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
+
+    <TextView
+        android:id="@+id/tipsTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:background="@drawable/bg_home_btn"
+        android:backgroundTint="@color/wa_white_8"
+        android:paddingVertical="@dimen/activity_horizontal_margin"
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:text="@string/tips_to_connect"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/titleDescTextView" />
+
+    <View
+        android:id="@+id/separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:background="@color/wa_white_20"
+        app:layout_constraintTop_toBottomOf="@id/tipsTextView" />
+
+    <org.hzontal.shared_ui.buttons.DualTextCheckView
+        android:id="@+id/currentWifiText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/separator"
+        app:leftText="@string/current_wifi_network" />
+
+    <org.hzontal.shared_ui.buttons.DualTextCheckView
+        android:id="@+id/currentWifi"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="12dp"
+        app:checkboxVisible="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/currentWifiText"
+        app:leftText="@string/same_wifi_text" />
+
+
+    <TextView
+        android:id="@+id/back_btn"
+        style="@style/Unlock_White_Text_Back"
+        android:text="@string/LockSelect_Action_Back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/next_btn"
+        style="@style/Unlock_White_Text_Next"
+        android:text="@string/LockSelect_Action_Confirm"
+        android:textColor="@color/wa_white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_qr_code.xml b/mobile/src/main/res/layout/fragment_qr_code.xml
new file mode 100644
index 000000000..26a86698e
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_qr_code.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:startTitle="@string/connect_to_device" />
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:gravity="center"
+        android:text="@string/qr_code_sender_instruction"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+
+    <ImageView
+        android:id="@+id/qrCodeImageView"
+        android:layout_width="240dp"
+        android:layout_height="240dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/qr_scan_border"
+        android:keepScreenOn="true"
+        android:padding="8dp"
+        app:cameraAudio="off"
+        app:cameraFacing="back"
+        app:cameraFlash="auto"
+        app:cameraMode="picture"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/titleTextView" />
+
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress_circular"
+        style="@style/Tella_Progress_Circular"
+        app:layout_constraintBottom_toBottomOf="@id/qrCodeImageView"
+        app:layout_constraintEnd_toEndOf="@id/qrCodeImageView"
+        app:layout_constraintStart_toStartOf="@id/qrCodeImageView"
+        app:layout_constraintTop_toTopOf="@id/qrCodeImageView" />
+
+    <!-- Troubleshooting Text -->
+    <TextView
+        android:id="@+id/helpTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:text="@string/qr_code_issue_prompt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeImageView" />
+
+    <!-- Manual Connection Button -->
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/connectManuallyButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:backgroundTint="@color/light_purple"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/helpTextView"
+        app:text="@string/connect_manually" />
+
+
+    <TextView
+        android:id="@+id/back_btn"
+        style="@style/Unlock_White_Text_Back"
+        android:text="@string/LockSelect_Action_Back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/fragment_vault.xml b/mobile/src/main/res/layout/fragment_vault.xml
index e8e67a2d3..327e0c814 100644
--- a/mobile/src/main/res/layout/fragment_vault.xml
+++ b/mobile/src/main/res/layout/fragment_vault.xml
@@ -5,6 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/space_cadet"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root"
     >
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/mobile/src/main/res/layout/peer_to_peer_layout.xml b/mobile/src/main/res/layout/peer_to_peer_layout.xml
new file mode 100644
index 000000000..8acbe4630
--- /dev/null
+++ b/mobile/src/main/res/layout/peer_to_peer_layout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root"
+    >
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/scan_qrcode_fragment.xml b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
new file mode 100644
index 000000000..8e7336bcf
--- /dev/null
+++ b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:startTitle="@string/connect_to_device" />
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:gravity="center"
+        android:text="@string/qr_code_scan_instruction"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+
+    <com.journeyapps.barcodescanner.CompoundBarcodeView
+        android:id="@+id/qrCodeScanView"
+        android:layout_width="240dp"
+        android:layout_height="240dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/qr_scan_border"
+        android:keepScreenOn="true"
+        android:padding="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/titleTextView" />
+
+
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress_circular"
+        style="@style/Tella_Progress_Circular"
+        app:layout_constraintBottom_toBottomOf="@id/qrCodeScanView"
+        app:layout_constraintEnd_toEndOf="@id/qrCodeScanView"
+        app:layout_constraintStart_toStartOf="@id/qrCodeScanView"
+        app:layout_constraintTop_toTopOf="@id/qrCodeScanView" />
+
+    <!-- Troubleshooting Text -->
+    <TextView
+        android:id="@+id/helpTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:text="@string/qr_code_issue_prompt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/qrCodeScanView" />
+
+    <!-- Manual Connection Button -->
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/connectManuallyButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:backgroundTint="@color/light_purple"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/helpTextView"
+        app:text="@string/connect_manually" />
+
+
+    <TextView
+        android:id="@+id/back_btn"
+        style="@style/Unlock_White_Text_Back"
+        android:text="@string/LockSelect_Action_Back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
new file mode 100644
index 000000000..f850f652d
--- /dev/null
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_close_white"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:startTitle="@string/connect_to_device" />
+
+
+    <ImageView
+        android:id="@+id/deviceImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/device"
+        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/show_device_information"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
+
+    <TextView
+        android:id="@+id/titleDescTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/device_connection_instructions"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@+id/connectCode"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
+
+    <org.hzontal.shared_ui.buttons.DualTextCheckView
+        android:id="@+id/connectCode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintBottom_toTopOf="@+id/pin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/titleDescTextView"
+        app:leftText="@string/connect_code" />
+
+    <org.hzontal.shared_ui.buttons.DualTextCheckView
+        android:id="@+id/pin"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/port"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/connectCode"
+        app:leftText="@string/connect_code" />
+
+    <org.hzontal.shared_ui.buttons.DualTextCheckView
+        android:id="@+id/port"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/back_btn"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/pin"
+        app:leftText="@string/connect_code" />
+
+    <TextView
+        android:id="@+id/back_btn"
+        style="@style/Unlock_White_Text_Back"
+        android:text="@string/LockSelect_Action_Back"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
index 9de4a3bf7..24a6169f6 100644
--- a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
+++ b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/dark_purple">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <org.hzontal.shared_ui.appbar.ToolbarComponent
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+            app:startTitle="@string/nearby_sharing" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView
         android:id="@+id/setupImgV"
@@ -17,24 +35,24 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appbar"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
         android:id="@+id/shareFilesTitleTv"
-        style="@style/Tella_Main_White_Text.Bold"
+        style="@style/Tella_Main_White_Text.Meduim"
         android:layout_marginBottom="12dp"
         android:text="@string/how_it_works"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@+id/shareFilesDescriptionTv"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/shareFilesDescriptionTv"
-        style="@style/Tella_Main_White_Text.Bold"
-        android:layout_marginTop="@dimen/lock_subtitle_desc_margin_top"
-        android:padding="24dp"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
         android:text="@string/share_files_description"
         android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/sendFilesBtn"
@@ -48,9 +66,10 @@
         android:layout_width="match_parent"
         android:layout_height="54dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/lock_subtitle_desc_margin_top"
         app:check_state="false"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/shareFilesDescriptionTv"
         app:text="@string/send_files" />
@@ -63,8 +82,10 @@
         android:layout_marginTop="12dp"
         android:gravity="center"
         app:check_state="false"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintTop_toBottomOf="@+id/sendFilesBtn"
-        app:text="@string/receive_files" />
+        app:text="@string/receive_files"
+        tools:layout_editor_absoluteX="24dp" />
 
     <TextView
         android:id="@+id/learn_more_textView"
@@ -77,6 +98,7 @@
         android:textColor="@color/wa_yellow"
         android:textSize="11sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/receiveFilesBtn" />
 
diff --git a/mobile/src/main/res/layout/verification_info_fragment.xml b/mobile/src/main/res/layout/verification_info_fragment.xml
new file mode 100644
index 000000000..a8c269056
--- /dev/null
+++ b/mobile/src/main/res/layout/verification_info_fragment.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_close_white"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:startTitle="@string/connect_manually" />
+
+
+    <ImageView
+        android:id="@+id/deviceImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/device"
+        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/verification"
+        android:textColor="@android:color/white"
+        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
+
+    <TextView
+        android:id="@+id/titleDescTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_small_margin"
+        android:gravity="start"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:text="@string/verify_sequence_match"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
+
+    <org.hzontal.shared_ui.buttons.InformationButton
+        android:id="@+id/sequenceTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/titleDescTextView" />
+
+    <TextView
+        android:id="@+id/sequenceDescTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:gravity="start"
+        android:text="@string/sequence_mismatch_warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sequenceTextView" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/connect_btn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:background="@drawable/bg_round_orange_btn"
+        app:check_state="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sequenceDescTextView"
+        app:text="@string/confirm_and_connect"
+        app:text_color="@color/btn_dark_letter"
+        app:text_all_caps="true"
+        />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/discard_btn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/connect_btn"
+        app:text="@string/discard_and_start_over"
+        app:text_all_caps="true"
+        />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index df4dd7c20..ed48fc285 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -8,6 +8,40 @@
     <fragment
         android:id="@+id/startNearBySharingFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.StartNearBySharingFragment"
-        tools:layout="@layout/start_near_by_sharing_fragment"
-        android:label="StartNearBySharingFragment" />
+        android:label="StartNearBySharingFragment"
+        tools:layout="@layout/start_near_by_sharing_fragment">
+        <action
+            android:id="@+id/action_startNearBySharingFragment_to_connectHotspotFragment"
+            app:destination="@id/connectHotspotScreen" />
+
+        <action
+            android:id="@+id/action_startNearBySharingFragment_to_scanQrCodeScreen"
+            app:destination="@id/scanQrCodeScreen" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/connectHotspotScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ConnectHotspotFragment"
+        android:label="ConnectHotspotFragment"
+        tools:layout="@layout/connect_hotspot_layout" >
+
+        <action
+            android:id="@+id/action_connectHotspotScreen_to_qrCodeScreen"
+            app:destination="@id/qrCodeScreen" />
+
+    </fragment>
+
+    <fragment
+        android:id="@+id/scanQrCodeScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.ScanQrCodeFragment"
+        android:label="ScanQrCodeScreen"
+        tools:layout="@layout/scan_qrcode_fragment" />
+
+    <fragment
+        android:id="@+id/qrCodeScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.QRCodeFragment"
+        android:label="QrCodeScreen"
+        tools:layout="@layout/fragment_qr_code" >
+
+    </fragment>
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 8132cdc06..fbc7fb6db 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1003,6 +1003,29 @@ Would you like to share analytics with the Tella team?</string>
   <string name="delete_report">Delete report?</string>
   <string name="report_submitted_msg">Your report have successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
+    <string name="connect_to_device">Connect to device</string>
+  <string name="qr_code_sender_instruction">Show this QR code for the sender to scan</string>
+  <string name="qr_code_scan_instruction">Scan the recipient’s QR code</string>
+  <string name="qr_code_issue_prompt">Having trouble with the QR code?</string>
+  <string name="connect_manually">Connect manually</string>
+  <string name="show_device_information">Show your device information </string>
+  <string name="device_connection_instructions">The sender needs to input the following to\n connect to your device.</string>
+  <string name="connect_code">Connect code</string>
+  <string name="pin">PIN</string>
+  <string name="port">Port</string>
+  <string name="verification">Verification</string>
+  <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
+  <string name="sequence_mismatch_warning">If the sequence on your device does not match the sequence on the sender’s device, the connection may not be secure and should be discarded.</string>
+  <string name="confirm_and_connect">Confirm and connect</string>
+  <string name="discard_and_start_over">Discard and start over</string>
+  <string name="wifi">Wi-Fi</string>
+  <string name="get_connected">Get connected</string>
+  <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
+  <string name="tips_to_connect">Tips to connect\n1. The Wi-Fi network does not need to be \nconnected to the internet.\n2.
+You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
+3. Disable any VPN connections.</string>
+  <string name="current_wifi_network">Current Wifi network</string>
+  <string name="same_wifi_text">Yes, we are on the same Wi-Fi network</string>
     <string name="NearBySharing">Nearby sharing</string>
   <string name="share_files_description">
     Share files with nearby devices without an Internet connection\n  1. Both devices must be connected to the same Wifi network\n  2. Make sure you trust the person you are sharing files with
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/DualTextCheckView.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/DualTextCheckView.kt
new file mode 100644
index 000000000..9dfd63788
--- /dev/null
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/DualTextCheckView.kt
@@ -0,0 +1,90 @@
+package org.hzontal.shared_ui.buttons
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.annotation.StringRes
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import org.hzontal.shared_ui.R
+import org.hzontal.shared_ui.databinding.DualTextCheckLayoutBinding
+
+class DualTextCheckView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    @StringRes
+    private var rightTextRes: Int = -1
+
+    @StringRes
+    private var leftTextRes: Int = -1
+
+    private var isCheckboxVisible: Boolean = false
+
+
+    private val binding: DualTextCheckLayoutBinding =
+        DualTextCheckLayoutBinding.inflate(LayoutInflater.from(context), this, true)
+
+    private var onCheckedChangeListener: ((Boolean) -> Unit)? = null
+
+    fun setOnCheckedChangeListener(listener: (Boolean) -> Unit) {
+        this.onCheckedChangeListener = listener
+    }
+
+
+    init {
+        initListeners()
+        extractAttributes(attrs, defStyleAttr)
+    }
+
+    private fun extractAttributes(attrs: AttributeSet?, defStyleAttr: Int) {
+        attrs?.let {
+            val typedArray = context.obtainStyledAttributes(
+                attrs, R.styleable.DualTextCheckView, defStyleAttr, defStyleAttr
+            )
+
+            try {
+                rightTextRes = typedArray.getResourceId(R.styleable.DualTextCheckView_rightText, -1)
+                leftTextRes = typedArray.getResourceId(R.styleable.DualTextCheckView_leftText, -1)
+                isCheckboxVisible =
+                    typedArray.getBoolean(R.styleable.DualTextCheckView_checkboxVisible, false)
+
+            } finally {
+                typedArray.recycle()
+            }
+        }
+        bindView()
+    }
+
+    private fun bindView() {
+        if (rightTextRes != -1) {
+            binding.rightTextView.setText(rightTextRes)
+        }
+        if (leftTextRes != -1) {
+            binding.leftTextView.setText(leftTextRes)
+        }
+        binding.checkBox.isVisible = isCheckboxVisible
+    }
+
+
+    private fun initListeners() {
+        binding.checkBox.setOnCheckedChangeListener { _, isChecked ->
+            onCheckedChangeListener?.invoke(isChecked)
+        }
+    }
+
+    fun setRightText(text : String?){
+        if (text != null){
+            binding.rightTextView.text = text
+        }
+    }
+
+    // New method: Enable/Disable Checkbox
+    fun setCheckboxEnabled(isEnabled: Boolean) {
+        binding.checkBox.isEnabled = isEnabled
+        binding.rightTextView.isEnabled = isEnabled
+        binding.leftTextView.isEnabled = isEnabled
+        alpha = if (isEnabled) 1f else 0.5f // visually indicate disabled state
+    }
+
+}
\ No newline at end of file
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
index 2669a16e9..075bc0200 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
@@ -15,15 +15,14 @@ import org.hzontal.shared_ui.R
 import org.hzontal.shared_ui.databinding.LayoutRoundButtonBinding
 
 class RoundButton @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), Checkable {
 
     @StringRes
     private var text: Int = -1
     private var tintColor: Int = -1
     private var textColor: Int = -1
+    private var isTextAllCaps = false
     private val binding: LayoutRoundButtonBinding =
         LayoutRoundButtonBinding.inflate(LayoutInflater.from(context), this, true)
     private var mChecked = false
@@ -42,12 +41,8 @@ class RoundButton @JvmOverloads constructor(
 
     private fun extractAttributes(attrs: AttributeSet?, defStyleAttr: Int) {
         attrs?.let {
-            val typedArray = context
-                .obtainStyledAttributes(
-                    attrs,
-                    R.styleable.RoundButton,
-                    defStyleAttr,
-                    defStyleAttr
+            val typedArray = context.obtainStyledAttributes(
+                    attrs, R.styleable.RoundButton, defStyleAttr, defStyleAttr
                 )
 
             try {
@@ -55,6 +50,7 @@ class RoundButton @JvmOverloads constructor(
                 mChecked = typedArray.getBoolean(R.styleable.RoundButton_check_state, false)
                 tintColor = typedArray.getColor(R.styleable.RoundButton_tint_color, -1)
                 textColor = typedArray.getColor(R.styleable.RoundButton_text_color, -1)
+                isTextAllCaps = typedArray.getBoolean(R.styleable.RoundButton_text_all_caps, false)
                 isChecked = mChecked
 
             } finally {
@@ -77,6 +73,7 @@ class RoundButton @JvmOverloads constructor(
     private fun bindView() {
         setTextAndVisibility(text, binding.sheetTextView)
         setBackgroundTintColor(tintColor)
+        setTextCaps(isTextAllCaps)
     }
 
     private fun setTextAndVisibility(text: Int, textView: TextView) {
@@ -86,7 +83,7 @@ class RoundButton @JvmOverloads constructor(
         }
     }
 
-     fun setBackgroundTintColor(tintColor: Int) {
+    private fun setBackgroundTintColor(tintColor: Int) {
         if (tintColor != -1) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 binding.sheetTextView.backgroundTintList = ColorStateList.valueOf(tintColor)
@@ -124,11 +121,15 @@ class RoundButton @JvmOverloads constructor(
 
     private fun refreshLayoutState() {
         super.refreshDrawableState()
-        binding.sheetTextView.background = if (mChecked)
-            ContextCompat.getDrawable(context, R.drawable.bg_information_button_selected)
-        else
-            ContextCompat.getDrawable(context, R.drawable.bg_information_button)
+        binding.sheetTextView.background = if (mChecked) ContextCompat.getDrawable(
+            context,
+            R.drawable.bg_information_button_selected
+        )
+        else ContextCompat.getDrawable(context, R.drawable.bg_information_button)
     }
 
+    private fun setTextCaps(isTextAllCaps: Boolean) {
+        binding.sheetTextView.isAllCaps = isTextAllCaps
+    }
 
 }
\ No newline at end of file
diff --git a/shared-ui/src/main/res/drawable/bg_dual_text_check.xml b/shared-ui/src/main/res/drawable/bg_dual_text_check.xml
new file mode 100644
index 000000000..9cca8653f
--- /dev/null
+++ b/shared-ui/src/main/res/drawable/bg_dual_text_check.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+    <solid
+        android:color="#14FFFFFF"
+        >
+    </solid>
+    <corners
+        android:radius="10dp"
+        >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/shared-ui/src/main/res/drawable/device.xml b/shared-ui/src/main/res/drawable/device.xml
new file mode 100644
index 000000000..236bd69e3
--- /dev/null
+++ b/shared-ui/src/main/res/drawable/device.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M80.23,30.07C82,29.35 83.18,28.75 85.07,29.65C89.95,32.01 86.76,38.88 90.09,42.57C90.55,43.07 91.14,43.33 91.58,43.8C94.82,47.27 97.62,58.35 97.92,63.12C98.33,69.83 96.1,75.75 97.3,82.6C97.64,84.55 98.38,86.92 99.05,88.79C99.87,91.08 101.13,93.11 102,95.36C100.32,99.06 98.17,93.69 97.43,92.01C95.54,87.74 93.73,80.95 94.07,76.3C94.39,71.87 95.52,67.48 95.19,62.9C94.93,59.16 92.36,48.87 89.97,46.09C89.2,45.19 88.34,44.85 87.57,43.73C85.27,40.36 85.98,38.03 85.43,34.51C85.3,33.65 84.27,31.92 83.29,31.91C81.22,31.88 79.89,34.37 79.28,36.05C77.78,40.14 78.34,44.4 80.41,48.17C80.95,49.15 82.7,51.11 82.74,52C82.8,53.51 81.14,53.77 80.23,52.79V84.02C80.23,86.62 76.36,90.95 73.76,90.95H48.7C49.39,94.41 52.29,97.26 55.16,99.13C59.97,102.28 64.14,103.97 66.95,109.58C67.64,110.95 69.55,116.66 66.75,116.39C65.01,116.22 65.61,113.55 65.14,112.08C62.74,104.66 53.52,102.74 48.92,97.2C47.39,95.36 46.51,93.29 45.76,91.06C40.83,90.51 36.1,92.37 32.6,87.88C29.58,84.02 31.68,77.39 30.89,72.78C27.42,70.69 21.56,70.16 22.22,64.77C22.58,61.78 24.79,60.19 27.6,59.72C25.12,58.52 22.41,57.84 21.59,54.84C20.67,51.52 23.02,47.16 26.69,47.11L24.77,45.97C19.44,41.63 24.59,32.94 31,35.75C30.97,35.31 31.16,34.55 30.78,34.27C30.59,34.13 28.63,33.45 28.05,33.14C25.9,32.02 20.26,29.35 19.02,27.65C17.15,25.06 18.01,21.5 20.34,19.51C24.27,16.15 27.24,19.55 31,20.99V11.56C31,8.78 35.39,5.12 38.17,5.11C49.28,5.72 61.42,4.21 72.41,5.08C75.9,5.35 80.23,8.47 80.23,12.24V30.07H80.23ZM33.73,73.69V77.32H77.51V48.13C77.51,47.99 76.61,46.18 76.44,45.57C75.16,41.03 75.86,37.44 77.52,33.15C76.96,26.59 78.23,18.88 77.51,12.47C77.24,10.09 75.17,8.13 72.84,7.83C72.07,7.73 67.27,7.68 66.77,7.85C65.8,8.18 65.29,14.59 63.06,15.26C58.48,15.03 53.31,15.73 48.8,15.32C45.82,15.04 45.71,10.01 44.58,7.84C40.37,7.8 34.81,6.82 33.73,12.24L33.72,36.96C36.03,38.34 40.09,39.06 41.63,41.35C44.06,44.96 41.65,50.31 37.36,50.74L39.63,52.21C43.6,56.1 40.41,63.14 34.86,62.56L38.02,64.28C42.07,67.57 38.9,74.58 33.73,73.68L33.73,73.69ZM63.67,7.81H47.57C47.61,8.62 48.73,12.58 49.3,12.77H62.05L63.67,7.81H63.67ZM31.01,31.43V24.28C29.34,23.4 25.64,20.77 23.86,20.79C20.83,20.84 19.51,25.38 22.17,26.99L31.01,31.43ZM27.54,38.07C25.01,38.6 24.45,42.47 26.71,44.03C27.61,44.65 35.46,48.06 36.4,48.2C39.44,48.64 41.33,43.87 38.48,42.01C37.34,41.26 30.26,38.19 29.06,38.04C28.56,37.98 28.03,37.97 27.54,38.07ZM26.87,49.65C25.91,49.76 24.84,50.66 24.42,51.52C23.42,53.6 24.29,55.16 26.16,56.17C27.41,56.84 33.44,59.56 34.57,59.77C38.44,60.51 40.22,55.8 37.34,53.82C35.98,52.88 32.01,51.28 30.32,50.63C29.44,50.3 27.74,49.55 26.87,49.65V49.65ZM25.64,63.31C24.46,64.49 24.54,66.52 25.94,67.51C26.63,68 33.63,71.05 34.36,71.15C36.69,71.45 38.44,67.59 35.85,66C34.88,65.39 28.85,62.75 27.89,62.61C27.04,62.48 26.25,62.71 25.64,63.31L25.64,63.31ZM77.51,79.82H33.5V83.57C33.5,83.7 34.02,85.18 34.14,85.42C35.13,87.47 37.11,88.29 39.28,88.46C49.85,89.29 61.49,87.82 72.17,88.44C74.08,88.59 77.51,86.18 77.51,84.25V79.82V79.82Z"
+      android:fillColor="#FAFAFB"/>
+  <path
+      android:pathData="M51.12,27.81C54.23,26.52 55.35,28.74 51.78,29.44C51.49,29.84 54.07,31.86 52.23,32.35C51.44,32.56 50.91,31.05 50.34,30.6C49.77,31.16 49.23,32.95 48.17,32.23C47.08,31.49 49.17,29.81 48.9,29.44C45.58,28.83 46.5,26.47 49.57,27.81C49.12,24.46 51.67,24.2 51.12,27.81H51.12Z"
+      android:fillColor="#CD8F41"/>
+  <path
+      android:pathData="M42.79,27.81C45.92,26.46 46.83,28.84 43.46,29.44C43.27,29.7 45.88,32.25 43.8,32.23C42.84,32.22 42.64,31.14 42,30.6C41.42,31.16 40.87,32.95 39.79,32.23C38.66,31.47 40.87,29.91 40.54,29.44C37.16,28.83 38.09,26.47 41.21,27.81C40.76,24.46 43.35,24.2 42.79,27.81V27.81Z"
+      android:fillColor="#CD8F41"/>
+  <path
+      android:pathData="M59.59,27.82C62.73,26.47 63.63,28.85 60.26,29.44C60.04,29.75 62.01,31.63 61.14,32.19C60.03,32.91 59.05,30.6 58.8,30.6C58.13,31.04 57.94,32.51 57.04,32.39C54.99,32.13 57.59,29.79 57.34,29.44C53.96,28.84 54.89,26.47 58.01,27.82C57.56,24.46 60.15,24.2 59.59,27.82H59.59Z"
+      android:fillColor="#CD8F41"/>
+  <path
+      android:pathData="M67.99,27.76C71.13,26.4 72.03,28.8 68.66,29.41C68.44,29.72 70.41,31.63 69.53,32.19C68.2,33.03 67.49,30.59 67.2,30.58C66.62,31.09 65.78,33.17 64.83,32.1C64.07,31.24 66.03,29.82 65.74,29.41C62.36,28.8 63.29,26.4 66.41,27.77C66.55,26.87 65.91,25.11 67.21,25.2C68.3,25.28 67.95,26.99 67.99,27.77L67.99,27.76Z"
+      android:fillColor="#CD8F41"/>
+  <path
+      android:pathData="M51.33,80.58C52.41,80.32 56.99,80.39 58.25,80.52C62.14,80.92 62.17,86.94 58.45,87.48C57.23,87.66 52.25,87.67 51.23,87.31C48.32,86.29 48.7,81.22 51.33,80.58V80.58ZM52.21,83.27C51.65,83.51 51.83,84.76 52.21,84.76H58.23C58.69,84.76 58.69,83.27 58.23,83.27H52.21Z"
+      android:fillColor="#FAFAFB"/>
+</vector>
diff --git a/shared-ui/src/main/res/layout-hdpi/information_button.xml b/shared-ui/src/main/res/layout-hdpi/information_button.xml
index b4b9ef84f..f06c44ca4 100644
--- a/shared-ui/src/main/res/layout-hdpi/information_button.xml
+++ b/shared-ui/src/main/res/layout-hdpi/information_button.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="70dp"
-    >
+    android:layout_height="70dp">
 
 
     <ImageView
diff --git a/shared-ui/src/main/res/layout-xhdpi/information_button.xml b/shared-ui/src/main/res/layout-xhdpi/information_button.xml
index 9dde81e5e..f05ad9102 100644
--- a/shared-ui/src/main/res/layout-xhdpi/information_button.xml
+++ b/shared-ui/src/main/res/layout-xhdpi/information_button.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
-    >
+    android:layout_height="80dp">
 
 
     <ImageView
diff --git a/shared-ui/src/main/res/layout/dual_text_check_layout.xml b/shared-ui/src/main/res/layout/dual_text_check_layout.xml
new file mode 100644
index 000000000..6e4b2009f
--- /dev/null
+++ b/shared-ui/src/main/res/layout/dual_text_check_layout.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_dual_text_check"
+    android:padding="@dimen/activity_horizontal_margin">
+
+    <TextView
+        android:id="@+id/leftTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:ellipsize="end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/rightBarrier"
+        tools:text="Current Wifi network" />
+
+    <TextView
+        android:id="@+id/rightTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="2"
+        android:ellipsize="end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/checkBox"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Right side text" />
+
+    <CheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"
+        android:background="@drawable/checkbox_background"
+        app:buttonTint="@color/radio_buttons_color" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/rightBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="start"
+        app:constraint_referenced_ids="rightTextView,checkBox" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/shared-ui/src/main/res/values/attrs.xml b/shared-ui/src/main/res/values/attrs.xml
index 7eec7c766..6cbaa3a85 100644
--- a/shared-ui/src/main/res/values/attrs.xml
+++ b/shared-ui/src/main/res/values/attrs.xml
@@ -14,11 +14,18 @@
         <attr name="rightImg" format="reference" />
     </declare-styleable>
 
+    <declare-styleable name="DualTextCheckView">
+        <attr name="rightText" format="reference|string"/>
+        <attr name="leftText" format="reference|string"/>
+        <attr name="checkboxVisible" format="boolean"/>
+    </declare-styleable>
+
     <declare-styleable name="RoundButton">
         <attr name="text" format="reference|string" />
         <attr name="check_state" format="boolean" />
         <attr name="tint_color" format="color|reference" />
         <attr name="text_color" format="color|reference" />
+        <attr name="text_all_caps" format="boolean"/>
     </declare-styleable>
 
 
diff --git a/shared-ui/src/main/res/values/styles.xml b/shared-ui/src/main/res/values/styles.xml
index f024c9024..71302242b 100644
--- a/shared-ui/src/main/res/values/styles.xml
+++ b/shared-ui/src/main/res/values/styles.xml
@@ -67,6 +67,10 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="Tella_Main_White_TextExtraLargeBold" parent="Tella_Main_White_Text.Bold">
+        <item name="android:textSize">18sp</item>
+    </style>
+
     <style name="Tella_Main_White_TextLargeBold" parent="Tella_Main_White_Text.Bold">
         <item name="android:textSize">16sp</item>
     </style>
diff --git a/tella-keys/build.gradle b/tella-keys/build.gradle
index 0e52237c9..61c935303 100644
--- a/tella-keys/build.gradle
+++ b/tella-keys/build.gradle
@@ -37,6 +37,11 @@ dependencies {
     api "androidx.core:core-ktx:$versions.ktx"
     api "androidx.biometric:biometric:$versions.biometric"
 
+    //bouncycastle
+    api 'org.bouncycastle:bcprov-jdk18on:1.78'
+    api 'org.bouncycastle:bcpkix-jdk18on:1.78'
+
+
     testImplementation "junit:junit:$versions.junit"
     androidTestImplementation "androidx.test.ext:junit:$versions.testJunit"
     androidTestImplementation "androidx.test.espresso:espresso-core:$versions.espressoCore"
diff --git a/tella-keys/src/main/java/org/hzontal/tella/keys/key/LifecycleMainKey.java b/tella-keys/src/main/java/org/hzontal/tella/keys/key/LifecycleMainKey.java
index 8bc8db318..c771aae36 100644
--- a/tella-keys/src/main/java/org/hzontal/tella/keys/key/LifecycleMainKey.java
+++ b/tella-keys/src/main/java/org/hzontal/tella/keys/key/LifecycleMainKey.java
@@ -1,7 +1,5 @@
 package org.hzontal.tella.keys.key;
 
-import android.content.Context;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -11,8 +9,6 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 
-import org.hzontal.tella.keys.util.Preferences;
-
 import timber.log.Timber;
 
 /**

From 3302904259be775c133f9231810f6459b0233660 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 22 May 2025 22:04:08 +0100
Subject: [PATCH 003/153] show connect manual informations

---
 .../tella/mobile/util/NavigationManager.kt    |  5 ++++-
 .../receipentflow/QRCodeFragment.kt           | 20 +++++++++++++++++--
 .../receipentflow/ShowDeviceInfoFragment.kt   | 18 ++++++++++++++++-
 .../fragment/vault/home/HomeVaultFragment.kt  |  1 -
 .../res/layout/show_device_info_layout.xml    |  4 ++--
 .../res/navigation/peer_to_peer_graph.xml     | 16 +++++++++++----
 6 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 0c987252e..b3349874b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -2,7 +2,6 @@ package org.horizontal.tella.mobile.util
 
 import android.os.Bundle
 import org.horizontal.tella.mobile.R
-import org.horizontal.tella.mobile.domain.entity.uwazi.UwaziTemplate
 import org.horizontal.tella.mobile.views.fragment.reports.di.NavControllerProvider
 
 class NavigationManager(
@@ -182,4 +181,8 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_startNearBySharingFragment_to_scanQrCodeScreen)
     }
 
+    fun navigateFromScanQrCodeToDeviceInfo() {
+        navigateToWithBundle(R.id.action_qrCodeScreen_to_deviceInfoScreen)
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 229783d68..a0efe6c9a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -23,6 +23,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var server: TellaServer? = null
+    private var payload: PeerConnectionPayload? = null
+    private lateinit var qrPayload: String
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -32,6 +34,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
             setupServerAndQr(ip)
         }
         handleBack()
+        handleConnectManually()
     }
 
     private fun setupServerAndQr(ip: String) {
@@ -50,14 +53,14 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val pin = "111111"
         val port = port
 
-        val payload = PeerConnectionPayload(
+        payload = PeerConnectionPayload(
             connectCode = ip,
             port = port,
             certificateHash = certHash,
             pin = pin
         )
 
-        val qrPayload = Gson().toJson(payload)
+        qrPayload = Gson().toJson(payload)
         generateQrCode(qrPayload)
     }
 
@@ -82,6 +85,19 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         binding.backBtn.setOnClickListener { nav().popBackStack() }
     }
 
+    private fun handleConnectManually(){
+        binding.connectManuallyButton.setOnClickListener {
+            connectManually()
+        }
+    }
+
+    private fun connectManually() {
+        payload?.let {
+            bundle.putString("payload", qrPayload)
+            navManager().navigateFromScanQrCodeToDeviceInfo()
+        }
+    }
+
     // TODO NEXT STEPS
     //TODO  WORK ON THE SENDER RESPONER
     // TODO PREAPRE REGISTER RESPONE
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 698da492d..8f92adae6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -2,14 +2,30 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
+import com.google.gson.Gson
 import org.horizontal.tella.mobile.databinding.ShowDeviceInfoLayoutBinding
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 
-class ShowDeviceInfoFragment : BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
+class ShowDeviceInfoFragment :
+    BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
+
+
+    private var payload: PeerConnectionPayload? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        arguments?.getString("payload")?.let { payloadJson ->
+            payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
+        }
         initListeners()
+        initView()
+    }
+
+    private fun initView() {
+        binding.connectCode.setRightText(payload?.connectCode)
+        binding.pin.setRightText(payload?.pin)
+        binding.port.setRightText(payload?.port.toString())
     }
 
     private fun initListeners() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
index 7e6d9e0e8..d7c26aac6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
@@ -98,7 +98,6 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
     private var googleDriveServers: ArrayList<GoogleDriveServer>? = null
     private var dropBoxServers: ArrayList<DropBoxServer>? = null
     private var nextCloudServers: ArrayList<NextCloudServer>? = null
-    private var favoriteForms: ArrayList<CollectForm>? = null
     private lateinit var disposables: EventCompositeDisposable
     private var reportServersCounted = false
     private var collectServersCounted = false
diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index f850f652d..dd1f8829b 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -87,7 +87,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/connectCode"
-        app:leftText="@string/connect_code" />
+        app:leftText="@string/pin" />
 
     <org.hzontal.shared_ui.buttons.DualTextCheckView
         android:id="@+id/port"
@@ -100,7 +100,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/pin"
-        app:leftText="@string/connect_code" />
+        app:leftText="@string/port" />
 
     <TextView
         android:id="@+id/back_btn"
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index ed48fc285..c0b30782b 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -23,7 +23,7 @@
         android:id="@+id/connectHotspotScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ConnectHotspotFragment"
         android:label="ConnectHotspotFragment"
-        tools:layout="@layout/connect_hotspot_layout" >
+        tools:layout="@layout/connect_hotspot_layout">
 
         <action
             android:id="@+id/action_connectHotspotScreen_to_qrCodeScreen"
@@ -35,13 +35,21 @@
         android:id="@+id/scanQrCodeScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.ScanQrCodeFragment"
         android:label="ScanQrCodeScreen"
-        tools:layout="@layout/scan_qrcode_fragment" />
+        tools:layout="@layout/scan_qrcode_fragment"/>
 
     <fragment
         android:id="@+id/qrCodeScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.QRCodeFragment"
         android:label="QrCodeScreen"
-        tools:layout="@layout/fragment_qr_code" >
-
+        tools:layout="@layout/fragment_qr_code">
+        <action
+            android:id="@+id/action_qrCodeScreen_to_deviceInfoScreen"
+            app:destination="@id/deviceInfoScreen" />
     </fragment>
+
+    <fragment
+        android:id="@+id/deviceInfoScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ShowDeviceInfoFragment"
+        android:label="DeviceInfoScreen"
+        tools:layout="@layout/show_device_info_layout" />
 </navigation>
\ No newline at end of file

From bd15467a2934b590d17c9ef79a125eff13a3d592 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 23 May 2025 14:48:33 +0100
Subject: [PATCH 004/153] Finish sender manual connection design

---
 mobile/src/main/AndroidManifest.xml           |   8 +-
 .../tella/mobile/util/NavigationManager.kt    |   3 +
 .../views/base_ui/BaseBindingFragment.kt      |   1 -
 .../receipentflow/ShowDeviceInfoFragment.kt   |   1 -
 .../senderflow/ScanQrCodeFragment.kt          |   7 +
 .../SenderManualConnectionFragment.kt         |  70 ++++++++
 .../res/layout/sender_manual_connection.xml   | 163 ++++++++++++++++++
 .../res/layout/show_device_info_layout.xml    |   4 +-
 .../res/navigation/peer_to_peer_graph.xml     |  12 +-
 mobile/src/main/res/values/strings.xml        |   1 +
 10 files changed, 260 insertions(+), 10 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
 create mode 100644 mobile/src/main/res/layout/sender_manual_connection.xml

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 428d36e0d..37ad47641 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -662,10 +662,7 @@
             android:name=".views.dialog.nextcloud.NextCloudLoginFlowActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".views.fragment.peertopeer.activity.PeerToPeerActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar" />
+
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
@@ -704,7 +701,8 @@
         <activity
             android:name=".views.fragment.peertopeer.activity.PeerToPeerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
 
     </application>
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index b3349874b..698219654 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -185,4 +185,7 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_qrCodeScreen_to_deviceInfoScreen)
     }
 
+    fun navigateFromScanQrCodeToSenderManualConnectionScreen() {
+        navigateToWithBundle(R.id.action_scanQrCodeScreen_to_senderManualConnectionScreen)
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
index f5f0647bc..a8c39c889 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
@@ -96,5 +96,4 @@ abstract class BaseBindingFragment<VB : ViewBinding>(
         _binding = null
         isViewInitialized = false
     }
-
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 8f92adae6..354b39ac7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -10,7 +10,6 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 class ShowDeviceInfoFragment :
     BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
 
-
     private var payload: PeerConnectionPayload? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 64a36f774..82d6d66cb 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -46,6 +46,7 @@ class ScanQrCodeFragment :
             }
         }
         handleBack()
+        initListeners()
     }
 
     private fun startScanning() {
@@ -108,4 +109,10 @@ class ScanQrCodeFragment :
         binding.toolbar.backClickListener = { nav().popBackStack() }
         binding.backBtn.setOnClickListener { nav().popBackStack() }
     }
+
+    private fun initListeners() {
+        binding.connectManuallyButton.setOnClickListener {
+            navManager().navigateFromScanQrCodeToSenderManualConnectionScreen()
+        }
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
new file mode 100644
index 000000000..9a166d6ef
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -0,0 +1,70 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.activityViewModels
+import com.hzontal.tella_locking_ui.common.extensions.onChange
+import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
+
+class SenderManualConnectionFragment :
+    BaseBindingFragment<SenderManualConnectionBinding>(SenderManualConnectionBinding::inflate) {
+
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initListeners()
+        initView()
+    }
+
+    private fun initView() {
+        binding.connectCode.onChange {
+            updateNextButtonState()
+        }
+        binding.port.onChange {
+            updateNextButtonState()
+        }
+
+        binding.port.onChange {
+            updateNextButtonState()
+        }
+
+        updateNextButtonState()
+
+        KeyboardUtil(binding.root)
+
+    }
+
+    private fun initListeners() {
+        binding.backBtn.setOnClickListener {
+            nav().popBackStack()
+        }
+
+        binding.nextBtn.setOnClickListener {
+
+        }
+    }
+
+    private fun isInputValid(): Boolean {
+        return binding.connectCode.text?.isNotBlank() == true &&
+                binding.pin.text?.isNotBlank() == true &&
+                binding.port.text?.isNotBlank() == true
+    }
+
+    private fun updateNextButtonState() {
+        val enabled = isInputValid()
+        binding.nextBtn.isEnabled = enabled
+        binding.nextBtn.setTextColor(
+            ContextCompat.getColor(
+                baseActivity,
+                if (enabled) android.R.color.white else android.R.color.darker_gray
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/sender_manual_connection.xml b/mobile/src/main/res/layout/sender_manual_connection.xml
new file mode 100644
index 000000000..2999a1ba4
--- /dev/null
+++ b/mobile/src/main/res/layout/sender_manual_connection.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <org.hzontal.shared_ui.appbar.ToolbarComponent
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:arrowBackIcon="@drawable/ic_close_white"
+            app:arrowBackIconContentDescription="@string/connect_manually"
+            app:layout_constraintTop_toTopOf="parent"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:startTitle="@string/connect_to_device" />
+
+
+        <ImageView
+            android:id="@+id/deviceImg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/device"
+            app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+
+        <TextView
+            android:id="@+id/titleTextView"
+            style="@style/Tella_Main_White_TextExtraLargeBold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:gravity="center"
+            android:text="@string/enter_recipient_info"
+            android:textColor="@android:color/white"
+            app:layout_constraintBottom_toTopOf="@+id/connectCode_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/connectCode_layout"
+            style="@style/DialogDataCollectionTextEntryLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="@dimen/activity_horizontal_margin"
+            android:textColorHint="@color/wa_white"
+            app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/titleTextView">
+
+            <EditText
+                android:id="@+id/connectCode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans"
+                android:hint="@string/connect_code"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLines="1"
+                android:textColor="@color/wa_white"
+                android:textDirection="ltr"
+                app:backgroundTint="@color/wa_white"
+                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/pin_layout"
+            style="@style/DialogDataCollectionTextEntryLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="@dimen/activity_horizontal_margin"
+            android:textColorHint="@color/wa_white"
+            app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/connectCode_layout">
+
+            <EditText
+                android:id="@+id/pin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans"
+                android:hint="@string/pin"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLines="1"
+                android:textColor="@color/wa_white"
+                android:textDirection="ltr"
+                app:backgroundTint="@color/wa_white"
+                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/port_layout"
+            style="@style/DialogDataCollectionTextEntryLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="@dimen/activity_horizontal_margin"
+            android:textColorHint="@color/wa_white"
+            app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pin_layout">
+
+            <EditText
+                android:id="@+id/port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans"
+                android:hint="@string/port"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLines="1"
+                android:textColor="@color/wa_white"
+                android:textDirection="ltr"
+                app:backgroundTint="@color/wa_white"
+                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <TextView
+            android:id="@+id/back_btn"
+            style="@style/Unlock_White_Text_Back"
+            android:text="@string/LockSelect_Action_Back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/next_btn"
+            style="@style/Unlock_White_Text_Next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/action_next"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index dd1f8829b..f850f652d 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -87,7 +87,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/connectCode"
-        app:leftText="@string/pin" />
+        app:leftText="@string/connect_code" />
 
     <org.hzontal.shared_ui.buttons.DualTextCheckView
         android:id="@+id/port"
@@ -100,7 +100,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/pin"
-        app:leftText="@string/port" />
+        app:leftText="@string/connect_code" />
 
     <TextView
         android:id="@+id/back_btn"
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index c0b30782b..81e74fb8d 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -35,7 +35,11 @@
         android:id="@+id/scanQrCodeScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.ScanQrCodeFragment"
         android:label="ScanQrCodeScreen"
-        tools:layout="@layout/scan_qrcode_fragment"/>
+        tools:layout="@layout/scan_qrcode_fragment">
+        <action
+            android:id="@+id/action_scanQrCodeScreen_to_senderManualConnectionScreen"
+            app:destination="@id/senderManualConnectionScreen" />
+    </fragment>
 
     <fragment
         android:id="@+id/qrCodeScreen"
@@ -52,4 +56,10 @@
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ShowDeviceInfoFragment"
         android:label="DeviceInfoScreen"
         tools:layout="@layout/show_device_info_layout" />
+
+    <fragment
+        android:id="@+id/senderManualConnectionScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderManualConnectionFragment"
+        android:label="SenderManualConnectionScreen"
+        tools:layout="@layout/sender_manual_connection" />
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index fea695848..9265c460c 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1037,5 +1037,6 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="nearby_sharing">Nearby sharing</string>
   <string name="how_it_works">How it works</string>
   <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
+  <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
 
 </resources>

From 2abd9ffbf36d86978a706398ebf9cfbb82ce4f2e Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 23 May 2025 16:52:57 +0100
Subject: [PATCH 005/153]  implement  prepare upload view

---
 .../tella/mobile/util/NavigationManager.kt    |   3 +
 .../peertopeer/PeerToPeerViewModel.kt         |  10 +-
 .../fragment/peertopeer/SenderViewModel.kt    |  87 +++++++++
 .../senderflow/PrepareUploadFragment.kt       | 177 ++++++++++++++++++
 .../senderflow/ScanQrCodeFragment.kt          |   8 +-
 .../res/layout/fragment_prepare_upload.xml    | 118 ++++++++++++
 .../res/navigation/peer_to_peer_graph.xml     |   8 +
 7 files changed, 406 insertions(+), 5 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
 create mode 100644 mobile/src/main/res/layout/fragment_prepare_upload.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 698219654..528ebe74e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -184,6 +184,9 @@ class NavigationManager(
     fun navigateFromScanQrCodeToDeviceInfo() {
         navigateToWithBundle(R.id.action_qrCodeScreen_to_deviceInfoScreen)
     }
+    fun navigateFromScanQrCodeTo() {
+        navigateToWithBundle(R.id.action_scanQrCodeScreen_to_prepareUploadFragment)
+    }
 
     fun navigateFromScanQrCodeToSenderManualConnectionScreen() {
         navigateToWithBundle(R.id.action_scanQrCodeScreen_to_senderManualConnectionScreen)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 9faa3cb48..cfd8fa991 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -54,7 +54,8 @@ class PeerToPeerViewModel @Inject constructor(
     private val _networkInfo = MutableLiveData<NetworkInfo>()
     val networkInfo: LiveData<NetworkInfo> = _networkInfo
     var currentNetworkInfo: NetworkInfo? = null
-        private set
+    private val _registrationSuccess = MutableLiveData<Boolean>()
+    val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
 
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
@@ -172,11 +173,12 @@ class PeerToPeerViewModel @Inject constructor(
             result.onSuccess {
                 Log.d("QRCode", "Registered successfully: $it")
                 val file = createFileFromAsset(context, "testDemo.txt")
-                peerClient.prepareUpload(ip,port,hash,"test report",file,UUID.randomUUID().toString(),calculateSha256(file),UUID.randomUUID().toString())
-                // update UI state
+                _registrationSuccess.postValue(true) // Notify success
             }.onFailure {
+                //   peerClient.prepareUpload(ip,port,hash,"test report",file,UUID.randomUUID().toString(),calculateSha256(file),UUID.randomUUID().toString())
+                // update UI state
                 Log.e("QRCode", "Registration failed: ${it.message}")
-                // handle error (maybe post a value to LiveData)
+                _registrationSuccess.postValue(false) // Optional: Notify failure
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
new file mode 100644
index 000000000..2ab1cf6be
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -0,0 +1,87 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import dagger.hilt.android.lifecycle.HiltViewModel
+import org.horizontal.tella.mobile.domain.entity.EntityStatus
+import org.horizontal.tella.mobile.domain.entity.Server
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
+import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
+import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseReportsViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class SenderViewModel @Inject constructor(
+
+) : BaseReportsViewModel() {
+    override fun clearDisposable() {
+        TODO("Not yet implemented")
+    }
+
+    override fun deleteReport(instance: ReportInstance) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getReportBundle(instance: ReportInstance) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getFormInstance(
+        title: String,
+        description: String,
+        files: List<FormMediaFile>?,
+        server: Server,
+        id: Long?,
+        reportApiId: String,
+        status: EntityStatus
+    ): ReportInstance {
+        TODO("Not yet implemented")
+    }
+
+    override fun getDraftFormInstance(
+        title: String,
+        description: String,
+        files: List<FormMediaFile>?,
+        server: Server,
+        id: Long?
+    ): ReportInstance {
+        TODO("Not yet implemented")
+    }
+
+    override fun listSubmitted() {
+        TODO("Not yet implemented")
+    }
+
+    override fun listOutbox() {
+        TODO("Not yet implemented")
+    }
+
+    override fun listDraftsOutboxAndSubmitted() {
+        TODO("Not yet implemented")
+    }
+
+    override fun listDrafts() {
+        TODO("Not yet implemented")
+    }
+
+    override fun saveSubmitted(reportInstance: ReportInstance) {
+        TODO("Not yet implemented")
+    }
+
+    override fun saveOutbox(reportInstance: ReportInstance) {
+        TODO("Not yet implemented")
+    }
+
+    override fun saveDraft(reportInstance: ReportInstance, exitAfterSave: Boolean) {
+        TODO("Not yet implemented")
+    }
+
+    override fun listServers() {
+        TODO("Not yet implemented")
+    }
+
+    override fun submitReport(instance: ReportInstance, backButtonPressed: Boolean) {
+        TODO("Not yet implemented")
+    }
+
+}
+
+
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
new file mode 100644
index 000000000..f995159fe
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -0,0 +1,177 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.setFragmentResultListener
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.hzontal.tella_vault.VaultFile
+import com.hzontal.tella_vault.filter.FilterType
+import dagger.hilt.android.AndroidEntryPoint
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
+import org.horizontal.tella.mobile.media.MediaFileHandler
+import org.horizontal.tella.mobile.util.C
+import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
+import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companion.CAPTURE_WITH_AUTO_UPLOAD
+import org.horizontal.tella.mobile.views.adapters.reports.ReportsFilesRecyclerViewAdapter
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
+import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
+import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
+import org.horizontal.tella.mobile.views.fragment.recorder.REPORT_ENTRY
+import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.AttachmentsActivitySelector
+import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILES_FILTER
+import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILE_KEY
+import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_PICKER_SINGLE
+import org.horizontal.tella.mobile.views.interfaces.IReportAttachmentsHandler
+import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.IVaultFilesSelector
+import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesSheet
+
+@AndroidEntryPoint
+class PrepareUploadFragment :
+    BaseBindingFragment<FragmentPrepareUploadBinding>(FragmentPrepareUploadBinding::inflate),
+    IReportAttachmentsHandler, OnNavBckListener {
+    private lateinit var gridLayoutManager: GridLayoutManager
+    private val filesRecyclerViewAdapter: ReportsFilesRecyclerViewAdapter by lazy {
+        ReportsFilesRecyclerViewAdapter(this)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setFragmentResultListener(BUNDLE_REPORT_AUDIO) { _, bundle ->
+            val file = bundle.get(BUNDLE_REPORT_VAULT_FILE) as VaultFile
+            bundle.remove(BUNDLE_REPORT_VAULT_FILE)
+            //putFiles(listOf(file))
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        initView()
+        initData()
+    }
+
+    private fun initView() {
+        gridLayoutManager = GridLayoutManager(context, 3)
+        binding.filesRecyclerView.apply {
+            layoutManager = gridLayoutManager
+            adapter = filesRecyclerViewAdapter
+        }
+        binding.toolbar.backClickListener = {
+            exitOrSave()
+        }
+
+    }
+
+    private fun exitOrSave() {
+
+    }
+
+    @SuppressLint("StringFormatInvalid")
+    private fun initData() {
+        }
+
+
+    private fun showSelectFilesSheet() {
+        showVaultSelectFilesSheet(baseActivity.supportFragmentManager,
+            baseActivity.getString(R.string.Uwazi_WidgetMedia_Take_Photo),
+            baseActivity.getString(R.string.Vault_RecordAudio_SheetAction),
+            baseActivity.getString(R.string.Uwazi_WidgetMedia_Select_From_Device),
+            baseActivity.getString(R.string.Uwazi_WidgetMedia_Select_From_Tella),
+            null,
+            baseActivity.getString(R.string.Uwazi_MiltiFileWidget_SelectFiles),
+            object : IVaultFilesSelector {
+                override fun importFromVault() {
+                    showAttachmentsActivity()
+                }
+
+                override fun goToRecorder() {
+                    showAudioRecorderActivity()
+                }
+
+                override fun goToCamera() {
+                    showCameraActivity()
+                }
+
+                override fun importFromDevice() {
+                    importMedia()
+                }
+            })
+    }
+
+
+    private fun showAttachmentsActivity() {
+        try {
+            baseActivity.startActivityForResult(
+                Intent(activity, AttachmentsActivitySelector::class.java)
+                    // .putExtra(VAULT_FILE_KEY, Gson().toJson(ids))
+                    .putExtra(
+                        VAULT_FILES_FILTER, FilterType.ALL_WITHOUT_DIRECTORY
+                    ).putExtra(VAULT_PICKER_SINGLE, false), C.MEDIA_FILE_ID
+            )
+        } catch (e: Exception) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+        }
+    }
+
+    private fun showCameraActivity() {
+        try {
+            val intent = Intent(context, CameraActivity::class.java)
+            intent.apply {
+                putExtra(CameraActivity.INTENT_MODE, CameraActivity.IntentMode.COLLECT.name)
+                putExtra(CAPTURE_WITH_AUTO_UPLOAD, false)
+            }
+
+            baseActivity.startActivityForResult(intent, C.MEDIA_FILE_ID)
+        } catch (e: java.lang.Exception) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+        }
+    }
+
+    private fun importMedia() {
+        baseActivity.maybeChangeTemporaryTimeout {
+            MediaFileHandler.startSelectMediaActivity(
+                activity, "image/* video/* audio/*",
+                arrayOf("image/*", "video/*", "audio/*"), C.IMPORT_FILE
+            )
+        }
+    }
+
+    private fun showAudioRecorderActivity() {
+        try {
+            bundle.putBoolean(REPORT_ENTRY, true)
+            this.navManager().navigateToMicro()
+        } catch (e: java.lang.Exception) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+        }
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == C.MEDIA_FILE_ID && resultCode == Activity.RESULT_OK) {
+            val vaultFile = data?.getStringExtra(VAULT_FILE_KEY) ?: ""
+         //   putFiles(viewModel.putVaultFilesInForm(vaultFile).blockingGet())
+        }
+    }
+
+
+    override fun playMedia(mediaFile: VaultFile?) {
+
+    }
+
+    override fun addFiles() {
+        showSelectFilesSheet()
+    }
+
+    override fun removeFiles() {
+    }
+
+    override fun onBackPressed(): Boolean {
+        exitOrSave()
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 82d6d66cb..21d62795d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -33,7 +33,13 @@ class ScanQrCodeFragment :
 
         barcodeView = CompoundBarcodeView(requireContext())
         barcodeView = binding.qrCodeScanView
-
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                navManager().navigateFromScanQrCodeTo()
+            } else {
+                //  handle error UI
+            }
+        }
         if (ContextCompat.checkSelfPermission(
                 requireContext(),
                 Manifest.permission.CAMERA
diff --git a/mobile/src/main/res/layout/fragment_prepare_upload.xml b/mobile/src/main/res/layout/fragment_prepare_upload.xml
new file mode 100644
index 000000000..954845043
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_prepare_upload.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollable"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/wa_purple"
+        android:clipToPadding="false"
+        android:fillViewport="true"
+        android:scrollbarStyle="outsideOverlay"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/wa_purple">
+
+            <org.hzontal.shared_ui.appbar.ToolbarComponent
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:arrowBackIcon="@drawable/ic_back_white"
+                app:arrowBackIconContentDescription="@string/action_go_back"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                app:rightIconContentDescription="@string/action_save"
+                app:startTitle="@string/send_files" />
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/report_title_layout"
+                style="@style/DialogDataCollectionTextEntryLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="16dp"
+                android:textColorHint="@color/wa_white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
+                app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+                <EditText
+                    android:id="@+id/report_title_et"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Reports_Select_Title"
+                    android:imeOptions="actionDone"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:textColor="@color/wa_white"
+                    app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
+                    app:backgroundTint="@color/wa_white" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:id="@+id/attach_files_text"
+                style="@style/Tella_Main_White_Text.Meduim"
+                android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_large_margin"
+                android:text="@string/Reports_Attach_files_Here"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/report_title_layout" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/files_recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:paddingBottom="94dp"
+                android:visibility="visible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/attach_files_text" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <RelativeLayout
+        android:id="@+id/buttons_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/wa_purple"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:id="@+id/send_report_btn"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="@dimen/tella_main_vertical"
+            android:layout_marginVertical="@dimen/activity_vertical_large_margin"
+            android:background="@drawable/bg_round_orange_btn"
+            android:fontFamily="@font/open_sans"
+            android:gravity="center"
+            android:text="@string/collect.end_action_submit"
+            android:textAlignment="center"
+            android:textColor="@color/btn_dark_letter"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:ignore="RtlCompat" />
+
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 81e74fb8d..25547ec83 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -36,6 +36,9 @@
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.ScanQrCodeFragment"
         android:label="ScanQrCodeScreen"
         tools:layout="@layout/scan_qrcode_fragment">
+        <action
+            android:id="@+id/action_scanQrCodeScreen_to_prepareUploadFragment"
+            app:destination="@id/prepareUploadFragment" />
         <action
             android:id="@+id/action_scanQrCodeScreen_to_senderManualConnectionScreen"
             app:destination="@id/senderManualConnectionScreen" />
@@ -56,6 +59,11 @@
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ShowDeviceInfoFragment"
         android:label="DeviceInfoScreen"
         tools:layout="@layout/show_device_info_layout" />
+    <fragment
+        android:id="@+id/prepareUploadFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PrepareUploadFragment"
+        tools:layout="@layout/fragment_prepare_upload"
+        android:label="PrepareUploadFragment" />
 
     <fragment
         android:id="@+id/senderManualConnectionScreen"

From 5cf1bcf77372e8b665fe5c10aab08d24d1c5a4f6 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 28 May 2025 18:21:25 +0100
Subject: [PATCH 006/153] implement add files in the send view

---
 .../fragment/peertopeer/SenderViewModel.kt    | 108 ++++++----------
 .../peertopeer/activity/PeerToPeerActivity.kt |  12 +-
 .../senderflow/PrepareUploadFragment.kt       | 118 +++++++++++++++++-
 .../senderflow/ScanQrCodeFragment.kt          |   1 -
 .../res/layout/fragment_prepare_upload.xml    |   6 +-
 5 files changed, 166 insertions(+), 79 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 2ab1cf6be..3028847c7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -1,87 +1,53 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
+import androidx.lifecycle.ViewModel
+import com.hzontal.tella_vault.VaultFile
 import dagger.hilt.android.lifecycle.HiltViewModel
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.schedulers.Schedulers
+import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.domain.entity.EntityStatus
 import org.horizontal.tella.mobile.domain.entity.Server
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
+import org.horizontal.tella.mobile.util.fromJsonToObjectList
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseReportsViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class SenderViewModel @Inject constructor(
-
-) : BaseReportsViewModel() {
-    override fun clearDisposable() {
-        TODO("Not yet implemented")
-    }
-
-    override fun deleteReport(instance: ReportInstance) {
-        TODO("Not yet implemented")
-    }
-
-    override fun getReportBundle(instance: ReportInstance) {
-        TODO("Not yet implemented")
-    }
-
-    override fun getFormInstance(
-        title: String,
-        description: String,
-        files: List<FormMediaFile>?,
-        server: Server,
-        id: Long?,
-        reportApiId: String,
-        status: EntityStatus
-    ): ReportInstance {
-        TODO("Not yet implemented")
-    }
-
-    override fun getDraftFormInstance(
-        title: String,
-        description: String,
-        files: List<FormMediaFile>?,
-        server: Server,
-        id: Long?
-    ): ReportInstance {
-        TODO("Not yet implemented")
-    }
-
-    override fun listSubmitted() {
-        TODO("Not yet implemented")
-    }
-
-    override fun listOutbox() {
-        TODO("Not yet implemented")
-    }
-
-    override fun listDraftsOutboxAndSubmitted() {
-        TODO("Not yet implemented")
-    }
-
-    override fun listDrafts() {
-        TODO("Not yet implemented")
-    }
-
-    override fun saveSubmitted(reportInstance: ReportInstance) {
-        TODO("Not yet implemented")
-    }
-
-    override fun saveOutbox(reportInstance: ReportInstance) {
-        TODO("Not yet implemented")
+) : ViewModel() {
+
+    fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
+        return Single.fromCallable {
+            vaultFileList.fromJsonToObjectList(String::class.java) ?: emptyList()
+        }
+            .flatMap { fileIds ->
+                MyApplication.keyRxVault.rxVault
+                    .firstOrError()
+                    .flatMap { rxVault ->
+                        Observable.fromIterable(fileIds)
+                            .flatMapSingle { fileId ->
+                                rxVault[fileId]
+                                    .subscribeOn(Schedulers.io())
+                                    .onErrorReturn { null } // safe, allows null
+                            }
+                            .filter { it != null } // filter out nulls
+                            .map { it!! } // safe to force unwrap if you're sure it's not null now
+                            .toList()
+                    }
+            }
+            .subscribeOn(Schedulers.io())
+    }
+
+    fun mediaFilesToVaultFiles(files: List<FormMediaFile>?): List<VaultFile> {
+        val vaultFiles = ArrayList<VaultFile>()
+        files?.map { mediaFile ->
+            vaultFiles.add(mediaFile.vaultFile)
+        }
+        return vaultFiles
     }
-
-    override fun saveDraft(reportInstance: ReportInstance, exitAfterSave: Boolean) {
-        TODO("Not yet implemented")
-    }
-
-    override fun listServers() {
-        TODO("Not yet implemented")
-    }
-
-    override fun submitReport(instance: ReportInstance, backButtonPressed: Boolean) {
-        TODO("Not yet implemented")
-    }
-
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
index c44c043b7..83c42259f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -1,10 +1,11 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.activity
 
+import android.content.Intent
 import android.os.Bundle
 import org.horizontal.tella.mobile.databinding.ActivityPeerToPeerBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseLockActivity
 
-class PeerToPeerActivity  : BaseLockActivity() {
+class PeerToPeerActivity : BaseLockActivity() {
     private lateinit var binding: ActivityPeerToPeerBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -12,4 +13,13 @@ class PeerToPeerActivity  : BaseLockActivity() {
         binding = ActivityPeerToPeerBinding.inflate(layoutInflater)
         setContentView(binding.getRoot())
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        // Delegate onActivityResult to child fragments
+        supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
+            it.onActivityResult(requestCode, resultCode, data)
+        }
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index f995159fe..36eebb495 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -6,13 +6,16 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.hzontal.tella_locking_ui.common.extensions.onChange
 import com.hzontal.tella_vault.VaultFile
 import com.hzontal.tella_vault.filter.FilterType
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
+import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
@@ -20,8 +23,10 @@ import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companio
 import org.horizontal.tella.mobile.views.adapters.reports.ReportsFilesRecyclerViewAdapter
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
+import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_FORM_INSTANCE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
+import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
 import org.horizontal.tella.mobile.views.fragment.recorder.REPORT_ENTRY
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.AttachmentsActivitySelector
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILES_FILTER
@@ -30,12 +35,18 @@ import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_PICKER
 import org.horizontal.tella.mobile.views.interfaces.IReportAttachmentsHandler
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.IVaultFilesSelector
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesSheet
+import org.hzontal.shared_ui.utils.DialogUtils
 
 @AndroidEntryPoint
 class PrepareUploadFragment :
     BaseBindingFragment<FragmentPrepareUploadBinding>(FragmentPrepareUploadBinding::inflate),
     IReportAttachmentsHandler, OnNavBckListener {
     private lateinit var gridLayoutManager: GridLayoutManager
+    private var isTitleEnabled = false
+    private var reportInstance: ReportInstance? = null
+    private val viewModel: SenderViewModel by viewModels()
+    private var isNewDraft = true
+
     private val filesRecyclerViewAdapter: ReportsFilesRecyclerViewAdapter by lazy {
         ReportsFilesRecyclerViewAdapter(this)
     }
@@ -45,7 +56,7 @@ class PrepareUploadFragment :
         setFragmentResultListener(BUNDLE_REPORT_AUDIO) { _, bundle ->
             val file = bundle.get(BUNDLE_REPORT_VAULT_FILE) as VaultFile
             bundle.remove(BUNDLE_REPORT_VAULT_FILE)
-            //putFiles(listOf(file))
+            putFiles(listOf(file))
         }
     }
 
@@ -64,6 +75,48 @@ class PrepareUploadFragment :
             exitOrSave()
         }
 
+        arguments?.let { bundle ->
+            if (bundle.get(BUNDLE_REPORT_FORM_INSTANCE) != null) {
+                reportInstance = bundle.get(BUNDLE_REPORT_FORM_INSTANCE) as ReportInstance
+                bundle.remove(BUNDLE_REPORT_FORM_INSTANCE)
+            }
+        }
+
+        reportInstance?.let { instance ->
+            binding.reportTitleEt.setText(instance.title)
+            putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
+            isNewDraft = false
+        }
+        highLightButtonsInit()
+        checkIsNewDraftEntry()
+    }
+
+    private fun checkIsNewDraftEntry() {
+        if (isNewDraft) {
+           // binding.deleteBtn.invisible()
+          //  binding.sendLaterBtn.show()
+            binding.sendReportBtn.text = getString(R.string.collect_end_action_submit)
+        } else {
+           // binding.deleteBtn.show()
+          //  binding.sendLaterBtn.invisible()
+            binding.sendReportBtn.text = getString(R.string.Send_Action_Label)
+        }
+    }
+
+
+    private fun highLightButtonsInit() {
+        binding.apply {
+            reportTitleEt.let { title ->
+                isTitleEnabled = title.length() > 0
+            }
+
+            reportTitleEt.onChange { title ->
+                isTitleEnabled = title.isNotEmpty()
+                highLightButtons()
+            }
+
+        }
+
     }
 
     private fun exitOrSave() {
@@ -72,7 +125,9 @@ class PrepareUploadFragment :
 
     @SuppressLint("StringFormatInvalid")
     private fun initData() {
-        }
+
+
+    }
 
 
     private fun showSelectFilesSheet() {
@@ -153,10 +208,67 @@ class PrepareUploadFragment :
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == C.MEDIA_FILE_ID && resultCode == Activity.RESULT_OK) {
             val vaultFile = data?.getStringExtra(VAULT_FILE_KEY) ?: ""
-         //   putFiles(viewModel.putVaultFilesInForm(vaultFile).blockingGet())
+            putFiles(viewModel.putVaultFilesInForm(vaultFile).blockingGet())
         }
     }
 
+    private fun putFiles(vaultFileList: List<VaultFile>) {
+        val filteredFiles = vaultFileList.filter { file ->
+            isValidFile(file)
+        }.also {
+            if (it.size != vaultFileList.size) {
+                showToast(getString(R.string.nextcloud_file_size_limit))
+            }
+        }
+
+        // Insert the filtered files
+        filteredFiles.forEach { file ->
+            filesRecyclerViewAdapter.insertAttachment(file)
+        }
+
+        // Ensure visibility and highlight buttons
+        binding.filesRecyclerView.visibility = View.VISIBLE
+        highLightButtons()
+    }
+
+
+    private fun highLightButtons() {
+        val isSubmitEnabled =
+            isTitleEnabled  && filesRecyclerViewAdapter.getFiles()
+                .isNotEmpty()
+
+        val disabled: Float = context?.getString(R.string.alpha_disabled)?.toFloat() ?: 1.0f
+        val enabled: Float = context?.getString(R.string.alpha_enabled)?.toFloat() ?: 1.0f
+
+        binding.sendReportBtn.setBackgroundResource(if (isSubmitEnabled) R.drawable.bg_round_orange_btn else R.drawable.bg_round_orange16_btn)
+        binding.sendReportBtn.alpha = (if (isSubmitEnabled) enabled else disabled)
+
+        initClickListeners(isSubmitEnabled)
+    }
+
+    private fun initClickListeners(isSubmitEnabled: Boolean) {
+        binding.sendReportBtn.setOnClickListener {
+            if (isSubmitEnabled) {
+            } else {
+                showSubmitReportErrorSnackBar()
+            }
+        }
+    }
+    private fun showSubmitReportErrorSnackBar() {
+        val errorRes = R.string.Snackbar_Submit_Report_WithProject_Error
+
+        DialogUtils.showBottomMessage(
+            baseActivity,
+            getString(errorRes),
+            false
+        )
+    }
+
+    // Helper function to check if the file is valid (less than or equal to 20MB)
+    private fun isValidFile(file: VaultFile): Boolean {
+        val isFileSizeValid = file.size <= 20 * 1024 * 1024 // 20MB in bytes
+        return isFileSizeValid
+    }
 
     override fun playMedia(mediaFile: VaultFile?) {
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 21d62795d..27938c6dc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -79,7 +79,6 @@ class ScanQrCodeFragment :
                 }
             }
 
-
             override fun possibleResultPoints(resultPoints: MutableList<com.google.zxing.ResultPoint>?) {
             }
         })
diff --git a/mobile/src/main/res/layout/fragment_prepare_upload.xml b/mobile/src/main/res/layout/fragment_prepare_upload.xml
index 954845043..7c01fd7e9 100644
--- a/mobile/src/main/res/layout/fragment_prepare_upload.xml
+++ b/mobile/src/main/res/layout/fragment_prepare_upload.xml
@@ -45,9 +45,9 @@
                 android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="16dp"
                 android:textColorHint="@color/wa_white"
+                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
                 app:layout_constraintTop_toBottomOf="@id/toolbar">
 
                 <EditText
@@ -59,8 +59,8 @@
                     android:inputType="text"
                     android:maxLines="1"
                     android:textColor="@color/wa_white"
-                    app:errorTextAppearance="@style/TextEntryLayoutErrorStyle"
-                    app:backgroundTint="@color/wa_white" />
+                    app:backgroundTint="@color/wa_white"
+                    app:errorTextAppearance="@style/TextEntryLayoutErrorStyle" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView

From a6713af98a16cdbd26f5f1e9f0397645e3e6f7fe Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 29 May 2025 14:37:45 +0100
Subject: [PATCH 007/153] continue on implementing the design of the send view

---
 .../mobile/views/fragment/peertopeer/SenderViewModel.kt  | 4 ----
 .../peertopeer/senderflow/PrepareUploadFragment.kt       | 9 ++++-----
 mobile/src/main/res/layout/fragment_prepare_upload.xml   | 3 ++-
 mobile/src/main/res/values/strings.xml                   | 5 ++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 3028847c7..fda0c2d2a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -7,12 +7,8 @@ import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import org.horizontal.tella.mobile.MyApplication
-import org.horizontal.tella.mobile.domain.entity.EntityStatus
-import org.horizontal.tella.mobile.domain.entity.Server
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
-import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
-import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseReportsViewModel
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 36eebb495..5f42b8d23 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -231,6 +231,9 @@ class PrepareUploadFragment :
         highLightButtons()
     }
 
+    override fun removeFiles() {
+        highLightButtons()
+    }
 
     private fun highLightButtons() {
         val isSubmitEnabled =
@@ -255,7 +258,7 @@ class PrepareUploadFragment :
         }
     }
     private fun showSubmitReportErrorSnackBar() {
-        val errorRes = R.string.Snackbar_Submit_Report_WithProject_Error
+        val errorRes = R.string.Snackbar_Submit_Files_Error
 
         DialogUtils.showBottomMessage(
             baseActivity,
@@ -271,16 +274,12 @@ class PrepareUploadFragment :
     }
 
     override fun playMedia(mediaFile: VaultFile?) {
-
     }
 
     override fun addFiles() {
         showSelectFilesSheet()
     }
 
-    override fun removeFiles() {
-    }
-
     override fun onBackPressed(): Boolean {
         exitOrSave()
         return true
diff --git a/mobile/src/main/res/layout/fragment_prepare_upload.xml b/mobile/src/main/res/layout/fragment_prepare_upload.xml
index 7c01fd7e9..a6d6ba9b3 100644
--- a/mobile/src/main/res/layout/fragment_prepare_upload.xml
+++ b/mobile/src/main/res/layout/fragment_prepare_upload.xml
@@ -61,6 +61,7 @@
                     android:textColor="@color/wa_white"
                     app:backgroundTint="@color/wa_white"
                     app:errorTextAppearance="@style/TextEntryLayoutErrorStyle" />
+
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
@@ -104,7 +105,7 @@
             android:layout_gravity="center"
             android:layout_marginHorizontal="@dimen/tella_main_vertical"
             android:layout_marginVertical="@dimen/activity_vertical_large_margin"
-            android:background="@drawable/bg_round_orange_btn"
+            android:background="@drawable/bg_round_orange16_btn"
             android:fontFamily="@font/open_sans"
             android:gravity="center"
             android:text="@string/collect.end_action_submit"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 9265c460c..d333fb2ca 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -798,9 +798,8 @@ they are uploaded to this project as a report.</string>
   <string name="Edit_Dialog_confirm_exit_title">Unsaved changes</string>
   <string name="Edit_Dialog_confirm_exit">Your changes have not been saved. Would you like to save before exiting?</string>
   <string name="action_exit_without_saving">EXIT WITHOUT SAVING</string>
-  <string name="incorrect_pattern">Incorrect Pattern.
-
-</string>
+  <string name="incorrect_pattern">Incorrect Pattern</string>
+  <string name="Snackbar_Submit_Files_Error">To submit a report, please type in a title and attach a file.</string>
   <string name="incorrect_pin">Incorrect Pin. 
 
 </string>

From b8252f2c9c4805a71b5c52fbfb90839c0e98a5c8 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 29 May 2025 20:28:08 +0100
Subject: [PATCH 008/153] WIP manual connection

---
 .../data/peertopeer/FingerprintFetcher.kt     |  45 +++++++
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  19 +++
 .../peertopeer/PeerToPeerViewModel.kt         |  50 ++++----
 .../receipentflow/ConnectHotspotFragment.kt   |   1 -
 .../ConnectManuallyVerificationFragment.kt    |  31 +++++
 .../receipentflow/VerificationInfoFragment.kt |   4 -
 .../SenderManualConnectionFragment.kt         |   3 +
 .../layout/connect_manually_verification.xml  | 120 ++++++++++++++++++
 .../res/layout/sender_manual_connection.xml   |   3 +-
 .../res/layout/show_device_info_layout.xml    |   5 +-
 .../res/navigation/peer_to_peer_graph.xml     |  13 +-
 mobile/src/main/res/values/strings.xml        |   4 +-
 12 files changed, 262 insertions(+), 36 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
 create mode 100644 mobile/src/main/res/layout/connect_manually_verification.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
new file mode 100644
index 000000000..d36c87530
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -0,0 +1,45 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import java.net.SocketTimeoutException
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509TrustManager
+
+object FingerprintFetcher {
+
+    suspend fun fetch(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
+        return@withContext try {
+            val socket = createUnsafeSSLSocket(ip, port)
+            val cert = socket.session.peerCertificates[0] as X509Certificate
+            val fingerprint = CertificateUtils.getPublicKeyHash(cert)
+            socket.close()
+            Result.success(fingerprint)
+        } catch (e: SocketTimeoutException) {
+            Result.failure(RuntimeException("Connection timed out", e))
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    private fun createUnsafeSSLSocket(ip: String, port: Int): SSLSocket {
+        val sslContext = SSLContext.getInstance("TLS")
+        sslContext.init(null, arrayOf(TrustAllCerts()), SecureRandom())
+        val factory = sslContext.socketFactory as SSLSocketFactory
+        val socket = factory.createSocket(ip, port) as SSLSocket
+        socket.soTimeout = 5000
+        socket.startHandshake()
+        return socket
+    }
+
+    private class TrustAllCerts : X509TrustManager {
+        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
+        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
+        override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 6345097b1..01075581b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -19,6 +19,8 @@ import java.security.cert.X509Certificate
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
@@ -180,4 +182,21 @@ class TellaPeerToPeerClient {
         }
     }
 
+    suspend fun fetchServerFingerprint(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
+        try {
+            val socket = SSLSocketFactory.getDefault()
+                .createSocket(ip, port) as SSLSocket
+            socket.soTimeout = 5000
+            socket.startHandshake()
+
+            val cert = socket.session.peerCertificates[0] as X509Certificate
+            val fingerprint = CertificateUtils.getPublicKeyHash(cert)
+            Result.success(fingerprint)
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index cfd8fa991..7f3318380 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -17,39 +17,25 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
-import org.json.JSONArray
-import org.json.JSONObject
+import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.net.Inet4Address
 import java.net.NetworkInterface
 import java.security.MessageDigest
-import java.security.SecureRandom
-import java.security.cert.CertificateException
-import java.security.cert.X509Certificate
 import java.util.UUID
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
-import javax.net.ssl.X509TrustManager
 
 @HiltViewModel
 class PeerToPeerViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
     private val peerClient: TellaPeerToPeerClient
-) :
-    ViewModel() {
+) : ViewModel() {
 
     private val _networkInfo = MutableLiveData<NetworkInfo>()
     val networkInfo: LiveData<NetworkInfo> = _networkInfo
@@ -145,7 +131,6 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-    @SuppressLint("DiscouragedPrivateApi")
     private fun getDeviceHotspotIpAddress(): String? {
         return try {
             val networkInterfaces = NetworkInterface.getNetworkInterfaces()
@@ -173,9 +158,16 @@ class PeerToPeerViewModel @Inject constructor(
             result.onSuccess {
                 Log.d("QRCode", "Registered successfully: $it")
                 val file = createFileFromAsset(context, "testDemo.txt")
-                _registrationSuccess.postValue(true) // Notify success
-            }.onFailure {
-                //   peerClient.prepareUpload(ip,port,hash,"test report",file,UUID.randomUUID().toString(),calculateSha256(file),UUID.randomUUID().toString())
+                peerClient.prepareUpload(
+                    ip,
+                    port,
+                    hash,
+                    "test report",
+                    file,
+                    UUID.randomUUID().toString(),
+                    calculateSha256(file),
+                    UUID.randomUUID().toString()
+                )
                 // update UI state
                 Log.e("QRCode", "Registration failed: ${it.message}")
                 _registrationSuccess.postValue(false) // Optional: Notify failure
@@ -183,6 +175,19 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+    fun handleCertificate(ip: String, port: String, pin: String) {
+        viewModelScope.launch {
+            val result = FingerprintFetcher.fetch(ip, port.toInt())
+
+            result.onSuccess { hash ->
+                Timber.d("hash ***** $hash")
+            }.onFailure { error ->
+                Timber.d("error ***** $error")
+            }
+
+        }
+    }
+
 
     private fun createFileFromAsset(context: Context, assetFileName: String): File {
         // Create a temporary file in the cache directory
@@ -203,8 +208,6 @@ class PeerToPeerViewModel @Inject constructor(
         return tempFile
     }
 
-
-
     private fun calculateSha256(file: File): String {
         val digest = MessageDigest.getInstance("SHA-256")
         file.inputStream().use { input ->
@@ -218,5 +221,4 @@ class PeerToPeerViewModel @Inject constructor(
     }
 
 
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index ecd84c81c..b2f5e9ed2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -30,7 +30,6 @@ class ConnectHotspotFragment :
     }
 
     private fun initObservers() {
-
         viewModel.networkInfo.observe(viewLifecycleOwner) { info ->
             when (info.type) {
                 ConnectionType.HOTSPOT, ConnectionType.WIFI, ConnectionType.CELLULAR -> {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt
new file mode 100644
index 000000000..e0499bcee
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt
@@ -0,0 +1,31 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.os.Bundle
+import android.view.View
+import com.google.gson.Gson
+import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class ConnectManuallyVerificationFragment:
+    BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
+
+    private var payload: PeerConnectionPayload? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        arguments?.getString("payload")?.let { payloadJson ->
+            payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
+        }
+        initListeners()
+        initView()
+    }
+
+    private fun initView() {
+
+    }
+
+    private fun initListeners() {
+
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
deleted file mode 100644
index 5af7e3916..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/VerificationInfoFragment.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
-
-class VerificationInfoFragment {
-}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 9a166d6ef..4facedaa7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -65,6 +65,9 @@ class SenderManualConnectionFragment :
                 if (enabled) android.R.color.white else android.R.color.darker_gray
             )
         )
+        binding.nextBtn.setOnClickListener {
+            viewModel.handleCertificate(ip = binding.connectCode.text.toString(), port = binding.port.text.toString(), pin = binding.pin.text.toString())
+        }
     }
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
new file mode 100644
index 000000000..d9a60761f
--- /dev/null
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple">
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_close_white"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:startTitle="@string/connect_manually" />
+
+    <ImageView
+        android:id="@+id/deviceImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/device"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <TextView
+        android:id="@+id/titleTextView"
+        style="@style/Tella_Main_White_TextExtraLargeBold"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/show_device_information"
+        android:textColor="@android:color/white"
+        app:layout_constraintTop_toBottomOf="@id/deviceImg"
+        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5" />
+
+    <TextView
+        android:id="@+id/titleDescTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_small_margin"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:gravity="start"
+        android:text="@string/make_sure_sequence_matches"
+        android:textColor="@android:color/white"
+        app:layout_constraintTop_toBottomOf="@id/titleTextView"
+        app:layout_constraintBottom_toTopOf="@+id/hashContentTextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5" />
+
+    <TextView
+        android:id="@+id/hashContentTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:padding="24dp"
+        tools:text="87fd 5869 a6b3 e414 112c 1934 ca00 be77 b8e4 584c 829a 4536 490b da9a 3928 be4a"
+        android:background="@drawable/bg_dual_text_check"
+        app:layout_constraintTop_toBottomOf="@id/titleDescTextView"
+        app:layout_constraintBottom_toTopOf="@+id/warningTextView" />
+
+    <TextView
+        android:id="@+id/warningTextView"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:gravity="start"
+        android:text="@string/make_sure_sequence_matches"
+        android:textColor="@android:color/white"
+        app:layout_constraintTop_toBottomOf="@id/hashContentTextView"
+        app:layout_constraintBottom_toTopOf="@+id/confirmAndConnectBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/confirmAndConnectBtn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:background="@drawable/bg_round_orange_btn"
+        app:text_color="@color/btn_dark_letter"
+        app:check_state="false"
+        app:layout_constraintTop_toBottomOf="@id/warningTextView"
+        app:layout_constraintBottom_toTopOf="@+id/discardBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:text="@string/confirm_and_connect" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/discardBtn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        app:check_state="false"
+        app:layout_constraintTop_toBottomOf="@id/confirmAndConnectBtn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:text="@string/discard_and_start_over" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/sender_manual_connection.xml b/mobile/src/main/res/layout/sender_manual_connection.xml
index 2999a1ba4..7b1c0e8ba 100644
--- a/mobile/src/main/res/layout/sender_manual_connection.xml
+++ b/mobile/src/main/res/layout/sender_manual_connection.xml
@@ -74,7 +74,8 @@
                 android:hint="@string/connect_code"
                 android:imeOptions="actionNext"
                 android:importantForAutofill="no"
-                android:inputType="number"
+                android:inputType="textNoSuggestions"
+                android:digits="0123456789."
                 android:maxLines="1"
                 android:textColor="@color/wa_white"
                 android:textDirection="ltr"
diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index f850f652d..3cc3442e0 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/dark_purple">
@@ -87,7 +86,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/connectCode"
-        app:leftText="@string/connect_code" />
+        app:leftText="@string/pin" />
 
     <org.hzontal.shared_ui.buttons.DualTextCheckView
         android:id="@+id/port"
@@ -100,7 +99,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/pin"
-        app:leftText="@string/connect_code" />
+        app:leftText="@string/port" />
 
     <TextView
         android:id="@+id/back_btn"
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 25547ec83..7b68c48ec 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -31,6 +31,12 @@
 
     </fragment>
 
+    <fragment
+        android:id="@+id/connectManuallyVerificationFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ConnectManuallyVerificationFragment"
+        android:label="ConnectManuallyVerificationFragment"
+        tools:layout="@layout/connect_manually_verification" />
+
     <fragment
         android:id="@+id/scanQrCodeScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.ScanQrCodeFragment"
@@ -69,5 +75,10 @@
         android:id="@+id/senderManualConnectionScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderManualConnectionFragment"
         android:label="SenderManualConnectionScreen"
-        tools:layout="@layout/sender_manual_connection" />
+        tools:layout="@layout/sender_manual_connection" >
+        <action
+            android:id="@+id/action_senderManualConnectionScreen_to_connectManuallyVerificationFragment"
+            app:destination="@id/connectManuallyVerificationFragment" />
+    </fragment>
+
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index d333fb2ca..7dfb7e7fc 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1017,7 +1017,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
   <string name="sequence_mismatch_warning">If the sequence on your device does not match the sequence on the sender’s device, the connection may not be secure and should be discarded.</string>
   <string name="confirm_and_connect">Confirm and connect</string>
-  <string name="discard_and_start_over">Discard and start over</string>
   <string name="wifi">Wi-Fi</string>
   <string name="get_connected">Get connected</string>
   <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
@@ -1037,5 +1036,6 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="how_it_works">How it works</string>
   <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
   <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
-
+  <string name="make_sure_sequence_matches">Make sure that this sequence matches what is shown on the sender’s device.</string>
+  <string name="discard_and_start_over">Discard and start over</string>
 </resources>

From 49423e0155884fcb374ce6e7185d01353bcb2b07 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 30 May 2025 13:03:29 +0100
Subject: [PATCH 009/153] WIP show hash flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  4 ---
 .../peertopeer/PeerToPeerViewModel.kt         |  9 ++++-
 ...nt.kt => RecipientVerificationFragment.kt} |  2 +-
 .../SenderManualConnectionFragment.kt         | 16 ++++++++-
 .../senderflow/SenderVerificationFragment.kt  | 33 +++++++++++++++++++
 .../layout/connect_manually_verification.xml  |  2 +-
 .../res/navigation/peer_to_peer_graph.xml     | 22 ++++++++++---
 mobile/src/main/res/values/strings.xml        |  2 ++
 8 files changed, 77 insertions(+), 13 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/{ConnectManuallyVerificationFragment.kt => RecipientVerificationFragment.kt} (95%)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 3a56cb036..edb47fe4e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -14,13 +14,10 @@ import io.ktor.server.engine.sslConnector
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
-import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
@@ -31,7 +28,6 @@ import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
 import java.util.UUID
-import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType
 
 const val port = 53317
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 7f3318380..dcac2de85 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -30,6 +30,7 @@ import java.net.NetworkInterface
 import java.security.MessageDigest
 import java.util.UUID
 import javax.inject.Inject
+import kotlin.jvm.Throws
 
 @HiltViewModel
 class PeerToPeerViewModel @Inject constructor(
@@ -42,6 +43,10 @@ class PeerToPeerViewModel @Inject constructor(
     var currentNetworkInfo: NetworkInfo? = null
     private val _registrationSuccess = MutableLiveData<Boolean>()
     val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
+    private val _getHashSuccess = MutableLiveData<String>()
+    val getHashSuccess: LiveData<String> get() = _getHashSuccess
+    private val _getHashError = MutableLiveData<Throwable>()
+    val getHashError: LiveData<Throwable> get() = _getHashError
 
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
@@ -169,7 +174,7 @@ class PeerToPeerViewModel @Inject constructor(
                     UUID.randomUUID().toString()
                 )
                 // update UI state
-                Log.e("QRCode", "Registration failed: ${it.message}")
+                //   Log.e("QRCode", "Registration failed: ${it.message}")
                 _registrationSuccess.postValue(false) // Optional: Notify failure
             }
         }
@@ -180,8 +185,10 @@ class PeerToPeerViewModel @Inject constructor(
             val result = FingerprintFetcher.fetch(ip, port.toInt())
 
             result.onSuccess { hash ->
+                _getHashSuccess.postValue(hash)
                 Timber.d("hash ***** $hash")
             }.onFailure { error ->
+                _getHashError.postValue(error)
                 Timber.d("error ***** $error")
             }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
similarity index 95%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index e0499bcee..9537fb46b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectManuallyVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -7,7 +7,7 @@ import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBindin
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 
-class ConnectManuallyVerificationFragment:
+class RecipientVerificationFragment:
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
 
     private var payload: PeerConnectionPayload? = null
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 4facedaa7..75f5e3e22 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -66,7 +66,21 @@ class SenderManualConnectionFragment :
             )
         )
         binding.nextBtn.setOnClickListener {
-            viewModel.handleCertificate(ip = binding.connectCode.text.toString(), port = binding.port.text.toString(), pin = binding.pin.text.toString())
+            viewModel.handleCertificate(
+                ip = binding.connectCode.text.toString(),
+                port = binding.port.text.toString(),
+                pin = binding.pin.text.toString()
+            )
+        }
+    }
+
+    private fun initObservers() {
+        viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
+
+        }
+
+        viewModel.getHashError.observe(viewLifecycleOwner) { error->
+            error.localizedMessage?.let { showToast(it) }
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
new file mode 100644
index 000000000..9c322db74
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -0,0 +1,33 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.os.Bundle
+import android.view.View
+import com.google.gson.Gson
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class SenderVerificationFragment :
+    BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
+
+    private var payload: PeerConnectionPayload? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        arguments?.getString("payload")?.let { payloadJson ->
+            payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
+        }
+        initListeners()
+        initView()
+    }
+
+    private fun initView() {
+        binding.titleDescTextView.text = getString(R.string.make_sure_sequence_matches_recipient)
+        binding.warningTextView.text = getString(R.string.sequence_mismatch_warning_recipient)
+    }
+
+    private fun initListeners() {
+
+    }
+}
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index d9a60761f..022c99308 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -81,7 +81,7 @@
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:gravity="start"
-        android:text="@string/make_sure_sequence_matches"
+        android:text="@string/sequence_mismatch_warning"
         android:textColor="@android:color/white"
         app:layout_constraintTop_toBottomOf="@id/hashContentTextView"
         app:layout_constraintBottom_toTopOf="@+id/confirmAndConnectBtn"
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 7b68c48ec..046e4ed78 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -33,7 +33,7 @@
 
     <fragment
         android:id="@+id/connectManuallyVerificationFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ConnectManuallyVerificationFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientVerificationFragment"
         android:label="ConnectManuallyVerificationFragment"
         tools:layout="@layout/connect_manually_verification" />
 
@@ -64,18 +64,30 @@
         android:id="@+id/deviceInfoScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ShowDeviceInfoFragment"
         android:label="DeviceInfoScreen"
-        tools:layout="@layout/show_device_info_layout" />
+        tools:layout="@layout/show_device_info_layout" >
+        <action
+            android:id="@+id/action_deviceInfoScreen_to_recipientVerificationScreen"
+            app:destination="@id/recipientVerificationScreen" />
+    </fragment>
+
+
+    <fragment
+        android:id="@+id/recipientVerificationScreen"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientVerificationFragment"
+        android:label="RecipientVerificationScreen"
+        tools:layout="@layout/connect_manually_verification"/>
+
     <fragment
         android:id="@+id/prepareUploadFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PrepareUploadFragment"
-        tools:layout="@layout/fragment_prepare_upload"
-        android:label="PrepareUploadFragment" />
+        android:label="PrepareUploadFragment"
+        tools:layout="@layout/fragment_prepare_upload" />
 
     <fragment
         android:id="@+id/senderManualConnectionScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderManualConnectionFragment"
         android:label="SenderManualConnectionScreen"
-        tools:layout="@layout/sender_manual_connection" >
+        tools:layout="@layout/sender_manual_connection">
         <action
             android:id="@+id/action_senderManualConnectionScreen_to_connectManuallyVerificationFragment"
             app:destination="@id/connectManuallyVerificationFragment" />
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 7dfb7e7fc..e98c87573 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1037,5 +1037,7 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
   <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
   <string name="make_sure_sequence_matches">Make sure that this sequence matches what is shown on the sender’s device.</string>
+  <string name="make_sure_sequence_matches_recipient">Make sure that this sequence matches what is shown on the recipient’s device.</string>
+  <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
   <string name="discard_and_start_over">Discard and start over</string>
 </resources>

From ec8494314ef658da244b55bfe923f3edb8d43c5f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 2 Jun 2025 14:12:03 +0100
Subject: [PATCH 010/153] wip prepareUpload api implementation

---
 .../fragment/peertopeer/PeerSessionManager.kt | 26 ++++++++++
 .../peertopeer/PeerToPeerViewModel.kt         | 23 +++-----
 .../fragment/peertopeer/SenderViewModel.kt    | 52 +++++++++++++++++++
 .../senderflow/PrepareUploadFragment.kt       | 30 +++++++++--
 4 files changed, 112 insertions(+), 19 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
new file mode 100644
index 000000000..e28cfb07a
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -0,0 +1,26 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+/**
+ * Created by wafa on 2/6/2025.
+ */
+
+object PeerSessionManager {
+    var ip: String? = null
+    var port: String? = null
+    var hash: String? = null
+    var sessionId: String? = null
+
+    fun isSessionValid(): Boolean {
+        return !ip.isNullOrEmpty() &&
+                !port.isNullOrEmpty() &&
+                !hash.isNullOrEmpty() &&
+                !sessionId.isNullOrEmpty()
+    }
+
+    fun clear() {
+        ip = null
+        port = null
+        hash = null
+        sessionId = null
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index dcac2de85..10ac430d0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -160,23 +160,14 @@ class PeerToPeerViewModel @Inject constructor(
     fun onQrCodeParsed(ip: String, port: String, hash: String, pin: String) {
         viewModelScope.launch {
             val result = peerClient.registerPeerDevice(ip, port, hash, pin)
-            result.onSuccess {
-                Log.d("QRCode", "Registered successfully: $it")
-                val file = createFileFromAsset(context, "testDemo.txt")
-                peerClient.prepareUpload(
-                    ip,
-                    port,
-                    hash,
-                    "test report",
-                    file,
-                    UUID.randomUUID().toString(),
-                    calculateSha256(file),
-                    UUID.randomUUID().toString()
-                )
+            result.onSuccess { sessionId ->
+                Log.d("QRCode", "Registered successfully: $sessionId")
+                PeerSessionManager.ip = ip
+                PeerSessionManager.port = port
+                PeerSessionManager.hash = hash
+                PeerSessionManager.sessionId = sessionId
                 // update UI state
-                //   Log.e("QRCode", "Registration failed: ${it.message}")
-                _registrationSuccess.postValue(false) // Optional: Notify failure
-            }
+                _registrationSuccess.postValue(true)
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index fda0c2d2a..b6721ed77 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -1,19 +1,33 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
+import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
+import timber.log.Timber
+import java.io.File
 import javax.inject.Inject
 
+
 @HiltViewModel
 class SenderViewModel @Inject constructor(
+    private val peerClient: TellaPeerToPeerClient
 ) : ViewModel() {
+    private val _prepareResults = MutableLiveData<List<PeerPrepareUploadResponse>>()
+    val prepareResults: LiveData<List<PeerPrepareUploadResponse>> = _prepareResults
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -44,6 +58,44 @@ class SenderViewModel @Inject constructor(
         }
         return vaultFiles
     }
+
+    fun prepareUploadsFromVaultFiles(
+        files: List<VaultFile>,
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        sessionId: String,
+        title: String = "Title of the report"
+    ) {
+        viewModelScope.launch {
+            val successfulResponses = mutableListOf<PeerPrepareUploadResponse>()
+
+            for (file in files) {
+                val result = peerClient.prepareUpload(
+                    ip = ip,
+                    port = port,
+                    expectedFingerprint = expectedFingerprint,
+                    title = title,
+                    file = File(file.path),
+                    fileId = file.id,
+                    sha256 = file.hash,
+                    sessionId = sessionId
+                )
+
+                result.onSuccess { transmissionId ->
+                    Timber.d("Success: transmissionId = $transmissionId")
+                    successfulResponses.add(PeerPrepareUploadResponse(transmissionId))
+                }.onFailure {
+                    Timber.e(it, "Failed to prepare upload")
+                    // You can log or ignore errors here — not returned to LiveData
+                }
+            }
+
+            _prepareResults.postValue(successfulResponses)
+        }
+    }
+
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 5f42b8d23..d7f29e516 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -14,6 +14,7 @@ import com.hzontal.tella_vault.VaultFile
 import com.hzontal.tella_vault.filter.FilterType
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
 import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
 import org.horizontal.tella.mobile.media.MediaFileHandler
@@ -87,6 +88,13 @@ class PrepareUploadFragment :
             putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
             isNewDraft = false
         }
+
+        viewModel.prepareResults.observe(viewLifecycleOwner) { responses ->
+            responses.forEach { response ->
+                val id = response.transmissionId
+                // navigate to next screen
+            }
+        }
         highLightButtonsInit()
         checkIsNewDraftEntry()
     }
@@ -104,6 +112,7 @@ class PrepareUploadFragment :
     }
 
 
+
     private fun highLightButtonsInit() {
         binding.apply {
             reportTitleEt.let { title ->
@@ -251,9 +260,24 @@ class PrepareUploadFragment :
 
     private fun initClickListeners(isSubmitEnabled: Boolean) {
         binding.sendReportBtn.setOnClickListener {
-            if (isSubmitEnabled) {
-            } else {
-                showSubmitReportErrorSnackBar()
+            binding.sendReportBtn.setOnClickListener {
+                if (isSubmitEnabled) {
+                    val selectedFiles = filesRecyclerViewAdapter.getFiles()// however you get selected VaultFiles
+
+                    if (selectedFiles.isNotEmpty()) {
+                        viewModel.prepareUploadsFromVaultFiles(
+                            files = selectedFiles,
+                            ip = "",
+                            port = "",
+                            expectedFingerprint = "",
+                            sessionId = ""
+                        )
+                    } else {
+                        showToast("No file selected")
+                    }
+                } else {
+                    showSubmitReportErrorSnackBar()
+                }
             }
         }
     }

From 95c3a5c1b32daa812d695ff315ed2ac40f40e1a7 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 2 Jun 2025 14:15:01 +0100
Subject: [PATCH 011/153] reformat code

---
 .../mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 10ac430d0..45db49c7d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -28,9 +28,7 @@ import java.io.FileOutputStream
 import java.net.Inet4Address
 import java.net.NetworkInterface
 import java.security.MessageDigest
-import java.util.UUID
 import javax.inject.Inject
-import kotlin.jvm.Throws
 
 @HiltViewModel
 class PeerToPeerViewModel @Inject constructor(
@@ -168,6 +166,7 @@ class PeerToPeerViewModel @Inject constructor(
                 PeerSessionManager.sessionId = sessionId
                 // update UI state
                 _registrationSuccess.postValue(true)
+            }
         }
     }
 

From 86d46711808574f724f12c98e6e2e1631daf5802 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 2 Jun 2025 14:52:15 +0100
Subject: [PATCH 012/153] save connection Infos

---
 .../fragment/peertopeer/PeerSessionManager.kt | 35 +++++++++++--------
 .../peertopeer/PeerToPeerViewModel.kt         |  5 +--
 .../fragment/peertopeer/SenderViewModel.kt    | 21 +++++------
 .../senderflow/PrepareUploadFragment.kt       | 11 ++----
 4 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
index e28cfb07a..7bba9c878 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -4,23 +4,30 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
  * Created by wafa on 2/6/2025.
  */
 
+data class PeerConnectionInfo(
+    val ip: String,
+    val port: String,
+    val expectedFingerprint: String,
+    val sessionId: String
+)
+
 object PeerSessionManager {
-    var ip: String? = null
-    var port: String? = null
-    var hash: String? = null
-    var sessionId: String? = null
+    private var connectionInfo: PeerConnectionInfo? = null
 
-    fun isSessionValid(): Boolean {
-        return !ip.isNullOrEmpty() &&
-                !port.isNullOrEmpty() &&
-                !hash.isNullOrEmpty() &&
-                !sessionId.isNullOrEmpty()
+    fun saveConnectionInfo(
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        sessionId: String
+    ) {
+        connectionInfo = PeerConnectionInfo(ip, port, expectedFingerprint, sessionId)
     }
 
+    fun getConnectionInfo(): PeerConnectionInfo? = connectionInfo
+
+    fun isSessionValid(): Boolean = connectionInfo != null
+
     fun clear() {
-        ip = null
-        port = null
-        hash = null
-        sessionId = null
+        connectionInfo = null
     }
-}
\ No newline at end of file
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 45db49c7d..8571977f6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -160,10 +160,7 @@ class PeerToPeerViewModel @Inject constructor(
             val result = peerClient.registerPeerDevice(ip, port, hash, pin)
             result.onSuccess { sessionId ->
                 Log.d("QRCode", "Registered successfully: $sessionId")
-                PeerSessionManager.ip = ip
-                PeerSessionManager.port = port
-                PeerSessionManager.hash = hash
-                PeerSessionManager.sessionId = sessionId
+                PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
                 // update UI state
                 _registrationSuccess.postValue(true)
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index b6721ed77..7e0a8fd58 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -61,33 +61,33 @@ class SenderViewModel @Inject constructor(
 
     fun prepareUploadsFromVaultFiles(
         files: List<VaultFile>,
-        ip: String,
-        port: String,
-        expectedFingerprint: String,
-        sessionId: String,
         title: String = "Title of the report"
     ) {
+        val info = PeerSessionManager.getConnectionInfo() ?: run {
+            Timber.e("Connection info missing")
+            return
+        }
+
         viewModelScope.launch {
             val successfulResponses = mutableListOf<PeerPrepareUploadResponse>()
 
             for (file in files) {
                 val result = peerClient.prepareUpload(
-                    ip = ip,
-                    port = port,
-                    expectedFingerprint = expectedFingerprint,
+                    ip = info.ip,
+                    port = info.port,
+                    expectedFingerprint = info.expectedFingerprint,
                     title = title,
                     file = File(file.path),
                     fileId = file.id,
                     sha256 = file.hash,
-                    sessionId = sessionId
+                    sessionId = info.sessionId
                 )
 
                 result.onSuccess { transmissionId ->
                     Timber.d("Success: transmissionId = $transmissionId")
                     successfulResponses.add(PeerPrepareUploadResponse(transmissionId))
                 }.onFailure {
-                    Timber.e(it, "Failed to prepare upload")
-                    // You can log or ignore errors here — not returned to LiveData
+                    Timber.e(it, "Failed to prepare upload for file: ${file.name}")
                 }
             }
 
@@ -96,6 +96,7 @@ class SenderViewModel @Inject constructor(
     }
 
 
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index d7f29e516..2adeb0d19 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -262,16 +262,9 @@ class PrepareUploadFragment :
         binding.sendReportBtn.setOnClickListener {
             binding.sendReportBtn.setOnClickListener {
                 if (isSubmitEnabled) {
-                    val selectedFiles = filesRecyclerViewAdapter.getFiles()// however you get selected VaultFiles
-
+                    val selectedFiles = filesRecyclerViewAdapter.getFiles()
                     if (selectedFiles.isNotEmpty()) {
-                        viewModel.prepareUploadsFromVaultFiles(
-                            files = selectedFiles,
-                            ip = "",
-                            port = "",
-                            expectedFingerprint = "",
-                            sessionId = ""
-                        )
+                        viewModel.prepareUploadsFromVaultFiles(selectedFiles)
                     } else {
                         showToast("No file selected")
                     }

From b276dbf0f8ad4b62b91e62127084727275c2ae88 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 3 Jun 2025 19:52:34 +0100
Subject: [PATCH 013/153] wip prepareUpload flow and api change

---
 .../tella/mobile/data/peertopeer/FileItem.kt  |   4 +-
 .../data/peertopeer/PrepareUploadRequest.kt   |   5 +-
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 105 +++++++++---------
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  19 +---
 .../tella/mobile/util/NavigationManager.kt    |   9 +-
 .../fragment/peertopeer/SenderViewModel.kt    |  40 +++----
 .../fragment/peertopeer/WaitingFragment.kt    |  27 +++++
 .../receipentflow/ConnectHotspotFragment.kt   |   1 +
 .../receipentflow/QRCodeFragment.kt           |   7 ++
 .../senderflow/PrepareUploadFragment.kt       |   7 +-
 .../senderflow/ScanQrCodeFragment.kt          |   2 +-
 .../src/main/res/layout/fragment_waiting.xml  |  54 +++++++++
 .../res/navigation/peer_to_peer_graph.xml     |  14 ++-
 13 files changed, 195 insertions(+), 99 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
 create mode 100644 mobile/src/main/res/layout/fragment_waiting.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
index 1c0d3c2dd..8c4071fac 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
@@ -3,10 +3,10 @@ package org.horizontal.tella.mobile.data.peertopeer
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class FileItem(
+data class P2PFile(
     val id: String,
     val fileName: String,
     val size: Long,
     val fileType: String,
     val sha256: String
-)
\ No newline at end of file
+)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
index e6e8b9aa8..2653e826a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
@@ -1,10 +1,11 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class PrepareUploadRequest(
     val title: String,
-    val sessionId: String,
-    val files: List<FileItem>
+    @SerialName("sessionId") val sessionId: String,
+    val files: List<P2PFile>
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 01075581b..04d03cb4b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -1,6 +1,7 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
 import android.util.Log
+import com.hzontal.tella_vault.VaultFile
 import kotlinx.serialization.encodeToString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -119,66 +120,66 @@ class TellaPeerToPeerClient {
         ip: String,
         port: String,
         expectedFingerprint: String,
-        title: String = "Title of the report",
-        file: File,
-        fileId: String,
-        sha256: String,
+        title: String,
+        files: List<VaultFile>,
         sessionId: String
-    ): Result<String> {
-        return withContext(Dispatchers.IO) {
-            val url = "https://$ip:$port/api/v1/prepare-upload"
-
-            val fileItem = FileItem(
-                id = fileId,
-                fileName = file.name,
-                size = file.length(),
-                fileType = "application/octet-stream",
-                sha256 = sha256
+    ): Result<String> = withContext(Dispatchers.IO) {
+        val url = "https://$ip:$port/api/v1/prepare-upload"
+
+        val fileItems = files.map {
+            P2PFile(
+                id = it.id,
+                fileName = it.name,
+                size = it.size,
+                fileType = "application/octet-stream", // or detect mime type
+                sha256 = it.hash
             )
+        }
 
-            val requestPayload = PrepareUploadRequest(
-                title = title,
-                sessionId = sessionId,
-                files = listOf(fileItem)
-            )
+        val requestPayload = PrepareUploadRequest(
+            title = title,
+            sessionId = sessionId,
+            files = fileItems
+        )
 
-            val jsonPayload = Json.encodeToString(requestPayload)
-            val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
-            Log.d("PeerClient", "Request payload: $requestBody")
-            val client = getClientWithFingerprintValidation(expectedFingerprint)
+        val jsonPayload = Json.encodeToString(requestPayload)
+        val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
+        val client = getClientWithFingerprintValidation(expectedFingerprint)
+
+        try {
+            val request = Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .addHeader("Content-Type", "application/json")
+                .build()
 
-            try {
-                val request = Request.Builder()
-                    .url(url)
-                    .post(requestBody)
-                    .addHeader("Content-Type", "application/json")
-                    .build()
-
-                client.newCall(request).execute().use { response ->
-                    if (response.isSuccessful) {
-                        val responseBody = response.body?.string()
-                        responseBody?.let {
-                            val jsonObject = JSONObject(it)
-                            val transmissionId = jsonObject.getString("transmissionId")
-                            Log.d("PrepareUpload", "Transmission ID: $transmissionId")
-                            return@use Result.success(transmissionId)
-                        }
-                    } else {
-                        Log.e("PrepareUpload", "Error ${response.code}: ${response.message}")
-                        when (response.code) {
-                            409 -> {
-                                Log.e("PrepareUpload", "Conflict: Try canceling active sessions.")
-                            }
-
-                            else -> {}
-                        }
+            client.newCall(request).execute().use { response ->
+                val body = response.body?.string()
+
+                if (response.isSuccessful && body != null) {
+                    return@use try {
+                        val transmissionId = JSONObject(body).getString("transmissionId")
+                        Result.success(transmissionId)
+                    } catch (e: Exception) {
+                        Log.e("PrepareUpload", "Invalid JSON response: $body", e)
+                        Result.failure(Exception("Malformed server response"))
                     }
+                } else {
+                    Log.e("PrepareUpload", "Server error ${response.code}: ${response.message}")
+                    when (response.code) {
+                        400 -> Log.e("PrepareUpload", "Bad Request – likely missing or invalid fields.")
+                        409 -> Log.e("PrepareUpload", "Conflict – maybe another active session.")
+                        500 -> Log.e("PrepareUpload", "Internal Server Error – try again later.")
+                        else -> Log.e("PrepareUpload", "Unhandled server error code.")
+                    }
+                    return@use Result.failure(Exception("Server returned error ${response.code}"))
                 }
-                Result.failure(Exception("Unsuccessful response"))
-            } catch (e: Exception) {
-                Log.e("PrepareUpload", "Exception: ${e.message}", e)
-                Result.failure(e)
             }
+
+            Result.failure(Exception("No response from server"))
+        } catch (e: Exception) {
+            Log.e("PrepareUpload", "Exception during upload: ${e.message}", e)
+            Result.failure(e)
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index edb47fe4e..fb622bd3b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -14,6 +14,7 @@ import io.ktor.server.engine.sslConnector
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
+import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
@@ -96,30 +97,22 @@ class TellaPeerToPeerServer(
                             HttpStatusCode.OK
                         )
                     }
-
-
                     post("/api/v1/prepare-upload") {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
                         } catch (e: Exception) {
-                            call.respondText("Invalid body", status = HttpStatusCode.BadRequest)
+                            call.respond(HttpStatusCode.BadRequest, "Invalid body: ${e.message}")
                             return@post
                         }
 
                         if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
-                            call.respondText(
-                                "Missing required fields",
-                                status = HttpStatusCode.BadRequest
-                            )
+                            call.respond(HttpStatusCode.BadRequest, "Missing required fields")
                             return@post
                         }
-
-                        // we can process the files or store metadata here
                         val transmissionId = UUID.randomUUID().toString()
-                        call.respondText(
-                            Gson().toJson(PeerPrepareUploadResponse(transmissionId)),
-                            ContentType.Application.Json,
-                            HttpStatusCode.OK
+                        call.respond(
+                            HttpStatusCode.OK,
+                            PeerPrepareUploadResponse(transmissionId)
                         )
                     }
                 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 528ebe74e..ca7a91f1e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -184,11 +184,18 @@ class NavigationManager(
     fun navigateFromScanQrCodeToDeviceInfo() {
         navigateToWithBundle(R.id.action_qrCodeScreen_to_deviceInfoScreen)
     }
-    fun navigateFromScanQrCodeTo() {
+    fun navigateFromScanQrCodeToPrepareUploadFragment() {
         navigateToWithBundle(R.id.action_scanQrCodeScreen_to_prepareUploadFragment)
     }
 
     fun navigateFromScanQrCodeToSenderManualConnectionScreen() {
         navigateToWithBundle(R.id.action_scanQrCodeScreen_to_senderManualConnectionScreen)
     }
+    fun navigateFromQrCodeScreenToWaitingFragment() {
+        navigateToWithBundle(R.id.action_qrCodeScreen_to_waitingFragment)
+    }
+
+    fun navigateFromPrepareUploadFragmentToWaitingFragment() {
+        navigateToWithBundle(R.id.action_prepareUploadFragment_to_waitingFragment)
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 7e0a8fd58..8b399337e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -26,8 +26,8 @@ import javax.inject.Inject
 class SenderViewModel @Inject constructor(
     private val peerClient: TellaPeerToPeerClient
 ) : ViewModel() {
-    private val _prepareResults = MutableLiveData<List<PeerPrepareUploadResponse>>()
-    val prepareResults: LiveData<List<PeerPrepareUploadResponse>> = _prepareResults
+    private val _prepareResults = MutableLiveData<PeerPrepareUploadResponse>()
+    val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -69,34 +69,26 @@ class SenderViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
-            val successfulResponses = mutableListOf<PeerPrepareUploadResponse>()
+            val result = peerClient.prepareUpload(
+                ip = info.ip,
+                port = info.port,
+                expectedFingerprint = info.expectedFingerprint,
+                title = title,
+                files = files,
+                sessionId = info.sessionId
+            )
 
-            for (file in files) {
-                val result = peerClient.prepareUpload(
-                    ip = info.ip,
-                    port = info.port,
-                    expectedFingerprint = info.expectedFingerprint,
-                    title = title,
-                    file = File(file.path),
-                    fileId = file.id,
-                    sha256 = file.hash,
-                    sessionId = info.sessionId
-                )
-
-                result.onSuccess { transmissionId ->
-                    Timber.d("Success: transmissionId = $transmissionId")
-                    successfulResponses.add(PeerPrepareUploadResponse(transmissionId))
-                }.onFailure {
-                    Timber.e(it, "Failed to prepare upload for file: ${file.name}")
-                }
+            result.onSuccess { transmissionId ->
+                Timber.d("Success: transmissionId = $transmissionId")
+                _prepareResults.postValue(PeerPrepareUploadResponse(transmissionId))
+            }.onFailure { error ->
+                Timber.e(error, "Failed to prepare upload for  ${files.size} files")
+                // Optionally post a failure state to LiveData if needed
             }
-
-            _prepareResults.postValue(successfulResponses)
         }
     }
 
 
-
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
new file mode 100644
index 000000000..62bfe5492
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -0,0 +1,27 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import android.os.Bundle
+import android.view.View
+import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+/**
+ * Created by wafa on 3/6/2025.
+ */
+class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate){
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val isSender = arguments?.getBoolean("isSender") ?: false
+
+        if (isSender) {
+            binding.waitingText.text = "Waiting for the sender to share files"
+        } else {
+            binding.waitingText.text = "Waiting for the recipient to accept files"
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index b2f5e9ed2..4331fb4fe 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -57,6 +57,7 @@ class ConnectHotspotFragment :
         binding.nextBtn.setOnClickListener { }
 
         binding.backBtn.setOnClickListener { baseActivity.onBackPressed() }
+
     }
 
     private fun updateNextButtonState(connectionType: ConnectionType?) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index a0efe6c9a..70e38c04f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -35,6 +35,13 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
         handleBack()
         handleConnectManually()
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingFragment()
+            } else {
+            }
+        }
     }
 
     private fun setupServerAndQr(ip: String) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 2adeb0d19..a7629e52c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -89,11 +89,9 @@ class PrepareUploadFragment :
             isNewDraft = false
         }
 
-        viewModel.prepareResults.observe(viewLifecycleOwner) { responses ->
-            responses.forEach { response ->
+        viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
                 val id = response.transmissionId
                 // navigate to next screen
-            }
         }
         highLightButtonsInit()
         checkIsNewDraftEntry()
@@ -265,6 +263,9 @@ class PrepareUploadFragment :
                     val selectedFiles = filesRecyclerViewAdapter.getFiles()
                     if (selectedFiles.isNotEmpty()) {
                         viewModel.prepareUploadsFromVaultFiles(selectedFiles)
+                        // navigate to waiting view
+                        bundle.putBoolean("isSender", true)
+                        navManager().navigateFromPrepareUploadFragmentToWaitingFragment()
                     } else {
                         showToast("No file selected")
                     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 27938c6dc..cc39341ee 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -35,7 +35,7 @@ class ScanQrCodeFragment :
         barcodeView = binding.qrCodeScanView
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                navManager().navigateFromScanQrCodeTo()
+                navManager().navigateFromScanQrCodeToPrepareUploadFragment()
             } else {
                 //  handle error UI
             }
diff --git a/mobile/src/main/res/layout/fragment_waiting.xml b/mobile/src/main/res/layout/fragment_waiting.xml
new file mode 100644
index 000000000..43f87cad7
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_waiting.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/wa_purple">
+
+            <org.hzontal.shared_ui.appbar.ToolbarComponent
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:arrowBackIcon="@drawable/ic_back_white"
+                app:arrowBackIconContentDescription="@string/action_go_back"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                app:rightIconContentDescription="@string/action_save"
+                app:startTitle="@string/send_files" />
+        <TextView
+            android:id="@+id/waiting_text"
+            style="@style/Tella_Main_White_TextExtraLargeBold"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_large_margin"
+            android:text="Waiting for the recipient to accept files"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/clock_Img"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/later_clock_white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/waiting_text"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 046e4ed78..8e604430e 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -58,6 +58,9 @@
         <action
             android:id="@+id/action_qrCodeScreen_to_deviceInfoScreen"
             app:destination="@id/deviceInfoScreen" />
+        <action
+            android:id="@+id/action_qrCodeScreen_to_waitingFragment"
+            app:destination="@id/waitingFragment" />
     </fragment>
 
     <fragment
@@ -81,7 +84,11 @@
         android:id="@+id/prepareUploadFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PrepareUploadFragment"
         android:label="PrepareUploadFragment"
-        tools:layout="@layout/fragment_prepare_upload" />
+        tools:layout="@layout/fragment_prepare_upload" >
+        <action
+            android:id="@+id/action_prepareUploadFragment_to_waitingFragment"
+            app:destination="@id/waitingFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/senderManualConnectionScreen"
@@ -92,5 +99,10 @@
             android:id="@+id/action_senderManualConnectionScreen_to_connectManuallyVerificationFragment"
             app:destination="@id/connectManuallyVerificationFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/waitingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingFragment"
+        tools:layout="@layout/fragment_waiting"
+        android:label="WaitingFragment" />
 
 </navigation>
\ No newline at end of file

From e9507aebe98373145540f0ff338380bbe6137e25 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 3 Jun 2025 21:53:55 +0100
Subject: [PATCH 014/153] wip manual connection

---
 mobile/build.gradle                           |  2 +
 .../data/peertopeer/FingerprintFetcher.kt     |  2 +-
 .../data/peertopeer/PeerToPeerManager.kt      | 13 ++++
 .../mobile/data/peertopeer/ServerPinger.kt    | 31 ++++++++++
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 16 ++++-
 .../tella/mobile/util/NavigationManager.kt    |  8 +++
 .../fragment/peertopeer/PeerSessionManager.kt | 10 +--
 .../peertopeer/PeerToPeerViewModel.kt         | 62 +++++++------------
 .../fragment/peertopeer/di/PeerModule.kt      |  7 +++
 .../receipentflow/QRCodeFragment.kt           | 16 +++--
 .../RecipientVerificationFragment.kt          | 14 +++--
 .../receipentflow/ShowDeviceInfoFragment.kt   | 24 +++++++
 .../SenderManualConnectionFragment.kt         | 20 +++++-
 .../senderflow/SenderVerificationFragment.kt  | 18 +++---
 .../res/navigation/peer_to_peer_graph.xml     |  6 +-
 15 files changed, 183 insertions(+), 66 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 82690e516..6b98157d2 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -243,6 +243,8 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:2.3.9")
     implementation("io.ktor:ktor-server-content-negotiation:2.3.9")
     implementation("io.ktor:ktor-server-cio:2.3.9")
+    implementation "io.ktor:ktor-server-call-logging:2.3.9" // or your current version
+
 
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3' // Use the latest version
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
index d36c87530..fbe1832d3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -37,7 +37,7 @@ object FingerprintFetcher {
         return socket
     }
 
-    private class TrustAllCerts : X509TrustManager {
+    class TrustAllCerts : X509TrustManager {
         override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
         override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
         override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt
new file mode 100644
index 000000000..b38314cb8
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt
@@ -0,0 +1,13 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+class PeerToPeerManager {
+    private val _clientConnected = MutableSharedFlow<String>(replay = 0)
+    val clientConnected = _clientConnected.asSharedFlow()
+
+    suspend fun notifyClientConnected(hash : String) {
+        _clientConnected.emit(hash)
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt
new file mode 100644
index 000000000..43a8acbad
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt
@@ -0,0 +1,31 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import java.security.SecureRandom
+import javax.net.ssl.SSLContext
+
+object ServerPinger {
+    fun notifyServer(ip: String, port: Int) {
+        val trustAllCerts = FingerprintFetcher.TrustAllCerts()
+        val sslContext = SSLContext.getInstance("TLS")
+        sslContext.init(null, arrayOf(trustAllCerts), SecureRandom())
+
+        val client = OkHttpClient.Builder()
+            .sslSocketFactory(sslContext.socketFactory, trustAllCerts)
+            .hostnameVerifier { _, _ -> true }
+            .build()
+
+        val request = Request.Builder()
+            .url("https://$ip:$port/api/v1/ping")
+            .post(RequestBody.create(null, ByteArray(0)))
+            .build()
+
+        client.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) {
+                throw RuntimeException("Failed to notify server: ${response.code}")
+            }
+        }
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index fb622bd3b..52811c5db 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -16,9 +16,13 @@ import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
+import io.ktor.server.plugins.callloging.CallLogging
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
@@ -37,7 +41,8 @@ class TellaPeerToPeerServer(
     private val serverPort: Int = port,
     private val keyPair: KeyPair,
     private val certificate: X509Certificate,
-    private val keyStoreConfig: KeyStoreConfig
+    private val keyStoreConfig: KeyStoreConfig,
+    private val peerToPeerManager: PeerToPeerManager
 ) : TellaServer {
 
     private var engine: ApplicationEngine? = null
@@ -57,6 +62,7 @@ class TellaPeerToPeerServer(
         }
 
         engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
+            var firstConnectionReceived = false
             sslConnector(
                 keyStore = keyStore,
                 keyAlias = keyStoreConfig.alias,
@@ -78,6 +84,14 @@ class TellaPeerToPeerServer(
                         call.respondText("The server is running securely over HTTPS.")
                     }
 
+                    post("/api/v1/ping") {
+                        val hash = CertificateUtils.getPublicKeyHash(certificate)
+                        CoroutineScope(Dispatchers.IO).launch {
+                            peerToPeerManager.notifyClientConnected(hash)
+                        }
+                        call.respondText("pong", status = HttpStatusCode.OK)
+                    }
+
                     post("/api/v1/register") {
                         val request = try {
                             call.receive<PeerRegisterPayload>()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index ca7a91f1e..dc8ac233a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -191,6 +191,14 @@ class NavigationManager(
     fun navigateFromScanQrCodeToSenderManualConnectionScreen() {
         navigateToWithBundle(R.id.action_scanQrCodeScreen_to_senderManualConnectionScreen)
     }
+
+    fun navigateFromSenderManualConnectionToConnectManuallyVerification() {
+        navigateToWithBundle(R.id.action_senderManualConnectionScreen_to_connectManuallyVerificationScreen)
+    }
+
+    fun navigateFromDeviceInfoScreenTRecipientVerificationScreen(){
+        navigateToWithBundle(R.id.action_deviceInfoScreen_to_recipientVerificationScreen)
+    }
     fun navigateFromQrCodeScreenToWaitingFragment() {
         navigateToWithBundle(R.id.action_qrCodeScreen_to_waitingFragment)
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
index 7bba9c878..b5f8caa3e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -5,10 +5,12 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
  */
 
 data class PeerConnectionInfo(
-    val ip: String,
-    val port: String,
-    val expectedFingerprint: String,
-    val sessionId: String
+    val ip: String = "",
+    val port: String = "",
+    val expectedFingerprint: String = "",
+    val sessionId: String = "",
+    val hash: String = "",
+    val pin: Int = 0
 )
 
 object PeerSessionManager {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 8571977f6..6843e6a31 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -17,23 +17,25 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
 import java.net.Inet4Address
 import java.net.NetworkInterface
-import java.security.MessageDigest
 import javax.inject.Inject
 
 @HiltViewModel
 class PeerToPeerViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val peerClient: TellaPeerToPeerClient
+    private val peerClient: TellaPeerToPeerClient,
+    private val peerToPeerManager: PeerToPeerManager
 ) : ViewModel() {
 
     private val _networkInfo = MutableLiveData<NetworkInfo>()
@@ -45,6 +47,11 @@ class PeerToPeerViewModel @Inject constructor(
     val getHashSuccess: LiveData<String> get() = _getHashSuccess
     private val _getHashError = MutableLiveData<Throwable>()
     val getHashError: LiveData<Throwable> get() = _getHashError
+    private val _sessionInfo = MutableStateFlow<PeerConnectionInfo?>(null)
+    val sessionInfo: StateFlow<PeerConnectionInfo?> = _sessionInfo
+
+    val clientHash = peerToPeerManager.clientConnected
+
 
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
@@ -159,7 +166,6 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             val result = peerClient.registerPeerDevice(ip, port, hash, pin)
             result.onSuccess { sessionId ->
-                Log.d("QRCode", "Registered successfully: $sessionId")
                 PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
                 // update UI state
                 _registrationSuccess.postValue(true)
@@ -172,47 +178,25 @@ class PeerToPeerViewModel @Inject constructor(
             val result = FingerprintFetcher.fetch(ip, port.toInt())
 
             result.onSuccess { hash ->
-                _getHashSuccess.postValue(hash)
                 Timber.d("hash ***** $hash")
+                _getHashSuccess.postValue(hash)
+
+                // Notify the server after fetching the hash
+                runCatching {
+                    ServerPinger.notifyServer(ip, port.toInt())
+                }.onFailure {
+                    Timber.e(it, "Failed to ping server after fetching hash")
+                }
+
             }.onFailure { error ->
-                _getHashError.postValue(error)
                 Timber.d("error ***** $error")
+                _getHashError.postValue(error)
             }
-
         }
     }
 
 
-    private fun createFileFromAsset(context: Context, assetFileName: String): File {
-        // Create a temporary file in the cache directory
-        val tempFile = File(context.cacheDir, assetFileName)
-
-        if (!tempFile.exists()) {
-            Log.e("PrepareUpload", "File does not exist: ${tempFile.absolutePath}")
-        }
-
-        // Open the asset file
-        context.assets.open(assetFileName).use { inputStream ->
-            // Write the content of the asset to the temporary file
-            FileOutputStream(tempFile).use { outputStream ->
-                inputStream.copyTo(outputStream)
-            }
-        }
-
-        return tempFile
+    fun setPeerSessionInfo(info: PeerConnectionInfo) {
+        _sessionInfo.value = info
     }
-
-    private fun calculateSha256(file: File): String {
-        val digest = MessageDigest.getInstance("SHA-256")
-        file.inputStream().use { input ->
-            val buffer = ByteArray(8192)
-            var bytesRead: Int
-            while (input.read(buffer).also { bytesRead = it } != -1) {
-                digest.update(buffer, 0, bytesRead)
-            }
-        }
-        return digest.digest().joinToString("") { "%02x".format(it) }
-    }
-
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index fefe59992..f47f324c3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import javax.inject.Singleton
 
@@ -16,4 +17,10 @@ object PeerModule {
     fun providePeerClient(): TellaPeerToPeerClient {
         return TellaPeerToPeerClient()
     }
+
+    @Provides
+    @Singleton
+    fun providePeerToPeerManager(): PeerToPeerManager {
+        return PeerToPeerManager()
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 70e38c04f..d97b8f180 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -4,12 +4,15 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.WriterException
 import com.journeyapps.barcodescanner.BarcodeEncoder
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
 import org.horizontal.tella.mobile.data.peertopeer.port
@@ -18,7 +21,9 @@ import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCodeBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
@@ -26,6 +31,9 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     private var payload: PeerConnectionPayload? = null
     private lateinit var qrPayload: String
 
+    @Inject
+    lateinit var peerToPeerManager: PeerToPeerManager
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -52,7 +60,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
             ip = ip,
             keyPair = keyPair,
             certificate = certificate,
-            keyStoreConfig = config
+            keyStoreConfig = config,
+            peerToPeerManager = peerToPeerManager
         )
         server?.start()
 
@@ -92,7 +101,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         binding.backBtn.setOnClickListener { nav().popBackStack() }
     }
 
-    private fun handleConnectManually(){
+    private fun handleConnectManually() {
         binding.connectManuallyButton.setOnClickListener {
             connectManually()
         }
@@ -105,8 +114,5 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
     }
 
-    // TODO NEXT STEPS
-    //TODO  WORK ON THE SENDER RESPONER
-    // TODO PREAPRE REGISTER RESPONE
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 9537fb46b..96b1d1c12 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -2,14 +2,17 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
-class RecipientVerificationFragment:
+class RecipientVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
-
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var payload: PeerConnectionPayload? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -22,10 +25,13 @@ class RecipientVerificationFragment:
     }
 
     private fun initView() {
-
+        lifecycleScope.launchWhenStarted {
+            viewModel.sessionInfo.collect { session ->
+                binding.hashContentTextView.text = session?.hash
+            }
+        }
     }
 
     private fun initListeners() {
-
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 354b39ac7..8aac3a8c2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -2,16 +2,23 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.databinding.ShowDeviceInfoLayoutBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
 class ShowDeviceInfoFragment :
     BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     private var payload: PeerConnectionPayload? = null
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         arguments?.getString("payload")?.let { payloadJson ->
@@ -19,6 +26,7 @@ class ShowDeviceInfoFragment :
         }
         initListeners()
         initView()
+        initObservers()
     }
 
     private fun initView() {
@@ -28,6 +36,22 @@ class ShowDeviceInfoFragment :
     }
 
     private fun initListeners() {
+        binding.backBtn.setOnClickListener { back() }
+    }
 
+    private fun initObservers() {
+        lifecycleScope.launch {
+            viewModel.clientHash.collect { hash ->
+                viewModel.setPeerSessionInfo(
+                    PeerConnectionInfo(
+                        ip = payload?.connectCode.toString(),
+                        port = payload?.port.toString(),
+                        pin = payload?.pin?.toInt()!!,
+                        hash = hash
+                    )
+                )
+                navManager().navigateFromDeviceInfoScreenTRecipientVerificationScreen()
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 75f5e3e22..4e2f08d43 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 
@@ -34,6 +35,8 @@ class SenderManualConnectionFragment :
             updateNextButtonState()
         }
 
+        initObservers()
+
         updateNextButtonState()
 
         KeyboardUtil(binding.root)
@@ -66,6 +69,18 @@ class SenderManualConnectionFragment :
             )
         )
         binding.nextBtn.setOnClickListener {
+            val ip = binding.connectCode.text.toString()
+            val port = binding.port.text.toString()
+            val pin = binding.pin.text.toString()
+
+            viewModel.setPeerSessionInfo(
+                PeerConnectionInfo(
+                    ip = ip,
+                    port = port,
+                    pin = pin.toInt()
+                )
+            ) // Store values
+
             viewModel.handleCertificate(
                 ip = binding.connectCode.text.toString(),
                 port = binding.port.text.toString(),
@@ -76,10 +91,13 @@ class SenderManualConnectionFragment :
 
     private fun initObservers() {
         viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
+            bundle.putString("hash", hash)
+            viewModel.setPeerSessionInfo(PeerConnectionInfo(hash = hash))
 
+            navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
         }
 
-        viewModel.getHashError.observe(viewLifecycleOwner) { error->
+        viewModel.getHashError.observe(viewLifecycleOwner) { error ->
             error.localizedMessage?.let { showToast(it) }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 9c322db74..3eecfc653 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -2,22 +2,19 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
 import android.os.Bundle
 import android.view.View
-import com.google.gson.Gson
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
-import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
-
-    private var payload: PeerConnectionPayload? = null
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        arguments?.getString("payload")?.let { payloadJson ->
-            payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
-        }
         initListeners()
         initView()
     }
@@ -25,9 +22,14 @@ class SenderVerificationFragment :
     private fun initView() {
         binding.titleDescTextView.text = getString(R.string.make_sure_sequence_matches_recipient)
         binding.warningTextView.text = getString(R.string.sequence_mismatch_warning_recipient)
+
     }
 
     private fun initListeners() {
-
+        lifecycleScope.launchWhenStarted {
+            viewModel.sessionInfo.collect { session ->
+                binding.hashContentTextView.text = session?.hash
+            }
+        }
     }
 }
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 8e604430e..0d63e55da 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -33,8 +33,8 @@
 
     <fragment
         android:id="@+id/connectManuallyVerificationFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientVerificationFragment"
-        android:label="ConnectManuallyVerificationFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderVerificationFragment"
+        android:label="ConnectManuallyVerificationScreen"
         tools:layout="@layout/connect_manually_verification" />
 
     <fragment
@@ -96,7 +96,7 @@
         android:label="SenderManualConnectionScreen"
         tools:layout="@layout/sender_manual_connection">
         <action
-            android:id="@+id/action_senderManualConnectionScreen_to_connectManuallyVerificationFragment"
+            android:id="@+id/action_senderManualConnectionScreen_to_connectManuallyVerificationScreen"
             app:destination="@id/connectManuallyVerificationFragment" />
     </fragment>
     <fragment

From 9bc9b808761c6d046c315f22db0195976eb74c4e Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 00:20:07 +0100
Subject: [PATCH 015/153] WIP manual connection

---
 .../fragment/peertopeer/PeerToPeerViewModel.kt |  3 +--
 .../peertopeer/receipentflow/QRCodeFragment.kt | 18 +++++++++++-------
 .../receipentflow/ShowDeviceInfoFragment.kt    |  8 ++++++++
 .../senderflow/ScanQrCodeFragment.kt           |  2 +-
 .../SenderManualConnectionFragment.kt          |  2 +-
 .../senderflow/SenderVerificationFragment.kt   | 14 ++++++++++++++
 .../main/res/navigation/peer_to_peer_graph.xml |  4 ++--
 7 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 6843e6a31..a20ad0f99 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -8,7 +8,6 @@ import android.net.wifi.WifiInfo
 import android.net.wifi.WifiManager
 import android.os.Build
 import android.text.format.Formatter
-import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
@@ -162,7 +161,7 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-    fun onQrCodeParsed(ip: String, port: String, hash: String, pin: String) {
+    fun startRegistration(ip: String, port: String, hash: String, pin: String) {
         viewModelScope.launch {
             val result = peerClient.registerPeerDevice(ip, port, hash, pin)
             result.onSuccess { sessionId ->
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index d97b8f180..1dd81d705 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -43,13 +43,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
         handleBack()
         handleConnectManually()
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingFragment()
-            } else {
-            }
-        }
+        initObservers()
     }
 
     private fun setupServerAndQr(ip: String) {
@@ -114,5 +108,15 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
     }
 
+    private fun initObservers() {
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingFragment()
+            } else {
+            }
+        }
+    }
+
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 8aac3a8c2..6f964d8ba 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -53,5 +53,13 @@ class ShowDeviceInfoFragment :
                 navManager().navigateFromDeviceInfoScreenTRecipientVerificationScreen()
             }
         }
+
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingFragment()
+            } else {
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index cc39341ee..ede4244fa 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -65,7 +65,7 @@ class ScanQrCodeFragment :
                     try {
                         val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
 
-                        viewModel.onQrCodeParsed(
+                        viewModel.startRegistration(
                             ip = payload.connectCode,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 4e2f08d43..84d981cfc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -91,7 +91,7 @@ class SenderManualConnectionFragment :
 
     private fun initObservers() {
         viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
-            bundle.putString("hash", hash)
+            bundle.putString("payload", hash)
             viewModel.setPeerSessionInfo(PeerConnectionInfo(hash = hash))
 
             navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 3eecfc653..2e16e3f8e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -7,11 +7,13 @@ import androidx.lifecycle.lifecycleScope
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private lateinit var peerConnectionInfo: PeerConnectionInfo
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -28,8 +30,20 @@ class SenderVerificationFragment :
     private fun initListeners() {
         lifecycleScope.launchWhenStarted {
             viewModel.sessionInfo.collect { session ->
+                if (session != null) {
+                    peerConnectionInfo = session
+                }
                 binding.hashContentTextView.text = session?.hash
             }
         }
+
+        binding.confirmAndConnectBtn.setOnClickListener {
+            viewModel.startRegistration(
+                ip = peerConnectionInfo.ip,
+                port = peerConnectionInfo.port,
+                hash = peerConnectionInfo.hash,
+                pin = peerConnectionInfo.pin.toString()
+            )
+        }
     }
 }
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 0d63e55da..99ebeaaff 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/startNearBySharingFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.StartNearBySharingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.prepareupload.StartNearBySharingFragment"
         android:label="StartNearBySharingFragment"
         tools:layout="@layout/start_near_by_sharing_fragment">
         <action
@@ -101,7 +101,7 @@
     </fragment>
     <fragment
         android:id="@+id/waitingFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.prepareupload.WaitingFragment"
         tools:layout="@layout/fragment_waiting"
         android:label="WaitingFragment" />
 

From 49cd5b117eeb92823bc32a2cbc3b8a8367583ea1 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 01:18:47 +0100
Subject: [PATCH 016/153] Finish manual connection

---
 .../tella/mobile/util/NavigationManager.kt    |  7 +++++++
 .../peertopeer/PeerToPeerViewModel.kt         |  3 +++
 .../RecipientVerificationFragment.kt          | 13 +++++++++++++
 .../senderflow/PrepareUploadFragment.kt       |  1 -
 .../senderflow/ScanQrCodeFragment.kt          | 19 ++++++++++++-------
 .../SenderManualConnectionFragment.kt         |  9 ++++++++-
 .../senderflow/SenderVerificationFragment.kt  | 11 +++++++++++
 .../res/navigation/peer_to_peer_graph.xml     | 16 ++++++++++++----
 8 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index dc8ac233a..ce138964b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -206,4 +206,11 @@ class NavigationManager(
     fun navigateFromPrepareUploadFragmentToWaitingFragment() {
         navigateToWithBundle(R.id.action_prepareUploadFragment_to_waitingFragment)
     }
+
+    fun navigateConnectManuallyVerificationFragmentToprepareUploadFragment(){
+        navigateToWithBundle(R.id.action_connectManuallyVerificationFragment_to_prepareUploadFragment)
+    }
+    fun navigateFromRecipientVerificationScreenToWaitingFragment(){
+        navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingFragment)
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index a20ad0f99..33c6003a3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -168,6 +168,9 @@ class PeerToPeerViewModel @Inject constructor(
                 PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
                 // update UI state
                 _registrationSuccess.postValue(true)
+            }.onFailure { error ->
+                Timber.d("error ***** $error")
+
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 96b1d1c12..4c778965e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -33,5 +33,18 @@ class RecipientVerificationFragment :
     }
 
     private fun initListeners() {
+        binding.confirmAndConnectBtn.setOnClickListener {
+
+        }
+    }
+
+    private fun initObservers() {
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+            } else {
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index a7629e52c..31af1c567 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -14,7 +14,6 @@ import com.hzontal.tella_vault.VaultFile
 import com.hzontal.tella_vault.filter.FilterType
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
-import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
 import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
 import org.horizontal.tella.mobile.media.MediaFileHandler
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index ede4244fa..99e265911 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -33,13 +33,7 @@ class ScanQrCodeFragment :
 
         barcodeView = CompoundBarcodeView(requireContext())
         barcodeView = binding.qrCodeScanView
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                navManager().navigateFromScanQrCodeToPrepareUploadFragment()
-            } else {
-                //  handle error UI
-            }
-        }
+
         if (ContextCompat.checkSelfPermission(
                 requireContext(),
                 Manifest.permission.CAMERA
@@ -53,6 +47,7 @@ class ScanQrCodeFragment :
         }
         handleBack()
         initListeners()
+        initObservers()
     }
 
     private fun startScanning() {
@@ -120,4 +115,14 @@ class ScanQrCodeFragment :
             navManager().navigateFromScanQrCodeToSenderManualConnectionScreen()
         }
     }
+
+    private fun initObservers(){
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                navManager().navigateFromScanQrCodeToPrepareUploadFragment()
+            } else {
+                //  handle error UI
+            }
+        }
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 84d981cfc..b6ab840a0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -92,7 +92,14 @@ class SenderManualConnectionFragment :
     private fun initObservers() {
         viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
             bundle.putString("payload", hash)
-            viewModel.setPeerSessionInfo(PeerConnectionInfo(hash = hash))
+            viewModel.setPeerSessionInfo(
+                PeerConnectionInfo(
+                    ip = binding.connectCode.text.toString(),
+                    port = binding.port.text.toString(),
+                    pin = binding.pin.text.toString().toInt(),
+                    hash = hash
+                )
+            )
 
             navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 2e16e3f8e..955d23e60 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -19,6 +19,7 @@ class SenderVerificationFragment :
         super.onViewCreated(view, savedInstanceState)
         initListeners()
         initView()
+        initObservers()
     }
 
     private fun initView() {
@@ -46,4 +47,14 @@ class SenderVerificationFragment :
             )
         }
     }
+
+    private fun initObservers() {
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
+            } else {
+                //  handle error UI
+            }
+        }
+    }
 }
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 99ebeaaff..7ecf1943f 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/startNearBySharingFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.prepareupload.StartNearBySharingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.StartNearBySharingFragment"
         android:label="StartNearBySharingFragment"
         tools:layout="@layout/start_near_by_sharing_fragment">
         <action
@@ -35,7 +35,11 @@
         android:id="@+id/connectManuallyVerificationFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderVerificationFragment"
         android:label="ConnectManuallyVerificationScreen"
-        tools:layout="@layout/connect_manually_verification" />
+        tools:layout="@layout/connect_manually_verification" >
+        <action
+            android:id="@+id/action_connectManuallyVerificationFragment_to_prepareUploadFragment"
+            app:destination="@id/prepareUploadFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/scanQrCodeScreen"
@@ -78,7 +82,11 @@
         android:id="@+id/recipientVerificationScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientVerificationFragment"
         android:label="RecipientVerificationScreen"
-        tools:layout="@layout/connect_manually_verification"/>
+        tools:layout="@layout/connect_manually_verification">
+        <action
+            android:id="@+id/action_recipientVerificationScreen_to_waitingFragment"
+            app:destination="@id/waitingFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/prepareUploadFragment"
@@ -101,7 +109,7 @@
     </fragment>
     <fragment
         android:id="@+id/waitingFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.prepareupload.WaitingFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingFragment"
         tools:layout="@layout/fragment_waiting"
         android:label="WaitingFragment" />
 

From 7e38153ae42bac5e9284a9e77623205f45ca56b5 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 10:19:22 +0100
Subject: [PATCH 017/153] wip navigation based on event emitted in the server
 api

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 10 ++++++
 .../fragment/peertopeer/PeerEventManager.kt   | 34 +++++++++++++++++++
 .../peertopeer/PeerToPeerViewModel.kt         | 27 ++++++++++++++-
 .../fragment/peertopeer/WaitingFragment.kt    |  2 +-
 .../receipentflow/QRCodeFragment.kt           | 10 ++++++
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 52811c5db..5b85fdcf6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -20,6 +20,8 @@ import io.ktor.server.plugins.callloging.CallLogging
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -29,6 +31,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerEventManager
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
@@ -105,11 +108,18 @@ class TellaPeerToPeerServer(
                         }
 
                         val sessionId = UUID.randomUUID().toString()
+
+                        // Emit registration success event asynchronously
+                        launch {
+                            PeerEventManager.emitRegistrationSuccess()
+                        }
+
                         call.respondText(
                             Gson().toJson(PeerResponse(sessionId)),
                             ContentType.Application.Json,
                             HttpStatusCode.OK
                         )
+
                     }
                     post("/api/v1/prepare-upload") {
                         val request = try {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
new file mode 100644
index 000000000..ae74c10cc
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
@@ -0,0 +1,34 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.response.respond
+import kotlinx.coroutines.flow.MutableSharedFlow
+import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
+
+/**
+ * Created by wafa on 3/6/2025.
+ */
+object PeerEventManager {
+
+    // MutableSharedFlow to emit registration events, replay 1 to send last event to new collectors
+    val registrationEvents = MutableSharedFlow<Boolean>(replay = 1)
+
+    // Call this when registration succeeds
+    suspend fun emitRegistrationSuccess() {
+        registrationEvents.emit(true)
+    }
+
+    // we can add emitRegistrationFailure or other event types if needed
+
+
+    val prepareUploadEvents =
+        MutableSharedFlow<Pair<PrepareUploadRequest, (Boolean) -> Unit>>(replay = 0)
+
+    suspend fun emitPrepareUploadRequest(
+        request: PrepareUploadRequest,
+        callback: (Boolean) -> Unit
+    ) {
+        prepareUploadEvents.emit(request to callback)
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 33c6003a3..a519cf3f5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -20,14 +20,18 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
+import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
 import timber.log.Timber
 import java.net.Inet4Address
 import java.net.NetworkInterface
+import java.security.MessageDigest
+import java.util.UUID
 import javax.inject.Inject
 
 @HiltViewModel
@@ -48,10 +52,32 @@ class PeerToPeerViewModel @Inject constructor(
     val getHashError: LiveData<Throwable> get() = _getHashError
     private val _sessionInfo = MutableStateFlow<PeerConnectionInfo?>(null)
     val sessionInfo: StateFlow<PeerConnectionInfo?> = _sessionInfo
+    private val _registrationServerSuccess = MutableLiveData<Boolean>()
+    val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
+    private val _incomingUploadRequest = MutableLiveData<PrepareUploadRequest>()
+    val incomingUploadRequest: LiveData<PrepareUploadRequest> = _incomingUploadRequest
 
     val clientHash = peerToPeerManager.clientConnected
 
 
+    init {
+        viewModelScope.launch {
+            PeerEventManager.incomingUploadRequests.collect { request ->
+                _incomingUploadRequest.postValue(request)
+            }
+        }
+    }
+
+    init {
+        viewModelScope.launch {
+            PeerEventManager.registrationEvents.collect { success ->
+                _registrationServerSuccess.postValue(success)
+            }
+        }
+    }
+    fun resetRegistrationState() {
+        _registrationServerSuccess.postValue(false)
+    }
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
     fun fetchCurrentNetworkInfo() {
@@ -178,7 +204,6 @@ class PeerToPeerViewModel @Inject constructor(
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
             val result = FingerprintFetcher.fetch(ip, port.toInt())
-
             result.onSuccess { hash ->
                 Timber.d("hash ***** $hash")
                 _getHashSuccess.postValue(hash)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index 62bfe5492..1e7327214 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -17,7 +17,7 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val isSender = arguments?.getBoolean("isSender") ?: false
 
-        if (isSender) {
+        if (!isSender) {
             binding.waitingText.text = "Waiting for the sender to share files"
         } else {
             binding.waitingText.text = "Waiting for the recipient to accept files"
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 1dd81d705..131e0b7b4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -43,6 +43,16 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
         handleBack()
         handleConnectManually()
+        viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                // Navigate to the next screen
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingFragment()
+                //  reset the LiveData state if we want to consume event once
+                viewModel.resetRegistrationState()
+            } else {
+            }
+        }
         initObservers()
     }
 

From 79cd1e22294921ed9ec706708a85498c66234ffc Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 10:24:21 +0100
Subject: [PATCH 018/153] comment the prepareUploadEvent

---
 .../fragment/peertopeer/PeerToPeerViewModel.kt     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index a519cf3f5..98c86766e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -60,13 +60,13 @@ class PeerToPeerViewModel @Inject constructor(
     val clientHash = peerToPeerManager.clientConnected
 
 
-    init {
-        viewModelScope.launch {
-            PeerEventManager.incomingUploadRequests.collect { request ->
-                _incomingUploadRequest.postValue(request)
-            }
-        }
-    }
+//    init {
+//        viewModelScope.launch {
+//            PeerEventManager.incomingUploadRequests.collect { request ->
+//                _incomingUploadRequest.postValue(request)
+//            }
+//        }
+//    }
 
     init {
         viewModelScope.launch {

From a7f6f4b94a9238b1589c75060c973c292b25a462 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 10:51:48 +0100
Subject: [PATCH 019/153] add the accept or reject files view and its
 navigation

---
 .../tella/mobile/util/NavigationManager.kt    |  3 +
 .../fragment/peertopeer/WaitingFragment.kt    |  5 +-
 .../receipentflow/RecipientSuccessFragment.kt | 24 +++++
 mobile/src/main/res/drawable/ic_files.xml     | 31 +++++++
 .../res/layout/fragment_recipient_success.xml | 91 +++++++++++++++++++
 .../res/navigation/peer_to_peer_graph.xml     | 15 ++-
 mobile/src/main/res/values/strings.xml        |  1 +
 7 files changed, 168 insertions(+), 2 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
 create mode 100644 mobile/src/main/res/drawable/ic_files.xml
 create mode 100644 mobile/src/main/res/layout/fragment_recipient_success.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index ce138964b..ba8d69358 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -213,4 +213,7 @@ class NavigationManager(
     fun navigateFromRecipientVerificationScreenToWaitingFragment(){
         navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingFragment)
     }
+    fun navigateFromWaitingFragmentToRecipientSuccessFragment(){
+        navigateToWithBundle(R.id.action_waitingFragment_to_recipientSuccessFragment)
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index 1e7327214..6a8f91469 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -2,6 +2,7 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 
@@ -18,8 +19,10 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
         val isSender = arguments?.getBoolean("isSender") ?: false
 
         if (!isSender) {
-            binding.waitingText.text = "Waiting for the sender to share files"
+            binding.toolbar.setToolbarTitle(getString(R.string.receive_files))
+            binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
         } else {
+            binding.toolbar.setToolbarTitle(getString(R.string.send_files))
             binding.waitingText.text = "Waiting for the recipient to accept files"
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
new file mode 100644
index 000000000..73731a4e8
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -0,0 +1,24 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.os.Bundle
+import android.view.View
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
+import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+/**
+ * Created by wafa on 3/6/2025.
+ */
+class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate){
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable/ic_files.xml b/mobile/src/main/res/drawable/ic_files.xml
new file mode 100644
index 000000000..684c3c57b
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_files.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="109dp"
+    android:height="109dp"
+    android:viewportWidth="109"
+    android:viewportHeight="109">
+  <group>
+    <clip-path
+        android:pathData="M0,0h109v109h-109z"/>
+    <path
+        android:pathData="M48.02,46C48.81,46.07 49.59,46.07 50.37,46C51.76,46.12 53.14,46.12 54.52,46C55.04,46.01 55.55,46.06 56.06,46.04C58.18,45.94 60.2,46.24 62,47.46C63.41,48.6 64.45,50.13 64.99,51.86C65.09,52.9 65.17,53.95 65.17,55.01C65.17,58.54 65.19,62.08 65.21,65.62C65.13,67.01 65.13,68.41 65.21,69.81C65.19,70.16 65.17,70.51 65.17,70.86C65.17,77.48 65.17,84.1 65.17,90.72C65.17,92.53 64.89,94.27 63.79,95.78C62.31,97.8 60.38,99.02 57.85,99.02C40.96,99.04 24.08,99.04 7.19,99.02C3.44,99.01 0.13,95.7 0.02,91.93C-0.01,90.9 0,89.88 0,88.85C0,76.56 0,64.27 0,51.97C0,50.43 0.78,49.53 2.08,49.55C3.32,49.57 4.11,50.49 4.11,51.97C4.11,64.97 4.11,77.96 4.11,90.96C4.11,92.61 4.67,93.91 6.25,94.62C6.83,94.85 7.45,94.96 8.07,94.94C24.39,94.94 40.71,94.94 57.03,94.94C59.6,94.94 60.99,93.53 60.99,90.97C60.99,83.91 60.98,76.86 60.96,69.81V65.62C60.96,61.63 61,57.63 60.96,53.64C60.94,51.83 59.65,50.5 57.86,50.28C56.76,50.15 55.65,50.22 54.54,50.25H43.87C39.3,50.24 34.74,50.23 30.17,50.22C29.71,50.22 29.24,50.28 28.81,50.09C28.42,49.94 28.08,49.67 27.84,49.33C27.59,48.98 27.46,48.57 27.46,48.15C27.42,47.42 27.44,46.69 27.43,45.96C27.42,44.93 27.17,44.67 26.13,44.66C22.81,44.66 19.49,44.66 16.16,44.66C14.84,44.66 13.51,44.66 12.18,44.66C10.9,44.66 10.67,44.9 10.67,46.17C10.67,57.71 10.67,69.25 10.67,80.78C10.67,82.81 10.67,84.83 10.67,86.86C10.67,88.36 9.84,89.31 8.57,89.29C7.25,89.28 6.49,88.4 6.49,86.85C6.49,74.34 6.49,61.83 6.49,49.32C6.49,48.18 6.47,47.05 6.49,45.92C6.56,42.57 8.68,40.49 12.02,40.47C16.69,40.46 21.37,40.46 26.04,40.47C29.22,40.47 31.22,42.24 31.6,45.38C31.65,45.76 31.64,46.06 32.16,46.05C36.05,46.03 39.94,46.02 43.83,46C45.22,46.12 46.63,46.12 48.02,46Z"
+        android:fillColor="#D6933B"/>
+    <path
+        android:pathData="M54.52,46C53.14,46.12 51.75,46.12 50.37,46C50.37,36.28 50.37,26.55 50.37,16.83C50.37,14.08 51.7,12.18 54.1,11.4C54.63,11.24 55.17,11.26 55.7,11.26C60.59,11.25 65.49,11.31 70.37,11.22C72.96,11.18 75.43,13.46 75.45,15.94C75.45,16.58 75.68,16.79 76.35,16.79C84.54,16.76 92.72,16.79 100.91,16.77C104.05,16.77 106.49,17.99 108.09,20.73C108.66,21.64 108.97,22.7 109,23.78C109.01,36.66 109.01,49.55 109,62.43C108.99,66.33 105.81,69.55 101.92,69.78C101.57,69.8 101.22,69.81 100.87,69.81H65.2C65.12,68.41 65.12,67.01 65.2,65.62H100.94C103.49,65.62 104.89,64.23 104.89,61.66C104.9,49.36 104.9,37.07 104.89,24.78C104.92,24.21 104.82,23.65 104.6,23.12C103.86,21.49 102.53,20.92 100.82,20.92C92.44,20.94 84.06,20.94 75.69,20.92C74.97,20.92 74.23,20.94 73.5,20.92C72.16,20.87 71.41,20.13 71.35,18.79C71.32,18.17 71.34,17.55 71.34,16.93C71.34,15.56 71.11,15.33 69.73,15.33H56.36C54.73,15.33 54.54,15.53 54.54,17.14C54.53,26.76 54.53,36.38 54.52,46Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M60.96,65.62V69.81C57.86,69.81 54.76,69.83 51.65,69.81C47.9,69.78 44.93,67.46 44.05,63.91C43.92,63.39 43.85,62.86 43.85,62.32C43.84,58.3 43.85,54.28 43.85,50.26H48.01C48.01,54.12 48.01,57.97 48.01,61.83C48.01,64.2 49.43,65.62 51.81,65.62C54.87,65.63 57.92,65.62 60.96,65.62Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M48.02,46C46.63,46.12 45.23,46.12 43.83,46C43.83,38.33 43.84,30.67 43.85,23C43.85,22.7 43.86,22.41 43.89,22.11C44.03,20.98 44.85,20.28 45.97,20.28C46.49,20.29 46.98,20.48 47.36,20.84C47.74,21.19 47.96,21.67 48,22.19C48.03,22.48 48.02,22.78 48.02,23.08C48.02,30.72 48.02,38.36 48.02,46Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M18.19,70.7C18.19,67.92 18.19,65.14 18.19,62.36C18.19,61.01 18.98,60.12 20.18,60.07C21.41,60.03 22.33,60.92 22.34,62.28C22.36,67.92 22.36,73.57 22.34,79.21C22.34,79.48 22.29,79.75 22.19,80C22.09,80.25 21.94,80.48 21.76,80.68C21.57,80.87 21.34,81.02 21.09,81.13C20.85,81.24 20.58,81.3 20.31,81.3C19.1,81.3 18.2,80.39 18.2,79.13C18.18,76.32 18.19,73.51 18.19,70.7Z"
+        android:fillColor="#D6933B"/>
+    <path
+        android:pathData="M62,47.46C62.01,46.09 62.04,44.71 62.04,43.34C62.04,40.1 62.04,36.86 62.04,33.62C62.04,33.24 62.07,32.87 62.12,32.49C62.21,32 62.47,31.55 62.86,31.23C63.25,30.92 63.74,30.75 64.24,30.77C64.76,30.79 65.25,31.01 65.61,31.38C65.97,31.75 66.18,32.24 66.19,32.76C66.23,34 66.19,35.24 66.19,36.49C66.19,40.88 66.18,45.28 66.2,49.69C66.2,50.68 65.87,51.41 64.97,51.86C64.43,50.13 63.4,48.6 62,47.46Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M54.55,50.25C54.55,52.82 54.55,55.38 54.53,57.95C54.54,58.39 54.4,58.83 54.13,59.19C53.87,59.55 53.49,59.81 53.06,59.94C52.61,60.07 52.12,60.04 51.68,59.86C51.24,59.68 50.87,59.36 50.64,58.95C50.34,58.46 50.38,57.91 50.38,57.38C50.35,55 50.35,52.63 50.33,50.25H54.55Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/mobile/src/main/res/layout/fragment_recipient_success.xml b/mobile/src/main/res/layout/fragment_recipient_success.xml
new file mode 100644
index 000000000..2024ba579
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_recipient_success.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/wa_purple">
+
+            <org.hzontal.shared_ui.appbar.ToolbarComponent
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:arrowBackIcon="@drawable/ic_back_white"
+                app:arrowBackIconContentDescription="@string/action_go_back"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                app:rightIconContentDescription="@string/action_save"
+                app:startTitle="@string/receive_files" />
+        <TextView
+            android:id="@+id/waiting_text"
+            style="@style/Tella_Main_White_TextExtraLargeBold"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_large_margin"
+            android:text="The sender is trying to send you 6 files"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+        <TextView
+            android:id="@+id/question_text"
+            style="@style/Tella_Main_White_Text.Meduim"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_large_margin"
+            android:text="Would you like to accept them?"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/waiting_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/clock_Img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:background="@drawable/ic_files"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/waiting_text"
+            app:layout_constraintVertical_chainStyle="packed" />
+        <org.hzontal.shared_ui.buttons.RoundButton
+            android:id="@+id/accept_btn"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
+            android:layout_marginTop="50dp"
+            android:background="@drawable/bg_round_orange_btn"
+            app:text_color="@color/btn_dark_letter"
+            app:text="ACCEPT"
+            app:check_state="false"
+            app:layout_constraintBottom_toTopOf="@+id/reject_btn"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/question_text" />
+
+        <org.hzontal.shared_ui.buttons.RoundButton
+            android:id="@+id/reject_btn"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            app:check_state="false"
+            android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            app:text="REJECT"
+            app:layout_constraintTop_toBottomOf="@+id/accept_btn" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 7ecf1943f..1442900e1 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -111,6 +111,19 @@
         android:id="@+id/waitingFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingFragment"
         tools:layout="@layout/fragment_waiting"
-        android:label="WaitingFragment" />
+        android:label="WaitingFragment" >
+        <action
+            android:id="@+id/action_waitingFragment_to_recipientSuccessFragment"
+            app:destination="@id/recipientSuccessFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/successConnectFragment"
+        android:name="org.horizontal.tella.mobile.views.dialog.uwazi.step6.SuccessConnectFragment"
+        android:label="SuccessConnectFragment" />
+    <fragment
+        android:id="@+id/recipientSuccessFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientSuccessFragment"
+        tools:layout="@layout/fragment_recipient_success"
+        android:label="RecipientSuccessFragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index e98c87573..f157f071e 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1040,4 +1040,5 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="make_sure_sequence_matches_recipient">Make sure that this sequence matches what is shown on the recipient’s device.</string>
   <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
   <string name="discard_and_start_over">Discard and start over</string>
+    <string name="waiting_for_the_sender_to_share_files">Waiting for the sender to share files</string>
 </resources>

From 5391b8aa679cf4691d67c1332895129e8372f57f Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 11:17:57 +0100
Subject: [PATCH 020/153] clean flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  4 +-
 .../managers/PeerServerStarterManager.kt      | 41 +++++++++++++++++++
 .../{ => managers}/PeerToPeerManager.kt       |  2 +-
 .../peertopeer/PeerToPeerViewModel.kt         |  5 +--
 .../fragment/peertopeer/di/PeerModule.kt      |  2 +-
 .../receipentflow/QRCodeFragment.kt           | 18 +++-----
 .../RecipientVerificationFragment.kt          |  1 +
 .../receipentflow/ShowDeviceInfoFragment.kt   |  1 +
 .../SenderManualConnectionFragment.kt         |  2 +
 .../senderflow/SenderVerificationFragment.kt  |  4 ++
 10 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
 rename mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/{ => managers}/PeerToPeerManager.kt (85%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 5b85fdcf6..f5950a808 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -16,16 +16,14 @@ import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
-import io.ktor.server.plugins.callloging.CallLogging
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
new file mode 100644
index 000000000..046ac8e5a
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -0,0 +1,41 @@
+package org.horizontal.tella.mobile.data.peertopeer.managers
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
+import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
+import java.security.KeyPair
+import java.security.cert.X509Certificate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PeerServerStarterManager @Inject constructor(
+    private val peerToPeerManager: PeerToPeerManager
+) {
+    private var server: TellaPeerToPeerServer? = null
+
+    fun startServer(ip: String, keyPair: KeyPair, cert: X509Certificate, config: KeyStoreConfig) {
+        if (server == null) {
+            server = TellaPeerToPeerServer(
+                ip = ip,
+                keyPair = keyPair,
+                certificate = cert,
+                keyStoreConfig = config,
+                peerToPeerManager = peerToPeerManager
+            )
+            server?.start()
+        }
+    }
+
+    //TODO: AHLEM CHECK WHERE WE WANT TO STOP THE SERVER
+    fun stopServer() {
+        CoroutineScope(Dispatchers.IO).launch {
+            server?.stop()
+            server = null
+        }
+    }
+
+    fun isRunning(): Boolean = server != null
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerToPeerManager.kt
similarity index 85%
rename from mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerToPeerManager.kt
index b38314cb8..f0ccbc4ae 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerToPeerManager.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.data.peertopeer
+package org.horizontal.tella.mobile.data.peertopeer.managers
 
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 98c86766e..f4e95965e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -21,17 +21,14 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
 import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
-import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
-import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
 import timber.log.Timber
 import java.net.Inet4Address
 import java.net.NetworkInterface
-import java.security.MessageDigest
-import java.util.UUID
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index f47f324c3..5fb51fbf1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import javax.inject.Singleton
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 131e0b7b4..2c4b98ab9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -4,7 +4,6 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.WriterException
@@ -12,9 +11,9 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
-import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
-import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.port
 import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
@@ -30,6 +29,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     private var server: TellaServer? = null
     private var payload: PeerConnectionPayload? = null
     private lateinit var qrPayload: String
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
 
     @Inject
     lateinit var peerToPeerManager: PeerToPeerManager
@@ -60,14 +61,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val (keyPair, certificate) = CertificateGenerator.generateCertificate(ipAddress = ip)
         val config = KeyStoreConfig()
 
-        server = TellaPeerToPeerServer(
-            ip = ip,
-            keyPair = keyPair,
-            certificate = certificate,
-            keyStoreConfig = config,
-            peerToPeerManager = peerToPeerManager
-        )
-        server?.start()
+        peerServerStarterManager.startServer(ip, keyPair, certificate, config)
+
 
         val certHash = CertificateUtils.getPublicKeyHash(certificate)
         val pin = "111111"
@@ -128,5 +123,4 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
     }
 
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 4c778965e..1ba6d6cdd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -22,6 +22,7 @@ class RecipientVerificationFragment :
         }
         initListeners()
         initView()
+        initObservers()
     }
 
     private fun initView() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 6f964d8ba..7e3e7c416 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -37,6 +37,7 @@ class ShowDeviceInfoFragment :
 
     private fun initListeners() {
         binding.backBtn.setOnClickListener { back() }
+        binding.toolbar.backClickListener = { nav().popBackStack() }
     }
 
     private fun initObservers() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index b6ab840a0..fe7c609c3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -68,6 +68,8 @@ class SenderManualConnectionFragment :
                 if (enabled) android.R.color.white else android.R.color.darker_gray
             )
         )
+        binding.toolbar.backClickListener = { nav().popBackStack() }
+        binding.backBtn.setOnClickListener { nav().popBackStack() }
         binding.nextBtn.setOnClickListener {
             val ip = binding.connectCode.text.toString()
             val port = binding.port.text.toString()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 955d23e60..704ef46e7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -46,6 +46,10 @@ class SenderVerificationFragment :
                 pin = peerConnectionInfo.pin.toString()
             )
         }
+
+        binding.discardBtn.setOnClickListener {
+
+        }
     }
 
     private fun initObservers() {

From c19c68ab2854aefcba3875f238cdb6f1f07366af Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 11:43:40 +0100
Subject: [PATCH 021/153] handle the accept reject flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 19 ++++++---
 .../fragment/peertopeer/PeerEventManager.kt   | 22 ++++++----
 .../peertopeer/PeerToPeerViewModel.kt         | 25 ++++++------
 .../fragment/peertopeer/WaitingFragment.kt    | 17 ++++++++
 .../receipentflow/RecipientSuccessFragment.kt | 40 ++++++++++++++++++-
 .../res/layout/fragment_recipient_success.xml |  2 +-
 mobile/src/main/res/values/strings.xml        |  2 +
 7 files changed, 101 insertions(+), 26 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index f5950a808..272f4bb7f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -131,11 +131,20 @@ class TellaPeerToPeerServer(
                             call.respond(HttpStatusCode.BadRequest, "Missing required fields")
                             return@post
                         }
-                        val transmissionId = UUID.randomUUID().toString()
-                        call.respond(
-                            HttpStatusCode.OK,
-                            PeerPrepareUploadResponse(transmissionId)
-                        )
+
+                        val accepted = PeerEventManager.emitPrepareUploadRequest(request)
+
+                        if (accepted) {
+                            val transmissionId = UUID.randomUUID().toString()
+                            call.respond(HttpStatusCode.OK, PeerPrepareUploadResponse(transmissionId))
+                        } else {
+                            call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
+                        }
+//                        val transmissionId = UUID.randomUUID().toString()
+//                        call.respond(
+//                            HttpStatusCode.OK,
+//                            PeerPrepareUploadResponse(transmissionId)
+//                        )
                     }
                 }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
index ae74c10cc..8185f82a8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
@@ -3,7 +3,9 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall
 import io.ktor.server.response.respond
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
 
 /**
@@ -22,13 +24,19 @@ object PeerEventManager {
     // we can add emitRegistrationFailure or other event types if needed
 
 
-    val prepareUploadEvents =
-        MutableSharedFlow<Pair<PrepareUploadRequest, (Boolean) -> Unit>>(replay = 0)
+    private val _prepareUploadEvents = MutableSharedFlow<PrepareUploadRequest>(replay = 1)
+    val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
 
-    suspend fun emitPrepareUploadRequest(
-        request: PrepareUploadRequest,
-        callback: (Boolean) -> Unit
-    ) {
-        prepareUploadEvents.emit(request to callback)
+    private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+
+    suspend fun emitPrepareUploadRequest(request: PrepareUploadRequest): Boolean {
+        val deferred = CompletableDeferred<Boolean>()
+        decisionMap[request.sessionId] = deferred
+        _prepareUploadEvents.emit(request)
+        return deferred.await() // Wait for UI decision
+    }
+
+    fun resolveUserDecision(sessionId: String, accepted: Boolean) {
+        decisionMap.remove(sessionId)?.complete(accepted)
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index f4e95965e..245d0f42b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -49,21 +49,19 @@ class PeerToPeerViewModel @Inject constructor(
     val getHashError: LiveData<Throwable> get() = _getHashError
     private val _sessionInfo = MutableStateFlow<PeerConnectionInfo?>(null)
     val sessionInfo: StateFlow<PeerConnectionInfo?> = _sessionInfo
+    val clientHash = peerToPeerManager.clientConnected
     private val _registrationServerSuccess = MutableLiveData<Boolean>()
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
-    private val _incomingUploadRequest = MutableLiveData<PrepareUploadRequest>()
-    val incomingUploadRequest: LiveData<PrepareUploadRequest> = _incomingUploadRequest
-
-    val clientHash = peerToPeerManager.clientConnected
+    private val _incomingPrepareRequest = MutableLiveData<PrepareUploadRequest>()
+    val incomingPrepareRequest: LiveData<PrepareUploadRequest> = _incomingPrepareRequest
 
-
-//    init {
-//        viewModelScope.launch {
-//            PeerEventManager.incomingUploadRequests.collect { request ->
-//                _incomingUploadRequest.postValue(request)
-//            }
-//        }
-//    }
+    init {
+        viewModelScope.launch {
+            PeerEventManager.prepareUploadEvents.collect { request ->
+                _incomingPrepareRequest.postValue(request)
+            }
+        }
+    }
 
     init {
         viewModelScope.launch {
@@ -75,6 +73,9 @@ class PeerToPeerViewModel @Inject constructor(
     fun resetRegistrationState() {
         _registrationServerSuccess.postValue(false)
     }
+    fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
+        PeerEventManager.resolveUserDecision(sessionId, accepted)
+    }
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
     fun fetchCurrentNetworkInfo() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index 6a8f91469..879e81fe1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -2,6 +2,8 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
+import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
@@ -10,6 +12,7 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
  * Created by wafa on 3/6/2025.
  */
 class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate){
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -25,6 +28,20 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
             binding.toolbar.setToolbarTitle(getString(R.string.send_files))
             binding.waitingText.text = "Waiting for the recipient to accept files"
         }
+
+        viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
+            val fileCount = request.files.size
+            bundle.putInt("fileCount", fileCount)
+            bundle.putString("sessionId", request.sessionId)
+            navManager().navigateFromWaitingFragmentToRecipientSuccessFragment()
+        }
+
+        childFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
+            val wasRejected = result.getBoolean("rejected", false)
+            if (wasRejected) {
+                Toast.makeText(requireContext(), "Sender's files rejected.", Toast.LENGTH_LONG).show()
+            }
+        }
     }
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 73731a4e8..8cdc5f5c7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -2,23 +2,61 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
+import androidx.core.os.bundleOf
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.setFragmentResult
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
-import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
 /**
  * Created by wafa on 3/6/2025.
  */
 class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate){
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        initView()
+    }
+    private fun initView() {
+        val fileCount = arguments?.getInt("fileCount") ?: 0
+        val sessionId = arguments?.getString("sessionId").orEmpty()
+
+        with(binding) {
+            // Set the dynamic message
+            waitingText.text = getString(R.string.prepare_upload_message, fileCount)
+
+            // Handle Accept/Reject buttons
+            acceptBtn.setOnClickListener {
+                onAcceptFilesSelected()
+                viewModel.confirmPrepareUpload(sessionId, true)
+            }
+
+            rejectBtn.setOnClickListener {
+                onRejectFilesSelected()
+                viewModel.confirmPrepareUpload(sessionId, false)
+                // Set result to notify previous fragment
+                setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
+                nav().popBackStack()
 
+            }
+        }
+    }
+
+    private fun onAcceptFilesSelected() {
+        binding.acceptBtn.isChecked = true
+        binding.rejectBtn.isChecked = false
+    }
 
+    private fun onRejectFilesSelected() {
+        binding.rejectBtn.isChecked = true
+        binding.acceptBtn.isChecked = false
     }
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_recipient_success.xml b/mobile/src/main/res/layout/fragment_recipient_success.xml
index 2024ba579..e8549b235 100644
--- a/mobile/src/main/res/layout/fragment_recipient_success.xml
+++ b/mobile/src/main/res/layout/fragment_recipient_success.xml
@@ -29,7 +29,7 @@
             style="@style/Tella_Main_White_TextExtraLargeBold"
             android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_large_margin"
-            android:text="The sender is trying to send you 6 files"
+            android:text="@string/prepare_upload_message"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index f157f071e..2a290942b 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1041,4 +1041,6 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
   <string name="discard_and_start_over">Discard and start over</string>
     <string name="waiting_for_the_sender_to_share_files">Waiting for the sender to share files</string>
+  <string name="prepare_upload_message">The sender is trying to send you %1$d files</string>
+
 </resources>

From 0bc3a8ae5e721bf56c18d7dbb04d280f2effa29a Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 11:53:56 +0100
Subject: [PATCH 022/153] handle discard and go back to first destination

---
 .../tella/mobile/util/NavigationManager.kt     | 16 ++++++++++++++++
 .../RecipientVerificationFragment.kt           | 18 +++++++-----------
 .../senderflow/SenderVerificationFragment.kt   |  7 ++++++-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index ba8d69358..dbd59de0c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -1,6 +1,7 @@
 package org.horizontal.tella.mobile.util
 
 import android.os.Bundle
+import androidx.navigation.navOptions
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.views.fragment.reports.di.NavControllerProvider
 
@@ -199,6 +200,7 @@ class NavigationManager(
     fun navigateFromDeviceInfoScreenTRecipientVerificationScreen(){
         navigateToWithBundle(R.id.action_deviceInfoScreen_to_recipientVerificationScreen)
     }
+
     fun navigateFromQrCodeScreenToWaitingFragment() {
         navigateToWithBundle(R.id.action_qrCodeScreen_to_waitingFragment)
     }
@@ -210,10 +212,24 @@ class NavigationManager(
     fun navigateConnectManuallyVerificationFragmentToprepareUploadFragment(){
         navigateToWithBundle(R.id.action_connectManuallyVerificationFragment_to_prepareUploadFragment)
     }
+
     fun navigateFromRecipientVerificationScreenToWaitingFragment(){
         navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingFragment)
     }
+
     fun navigateFromWaitingFragmentToRecipientSuccessFragment(){
         navigateToWithBundle(R.id.action_waitingFragment_to_recipientSuccessFragment)
     }
+
+    fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
+        navControllerProvider.navController.navigate(
+            R.id.startNearBySharingFragment,
+            bundle,
+            navOptions {
+                popUpTo(R.id.startNearBySharingFragment) {
+                    inclusive = true
+                }
+            }
+        )
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 1ba6d6cdd..0c838617b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -22,7 +22,13 @@ class RecipientVerificationFragment :
         }
         initListeners()
         initView()
-        initObservers()
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+            } else {
+            }
+        }
     }
 
     private fun initView() {
@@ -38,14 +44,4 @@ class RecipientVerificationFragment :
 
         }
     }
-
-    private fun initObservers() {
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
-            } else {
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 704ef46e7..308889bf5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -5,16 +5,21 @@ import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import javax.inject.Inject
 
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private lateinit var peerConnectionInfo: PeerConnectionInfo
 
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initListeners()
@@ -48,7 +53,7 @@ class SenderVerificationFragment :
         }
 
         binding.discardBtn.setOnClickListener {
-
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
     }
 

From f6740c312de254d12bbaf088455eb2de25f84d03 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 13:49:45 +0100
Subject: [PATCH 023/153] wip flow prepare load

---
 .../fragment/peertopeer/SenderViewModel.kt    | 17 ++++++++--
 .../fragment/peertopeer/WaitingFragment.kt    | 24 +++++++++++---
 .../receipentflow/RecipientSuccessFragment.kt |  9 +++---
 .../senderflow/PrepareUploadFragment.kt       | 32 ++++++++++++++++++-
 .../res/layout/fragment_recipient_success.xml |  4 +--
 .../src/main/res/layout/fragment_waiting.xml  |  9 ++++++
 mobile/src/main/res/values/strings.xml        |  5 +++
 7 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 8b399337e..693349d4e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -12,6 +12,7 @@ import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.launch
+import org.apache.commons.httpclient.HttpException
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
@@ -28,6 +29,8 @@ class SenderViewModel @Inject constructor(
 ) : ViewModel() {
     private val _prepareResults = MutableLiveData<PeerPrepareUploadResponse>()
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
+    private val _prepareRejected = MutableLiveData<Boolean>()
+    val prepareRejected: LiveData<Boolean> = _prepareRejected
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -82,8 +85,18 @@ class SenderViewModel @Inject constructor(
                 Timber.d("Success: transmissionId = $transmissionId")
                 _prepareResults.postValue(PeerPrepareUploadResponse(transmissionId))
             }.onFailure { error ->
-                Timber.e(error, "Failed to prepare upload for  ${files.size} files")
-                // Optionally post a failure state to LiveData if needed
+                    if (error is retrofit2.HttpException) {
+                        val code = error.code()
+                        if (code == 403) {
+                            // Rejected by the receiver
+                            _prepareRejected.postValue(true)
+                        } else {
+                            Timber.e("HTTP error: ${error.code()} - ${error.message()}")
+                        }
+                    } else {
+                        Timber.e(error, "Unexpected error during prepare upload")
+                    }
+
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index 879e81fe1..c744c5992 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -3,16 +3,21 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
  */
 class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate){
     private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private val viewModelSender: SenderViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -22,11 +27,11 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
         val isSender = arguments?.getBoolean("isSender") ?: false
 
         if (!isSender) {
-            binding.toolbar.setToolbarTitle(getString(R.string.receive_files))
+            binding.toolbar.setStartTextTitle(getString(R.string.receive_files))
             binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
         } else {
-            binding.toolbar.setToolbarTitle(getString(R.string.send_files))
-            binding.waitingText.text = "Waiting for the recipient to accept files"
+            binding.toolbar.setStartTextTitle(getString(R.string.send_files))
+            binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
         }
 
         viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
@@ -36,10 +41,19 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
             navManager().navigateFromWaitingFragmentToRecipientSuccessFragment()
         }
 
-        childFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
+        viewModelSender.prepareRejected.observe(viewLifecycleOwner) { wasRejected ->
+            if (wasRejected) {
+                parentFragmentManager.setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
+                findNavController().popBackStack()
+            }
+        }
+        parentFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
             val wasRejected = result.getBoolean("rejected", false)
             if (wasRejected) {
-                Toast.makeText(requireContext(), "Sender's files rejected.", Toast.LENGTH_LONG).show()
+                DialogUtils.showBottomMessage(
+                    baseActivity, "Sender's files rejected.",
+                    true
+                )
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 8cdc5f5c7..098bd6a38 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -6,6 +6,7 @@ import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
@@ -34,16 +35,16 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
 
             // Handle Accept/Reject buttons
             acceptBtn.setOnClickListener {
-                onAcceptFilesSelected()
+             //   onAcceptFilesSelected()
                 viewModel.confirmPrepareUpload(sessionId, true)
             }
 
             rejectBtn.setOnClickListener {
-                onRejectFilesSelected()
+              //  onRejectFilesSelected()
                 viewModel.confirmPrepareUpload(sessionId, false)
                 // Set result to notify previous fragment
-                setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
-                nav().popBackStack()
+                parentFragmentManager.setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
+                findNavController().popBackStack()
 
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 31af1c567..98a04812e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -4,9 +4,12 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.view.Gravity
 import android.view.View
+import android.widget.Toast
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hzontal.tella_locking_ui.common.extensions.onChange
@@ -20,6 +23,7 @@ import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companion.CAPTURE_WITH_AUTO_UPLOAD
+import org.horizontal.tella.mobile.views.activity.viewer.sharedViewModel
 import org.horizontal.tella.mobile.views.adapters.reports.ReportsFilesRecyclerViewAdapter
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
@@ -33,6 +37,7 @@ import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILES_
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILE_KEY
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_PICKER_SINGLE
 import org.horizontal.tella.mobile.views.interfaces.IReportAttachmentsHandler
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.IVaultFilesSelector
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesSheet
 import org.hzontal.shared_ui.utils.DialogUtils
@@ -87,11 +92,36 @@ class PrepareUploadFragment :
             putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
             isNewDraft = false
         }
-
+        parentFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
+            val wasRejected = result.getBoolean("rejected", false)
+            if (wasRejected) {
+                showTooltip(
+                    binding.root,
+                    "Recipient rejected the files.",
+                    Gravity.TOP
+                )
+            }
+        }
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
                 val id = response.transmissionId
                 // navigate to next screen
         }
+
+        binding.toolbar.backClickListener = {  BottomSheetUtils.showConfirmSheet(
+            baseActivity.supportFragmentManager,
+            getString((R.string.exit_nearby_sharing)),
+            getString(R.string.your_progress_will_be_lost),
+            getString(R.string.action_exit),
+            getString(R.string.action_cancel),
+            object : BottomSheetUtils.ActionConfirmed {
+                override fun accept(isConfirmed: Boolean) {
+                    if (isConfirmed) {
+                        findNavController().popBackStack()
+                    }
+                }
+            }
+        )
+        }
         highLightButtonsInit()
         checkIsNewDraftEntry()
     }
diff --git a/mobile/src/main/res/layout/fragment_recipient_success.xml b/mobile/src/main/res/layout/fragment_recipient_success.xml
index e8549b235..ddd7d88d5 100644
--- a/mobile/src/main/res/layout/fragment_recipient_success.xml
+++ b/mobile/src/main/res/layout/fragment_recipient_success.xml
@@ -66,7 +66,7 @@
             android:layout_marginTop="50dp"
             android:background="@drawable/bg_round_orange_btn"
             app:text_color="@color/btn_dark_letter"
-            app:text="ACCEPT"
+            app:text="@string/accept"
             app:check_state="false"
             app:layout_constraintBottom_toTopOf="@+id/reject_btn"
             app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
             android:layout_marginHorizontal="@dimen/activity_horizontal_large_margin"
             android:layout_marginTop="10dp"
             android:gravity="center"
-            app:text="REJECT"
+            app:text="@string/reject"
             app:layout_constraintTop_toBottomOf="@+id/accept_btn" />
 
 
diff --git a/mobile/src/main/res/layout/fragment_waiting.xml b/mobile/src/main/res/layout/fragment_waiting.xml
index 43f87cad7..8ec3ec9a4 100644
--- a/mobile/src/main/res/layout/fragment_waiting.xml
+++ b/mobile/src/main/res/layout/fragment_waiting.xml
@@ -48,6 +48,15 @@
             app:layout_constraintTop_toBottomOf="@+id/waiting_text"
             app:layout_constraintVertical_chainStyle="packed" />
 
+        <TextView
+            android:id="@+id/back_btn"
+            style="@style/Tella_Main_White_Text"
+            android:layout_marginStart="36dp"
+            android:textSize="18sp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="Back" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 2a290942b..5263de3ff 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1042,5 +1042,10 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="discard_and_start_over">Discard and start over</string>
     <string name="waiting_for_the_sender_to_share_files">Waiting for the sender to share files</string>
   <string name="prepare_upload_message">The sender is trying to send you %1$d files</string>
+  <string name="waiting_for_the_recipient_to_accept_files">Waiting for the recipient to accept files</string>
+  <string name="accept">ACCEPT</string>
+  <string name="reject">REJECT</string>
+  <string name="exit_nearby_sharing">Exit nearby sharing?</string>
+  <string name="your_progress_will_be_lost">Your progress will be lost.</string>
 
 </resources>

From f226f894b229be608f39a19715bc0a9e0787763b Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 13:51:56 +0100
Subject: [PATCH 024/153] Wip finish manual connection

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  1 -
 .../peertopeer/PeerToPeerViewModel.kt         |  3 +-
 .../receipentflow/QRCodeFragment.kt           |  6 ++--
 .../RecipientVerificationFragment.kt          | 28 +++++++++++++++++--
 .../receipentflow/ShowDeviceInfoFragment.kt   |  5 +++-
 .../senderflow/SenderVerificationFragment.kt  | 12 ++++++++
 .../layout/connect_manually_verification.xml  |  2 +-
 7 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 272f4bb7f..d92cbea5b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -63,7 +63,6 @@ class TellaPeerToPeerServer(
         }
 
         engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
-            var firstConnectionReceived = false
             sslConnector(
                 keyStore = keyStore,
                 keyAlias = keyStoreConfig.alias,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 245d0f42b..d72109a8d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -61,15 +61,14 @@ class PeerToPeerViewModel @Inject constructor(
                 _incomingPrepareRequest.postValue(request)
             }
         }
-    }
 
-    init {
         viewModelScope.launch {
             PeerEventManager.registrationEvents.collect { success ->
                 _registrationServerSuccess.postValue(success)
             }
         }
     }
+
     fun resetRegistrationState() {
         _registrationServerSuccess.postValue(false)
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 2c4b98ab9..ff2018a40 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -11,12 +11,12 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
-import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
-import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.port
 import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
+import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
@@ -65,7 +65,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
 
 
         val certHash = CertificateUtils.getPublicKeyHash(certificate)
-        val pin = "111111"
+        val pin = (100000..999999).random().toString()
         val port = port
 
         payload = PeerConnectionPayload(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 0c838617b..abe893111 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -5,16 +5,22 @@ import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import javax.inject.Inject
 
 class RecipientVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var payload: PeerConnectionPayload? = null
 
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         arguments?.getString("payload")?.let { payloadJson ->
@@ -24,9 +30,11 @@ class RecipientVerificationFragment :
         initView()
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
-            } else {
+                binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+                binding.confirmAndConnectBtn.setOnClickListener {
+                    bundle.putBoolean("isSender", false)
+                    navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+                }
             }
         }
     }
@@ -41,7 +49,21 @@ class RecipientVerificationFragment :
 
     private fun initListeners() {
         binding.confirmAndConnectBtn.setOnClickListener {
+            binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+            bundle.putBoolean("isSender", false)
+            navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+
+        }
 
+        binding.toolbar.backClickListener = {
+            peerServerStarterManager.stopServer()
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
+
+        binding.discardBtn.setOnClickListener {
+            peerServerStarterManager.stopServer()
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
     }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 7e3e7c416..e63668469 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -55,10 +55,13 @@ class ShowDeviceInfoFragment :
             }
         }
 
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+        viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
+                // Navigate to the next screen
                 bundle.putBoolean("isSender", false)
                 navManager().navigateFromQrCodeScreenToWaitingFragment()
+                //  reset the LiveData state if we want to consume event once
+                viewModel.resetRegistrationState()
             } else {
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 308889bf5..611d870d6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -28,6 +28,7 @@ class SenderVerificationFragment :
     }
 
     private fun initView() {
+        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
         binding.titleDescTextView.text = getString(R.string.make_sure_sequence_matches_recipient)
         binding.warningTextView.text = getString(R.string.sequence_mismatch_warning_recipient)
 
@@ -58,6 +59,17 @@ class SenderVerificationFragment :
     }
 
     private fun initObservers() {
+
+        viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                // Navigate to the next screen
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingFragment()
+                //  reset the LiveData state if we want to consume event once
+                viewModel.resetRegistrationState()
+            } else {
+            }
+        }
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 022c99308..67e6c4ffb 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -95,7 +95,7 @@
         android:layout_height="54dp"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:background="@drawable/bg_round_orange_btn"
+        android:background="@drawable/bg_round_orange16_btn"
         app:text_color="@color/btn_dark_letter"
         app:check_state="false"
         app:layout_constraintTop_toBottomOf="@id/warningTextView"

From 4d3a778ae01de6e013e7871caa7e372c19810483 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 13:56:54 +0100
Subject: [PATCH 025/153] wip add success message

---
 .../senderflow/PrepareUploadFragment.kt       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 98a04812e..3f46e2277 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -95,15 +95,26 @@ class PrepareUploadFragment :
         parentFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
             val wasRejected = result.getBoolean("rejected", false)
             if (wasRejected) {
-                showTooltip(
-                    binding.root,
-                    "Recipient rejected the files.",
-                    Gravity.TOP
+//                showTooltip(
+//                    binding.root,
+//                    "Recipient rejected the files.",
+//                    Gravity.TOP
+//                )
+                DialogUtils.showBottomMessage(
+                    baseActivity, "Recipient rejected the files.",
+                    true
                 )
+            
             }
         }
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
                 val id = response.transmissionId
+            DialogUtils.showBottomMessage(
+                baseActivity,
+                "The receiver accepted the files transfer ",
+                false,
+                3000
+            )
                 // navigate to next screen
         }
 

From 8abd68a72ac950f0bd826c552df4a79187fc44aa Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 4 Jun 2025 13:59:45 +0100
Subject: [PATCH 026/153] WIP on feat/stable_peer_to_peer

add back button
---
 .../fragment/peertopeer/WaitingFragment.kt     | 18 +++++++++++++-----
 .../senderflow/PrepareUploadFragment.kt        |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index c744c5992..f4d19a541 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -2,10 +2,8 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.setFragmentResult
 import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
@@ -15,7 +13,8 @@ import org.hzontal.shared_ui.utils.DialogUtils
 /**
  * Created by wafa on 3/6/2025.
  */
-class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate){
+class WaitingFragment :
+    BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private val viewModelSender: SenderViewModel by activityViewModels()
 
@@ -26,6 +25,9 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val isSender = arguments?.getBoolean("isSender") ?: false
 
+        binding.toolbar.backClickListener = {
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
         if (!isSender) {
             binding.toolbar.setStartTextTitle(getString(R.string.receive_files))
             binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
@@ -43,11 +45,17 @@ class WaitingFragment : BaseBindingFragment<FragmentWaitingBinding>(FragmentWait
 
         viewModelSender.prepareRejected.observe(viewLifecycleOwner) { wasRejected ->
             if (wasRejected) {
-                parentFragmentManager.setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
+                parentFragmentManager.setFragmentResult(
+                    "prepare_upload_result",
+                    bundleOf("rejected" to true)
+                )
                 findNavController().popBackStack()
             }
         }
-        parentFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
+        parentFragmentManager.setFragmentResultListener(
+            "prepare_upload_result",
+            viewLifecycleOwner
+        ) { _, result ->
             val wasRejected = result.getBoolean("rejected", false)
             if (wasRejected) {
                 DialogUtils.showBottomMessage(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 3f46e2277..6b9ffb230 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -71,6 +71,9 @@ class PrepareUploadFragment :
     }
 
     private fun initView() {
+        binding.toolbar.backClickListener = {
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
         gridLayoutManager = GridLayoutManager(context, 3)
         binding.filesRecyclerView.apply {
             layoutManager = gridLayoutManager

From a692d50b995711e0f1c337df018d434e4f024aa2 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 4 Jun 2025 14:14:50 +0100
Subject: [PATCH 027/153] add message of success

---
 .../peertopeer/receipentflow/RecipientSuccessFragment.kt   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 098bd6a38..69cdc886c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -11,6 +11,7 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
@@ -37,6 +38,12 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
             acceptBtn.setOnClickListener {
              //   onAcceptFilesSelected()
                 viewModel.confirmPrepareUpload(sessionId, true)
+                DialogUtils.showBottomMessage(
+                    baseActivity,
+                    "The receiver accepted the files transfer ",
+                    false,
+                    3000
+                )
             }
 
             rejectBtn.setOnClickListener {

From 28c3d86418cedd412b91d66eade3c4da44c5ecbf Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 10 Jun 2025 10:58:53 +0100
Subject: [PATCH 028/153] add success string

---
 mobile/src/main/res/layout/show_device_info_layout.xml | 2 +-
 mobile/src/main/res/values/strings.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index 3cc3442e0..9007ac211 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -73,7 +73,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/titleDescTextView"
-        app:leftText="@string/connect_code" />
+        app:leftText="@string/ip_address" />
 
     <org.hzontal.shared_ui.buttons.DualTextCheckView
         android:id="@+id/pin"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 5263de3ff..9bfebd469 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1047,5 +1047,5 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="reject">REJECT</string>
   <string name="exit_nearby_sharing">Exit nearby sharing?</string>
   <string name="your_progress_will_be_lost">Your progress will be lost.</string>
-
+  <string name="ip_address">IP address</string>
 </resources>

From d311889ecbcd20913709d15e7fa7511f9afb234f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 10 Jun 2025 22:59:17 +0100
Subject: [PATCH 029/153] change the connectCode to ipAdress

---
 .../tella/mobile/domain/peertopeer/PeerConnectionPayload.kt   | 4 ++--
 .../views/fragment/peertopeer/receipentflow/QRCodeFragment.kt | 2 +-
 .../peertopeer/receipentflow/ShowDeviceInfoFragment.kt        | 4 ++--
 .../fragment/peertopeer/senderflow/ScanQrCodeFragment.kt      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
index 7a28595c5..81bb98411 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
@@ -3,8 +3,8 @@ package org.horizontal.tella.mobile.domain.peertopeer
 import com.google.gson.annotations.SerializedName
 
 data class PeerConnectionPayload(
-    @SerializedName("connect_code")
-    val connectCode: String,
+    @SerializedName("ip_address")
+    val ipAdress: String,
 
     @SerializedName("port")
     val port: Int,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index ff2018a40..41fa4c4fc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -69,7 +69,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val port = port
 
         payload = PeerConnectionPayload(
-            connectCode = ip,
+            ipAdress = ip,
             port = port,
             certificateHash = certHash,
             pin = pin
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index e63668469..5994cd7bf 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -30,7 +30,7 @@ class ShowDeviceInfoFragment :
     }
 
     private fun initView() {
-        binding.connectCode.setRightText(payload?.connectCode)
+        binding.connectCode.setRightText(payload?.ipAdress)
         binding.pin.setRightText(payload?.pin)
         binding.port.setRightText(payload?.port.toString())
     }
@@ -45,7 +45,7 @@ class ShowDeviceInfoFragment :
             viewModel.clientHash.collect { hash ->
                 viewModel.setPeerSessionInfo(
                     PeerConnectionInfo(
-                        ip = payload?.connectCode.toString(),
+                        ip = payload?.ipAdress.toString(),
                         port = payload?.port.toString(),
                         pin = payload?.pin?.toInt()!!,
                         hash = hash
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 99e265911..8e06174a1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -61,7 +61,7 @@ class ScanQrCodeFragment :
                         val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
 
                         viewModel.startRegistration(
-                            ip = payload.connectCode,
+                            ip = payload.ipAdress,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
                             pin = payload.pin

From 55911eabec08df2d1df8533ff5bdc9777669d871 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 19 Jun 2025 13:18:23 +0100
Subject: [PATCH 030/153] wip reject flow

---
 .../peertopeer/PeerToPeerViewModel.kt         | 10 ++--
 .../fragment/peertopeer/WaitingFragment.kt    | 53 ++++++++++++-------
 .../receipentflow/RecipientSuccessFragment.kt | 19 +++----
 3 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index d72109a8d..d21b04f0a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -38,6 +38,7 @@ class PeerToPeerViewModel @Inject constructor(
     private val peerToPeerManager: PeerToPeerManager
 ) : ViewModel() {
 
+    var hasNavigatedToSuccessFragment = false
     private val _networkInfo = MutableLiveData<NetworkInfo>()
     val networkInfo: LiveData<NetworkInfo> = _networkInfo
     var currentNetworkInfo: NetworkInfo? = null
@@ -52,8 +53,8 @@ class PeerToPeerViewModel @Inject constructor(
     val clientHash = peerToPeerManager.clientConnected
     private val _registrationServerSuccess = MutableLiveData<Boolean>()
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
-    private val _incomingPrepareRequest = MutableLiveData<PrepareUploadRequest>()
-    val incomingPrepareRequest: LiveData<PrepareUploadRequest> = _incomingPrepareRequest
+    private val _incomingPrepareRequest = MutableLiveData<PrepareUploadRequest?>()
+    val incomingPrepareRequest: MutableLiveData<PrepareUploadRequest?> = _incomingPrepareRequest
 
     init {
         viewModelScope.launch {
@@ -219,7 +220,10 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-
+    fun clearPrepareRequest() {
+        _incomingPrepareRequest.value = null
+        hasNavigatedToSuccessFragment = false
+    }
     fun setPeerSessionInfo(info: PeerConnectionInfo) {
         _sessionInfo.value = info
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index f4d19a541..1ad4dd312 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -18,10 +18,6 @@ class WaitingFragment :
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private val viewModelSender: SenderViewModel by activityViewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val isSender = arguments?.getBoolean("isSender") ?: false
 
@@ -37,10 +33,14 @@ class WaitingFragment :
         }
 
         viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
-            val fileCount = request.files.size
-            bundle.putInt("fileCount", fileCount)
-            bundle.putString("sessionId", request.sessionId)
-            navManager().navigateFromWaitingFragmentToRecipientSuccessFragment()
+            if (request != null && !viewModel.hasNavigatedToSuccessFragment) {
+                viewModel.hasNavigatedToSuccessFragment = true
+
+                val fileCount = request.files.size
+                bundle.putInt("fileCount", fileCount)
+                bundle.putString("sessionId", request.sessionId)
+                navManager().navigateFromWaitingFragmentToRecipientSuccessFragment()
+            }
         }
 
         viewModelSender.prepareRejected.observe(viewLifecycleOwner) { wasRejected ->
@@ -52,18 +52,33 @@ class WaitingFragment :
                 findNavController().popBackStack()
             }
         }
-        parentFragmentManager.setFragmentResultListener(
-            "prepare_upload_result",
-            viewLifecycleOwner
-        ) { _, result ->
-            val wasRejected = result.getBoolean("rejected", false)
-            if (wasRejected) {
-                DialogUtils.showBottomMessage(
-                    baseActivity, "Sender's files rejected.",
-                    true
-                )
+
+        val navBackStackEntry = findNavController().currentBackStackEntry
+        navBackStackEntry?.savedStateHandle?.getLiveData<Boolean>("prepare_upload_result")
+            ?.observe(viewLifecycleOwner) { wasRejected ->
+                if (wasRejected) {
+                    DialogUtils.showBottomMessage(
+                        baseActivity, "Sender's files rejected.",
+                        true
+                    )
+                }
             }
-        }
     }
 
+    //        parentFragmentManager.setFragmentResultListener(
+//                "prepare_upload_result",
+//        viewLifecycleOwner
+//        ) { _, result ->
+//            val wasRejected = result.getBoolean("rejected", false)
+//            if (wasRejected) {
+//                DialogUtils.showBottomMessage(
+//                    baseActivity, "Sender's files rejected.",
+//                    true
+//                )
+//            }
+//        }
+    override fun onStop() {
+        super.onStop()
+        viewModel.clearPrepareRequest()
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 69cdc886c..53bbb186f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -47,24 +47,17 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
             }
 
             rejectBtn.setOnClickListener {
-              //  onRejectFilesSelected()
                 viewModel.confirmPrepareUpload(sessionId, false)
-                // Set result to notify previous fragment
-                parentFragmentManager.setFragmentResult("prepare_upload_result", bundleOf("rejected" to true))
-                findNavController().popBackStack()
+                // Set result safely via SavedStateHandle
+                findNavController().previousBackStackEntry
+                    ?.savedStateHandle
+                    ?.set("prepare_upload_result", true)
 
+                // Pop back
+                findNavController().popBackStack()
             }
         }
     }
 
-    private fun onAcceptFilesSelected() {
-        binding.acceptBtn.isChecked = true
-        binding.rejectBtn.isChecked = false
-    }
-
-    private fun onRejectFilesSelected() {
-        binding.rejectBtn.isChecked = true
-        binding.acceptBtn.isChecked = false
-    }
 
 }
\ No newline at end of file

From 4e43a3a5b68c9faa8ee058054659370ce9b5bcd9 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 20 Jun 2025 11:36:48 +0100
Subject: [PATCH 031/153] wip reject flow in the sender and recipient

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 18 ++++++-------
 .../fragment/peertopeer/SenderViewModel.kt    | 17 +++----------
 .../fragment/peertopeer/WaitingFragment.kt    | 23 +++++------------
 .../receipentflow/RecipientSuccessFragment.kt |  2 +-
 .../senderflow/PrepareUploadFragment.kt       | 25 ++++++++-----------
 5 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 04d03cb4b..d0682d980 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -131,17 +131,12 @@ class TellaPeerToPeerClient {
                 id = it.id,
                 fileName = it.name,
                 size = it.size,
-                fileType = "application/octet-stream", // or detect mime type
+                fileType = "application/octet-stream",
                 sha256 = it.hash
             )
         }
 
-        val requestPayload = PrepareUploadRequest(
-            title = title,
-            sessionId = sessionId,
-            files = fileItems
-        )
-
+        val requestPayload = PrepareUploadRequest(title, sessionId, fileItems)
         val jsonPayload = Json.encodeToString(requestPayload)
         val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
         val client = getClientWithFingerprintValidation(expectedFingerprint)
@@ -153,11 +148,11 @@ class TellaPeerToPeerClient {
                 .addHeader("Content-Type", "application/json")
                 .build()
 
-            client.newCall(request).execute().use { response ->
+            return@withContext client.newCall(request).execute().use { response ->
                 val body = response.body?.string()
 
                 if (response.isSuccessful && body != null) {
-                    return@use try {
+                    try {
                         val transmissionId = JSONObject(body).getString("transmissionId")
                         Result.success(transmissionId)
                     } catch (e: Exception) {
@@ -168,21 +163,22 @@ class TellaPeerToPeerClient {
                     Log.e("PrepareUpload", "Server error ${response.code}: ${response.message}")
                     when (response.code) {
                         400 -> Log.e("PrepareUpload", "Bad Request – likely missing or invalid fields.")
+                        403 -> Log.e("PrepareUpload", "Forbidden – the server is refusing the request.")
                         409 -> Log.e("PrepareUpload", "Conflict – maybe another active session.")
                         500 -> Log.e("PrepareUpload", "Internal Server Error – try again later.")
                         else -> Log.e("PrepareUpload", "Unhandled server error code.")
                     }
-                    return@use Result.failure(Exception("Server returned error ${response.code}"))
+                    Result.failure(Exception("Server returned error ${response.code}"))
                 }
             }
 
-            Result.failure(Exception("No response from server"))
         } catch (e: Exception) {
             Log.e("PrepareUpload", "Exception during upload: ${e.message}", e)
             Result.failure(e)
         }
     }
 
+
     suspend fun fetchServerFingerprint(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
         try {
             val socket = SSLSocketFactory.getDefault()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 693349d4e..d370f1404 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -85,23 +85,12 @@ class SenderViewModel @Inject constructor(
                 Timber.d("Success: transmissionId = $transmissionId")
                 _prepareResults.postValue(PeerPrepareUploadResponse(transmissionId))
             }.onFailure { error ->
-                    if (error is retrofit2.HttpException) {
-                        val code = error.code()
-                        if (code == 403) {
-                            // Rejected by the receiver
-                            _prepareRejected.postValue(true)
-                        } else {
-                            Timber.e("HTTP error: ${error.code()} - ${error.message()}")
-                        }
-                    } else {
-                        Timber.e(error, "Unexpected error during prepare upload")
-                    }
+              //  if (error.message?.contains("403") == true) {
+                    _prepareRejected.postValue(true)
 
             }
+            }
         }
-    }
-
-
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
index 1ad4dd312..cffd1010a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
@@ -45,16 +45,16 @@ class WaitingFragment :
 
         viewModelSender.prepareRejected.observe(viewLifecycleOwner) { wasRejected ->
             if (wasRejected) {
-                parentFragmentManager.setFragmentResult(
-                    "prepare_upload_result",
-                    bundleOf("rejected" to true)
-                )
+                findNavController().previousBackStackEntry
+                    ?.savedStateHandle
+                    ?.set("prepare_upload_result", true)
+
                 findNavController().popBackStack()
             }
         }
 
         val navBackStackEntry = findNavController().currentBackStackEntry
-        navBackStackEntry?.savedStateHandle?.getLiveData<Boolean>("prepare_upload_result")
+        navBackStackEntry?.savedStateHandle?.getLiveData<Boolean>("prepare_upload")
             ?.observe(viewLifecycleOwner) { wasRejected ->
                 if (wasRejected) {
                     DialogUtils.showBottomMessage(
@@ -65,18 +65,7 @@ class WaitingFragment :
             }
     }
 
-    //        parentFragmentManager.setFragmentResultListener(
-//                "prepare_upload_result",
-//        viewLifecycleOwner
-//        ) { _, result ->
-//            val wasRejected = result.getBoolean("rejected", false)
-//            if (wasRejected) {
-//                DialogUtils.showBottomMessage(
-//                    baseActivity, "Sender's files rejected.",
-//                    true
-//                )
-//            }
-//        }
+
     override fun onStop() {
         super.onStop()
         viewModel.clearPrepareRequest()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 53bbb186f..21dcc8418 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -51,7 +51,7 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
                 // Set result safely via SavedStateHandle
                 findNavController().previousBackStackEntry
                     ?.savedStateHandle
-                    ?.set("prepare_upload_result", true)
+                    ?.set("prepare_upload", true)
 
                 // Pop back
                 findNavController().popBackStack()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 6b9ffb230..ecde5ea79 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -95,21 +95,18 @@ class PrepareUploadFragment :
             putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
             isNewDraft = false
         }
-        parentFragmentManager.setFragmentResultListener("prepare_upload_result", viewLifecycleOwner) { _, result ->
-            val wasRejected = result.getBoolean("rejected", false)
-            if (wasRejected) {
-//                showTooltip(
-//                    binding.root,
-//                    "Recipient rejected the files.",
-//                    Gravity.TOP
-//                )
-                DialogUtils.showBottomMessage(
-                    baseActivity, "Recipient rejected the files.",
-                    true
-                )
-            
+        val navBackStackEntry = findNavController().currentBackStackEntry
+        navBackStackEntry?.savedStateHandle
+            ?.getLiveData<Boolean>("prepare_upload_result")
+            ?.observe(viewLifecycleOwner) { wasRejected ->
+                if (wasRejected) {
+                    DialogUtils.showBottomMessage(
+                        baseActivity, "Recipient rejected the files.",
+                        true
+                    )
+                }
             }
-        }
+
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
                 val id = response.transmissionId
             DialogUtils.showBottomMessage(

From a0979109111c2751e8446d5b0128d7236787371c Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 20 Jun 2025 19:12:19 +0100
Subject: [PATCH 032/153] Fix hash problem, wip send/receive manual

---
 .../mobile/certificate/CertificateUtils.kt     |  2 +-
 .../horizontal/tella/mobile/util/Extensions.kt | 11 ++++++++++-
 .../fragment/peertopeer/PeerToPeerViewModel.kt |  2 +-
 .../RecipientVerificationFragment.kt           |  4 ++--
 .../SenderManualConnectionFragment.kt          | 18 ++++++++----------
 .../senderflow/SenderVerificationFragment.kt   |  3 ++-
 .../layout/connect_manually_verification.xml   |  1 +
 .../res/layout/sender_manual_connection.xml    |  4 ++--
 8 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
index 53cb67a5e..1f12b1179 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -43,7 +43,7 @@ object CertificateUtils {
     fun getPublicKeyHash(certificate: X509Certificate): String {
         val digest = java.security.MessageDigest.getInstance("SHA-256")
         val hash = digest.digest(certificate.publicKey.encoded)
-        return hash.joinToString("") { "%02x".format(it) }
+        return hash.joinToString("") { "%04x".format(it) }
     }
 
     fun createSSLContext(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
index 6dede8d76..514cdf6d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
@@ -135,6 +135,15 @@ fun Context.isScreenReaderOn(): Boolean {
 }
 
 fun NavController.navigateSafe(destinationId: Int, bundle: Bundle? = null) {
-    navigate(destinationId, bundle,)
+    navigate(destinationId, bundle)
+}
+
+fun String.formatHash(): String {
+    return this
+        .take(64) // take only the first 64 characters
+        .chunked(4) // split into groups of 4
+        .chunked(4) // make 4 lines
+        .joinToString("\n") { it.joinToString(" ") }
+
 }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index d21b04f0a..124fd569f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -35,7 +35,7 @@ import javax.inject.Inject
 class PeerToPeerViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
     private val peerClient: TellaPeerToPeerClient,
-    private val peerToPeerManager: PeerToPeerManager
+    peerToPeerManager: PeerToPeerManager
 ) : ViewModel() {
 
     var hasNavigatedToSuccessFragment = false
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index abe893111..94efa2a15 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -9,6 +9,7 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
+import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import javax.inject.Inject
@@ -42,7 +43,7 @@ class RecipientVerificationFragment :
     private fun initView() {
         lifecycleScope.launchWhenStarted {
             viewModel.sessionInfo.collect { session ->
-                binding.hashContentTextView.text = session?.hash
+                binding.hashContentTextView.text = session?.hash?.formatHash()
             }
         }
     }
@@ -52,7 +53,6 @@ class RecipientVerificationFragment :
             binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
             bundle.putBoolean("isSender", false)
             navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
-
         }
 
         binding.toolbar.backClickListener = {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index fe7c609c3..e16e51cce 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -24,10 +24,10 @@ class SenderManualConnectionFragment :
     }
 
     private fun initView() {
-        binding.connectCode.onChange {
+        binding.ipAddress.onChange {
             updateNextButtonState()
         }
-        binding.port.onChange {
+        binding.pin.onChange {
             updateNextButtonState()
         }
 
@@ -54,9 +54,8 @@ class SenderManualConnectionFragment :
     }
 
     private fun isInputValid(): Boolean {
-        return binding.connectCode.text?.isNotBlank() == true &&
-                binding.pin.text?.isNotBlank() == true &&
-                binding.port.text?.isNotBlank() == true
+        return binding.ipAddress.text?.isNotBlank() == true &&
+                binding.pin.text?.isNotBlank() == true
     }
 
     private fun updateNextButtonState() {
@@ -71,10 +70,9 @@ class SenderManualConnectionFragment :
         binding.toolbar.backClickListener = { nav().popBackStack() }
         binding.backBtn.setOnClickListener { nav().popBackStack() }
         binding.nextBtn.setOnClickListener {
-            val ip = binding.connectCode.text.toString()
-            val port = binding.port.text.toString()
+            val ip = binding.ipAddress.text.toString()
             val pin = binding.pin.text.toString()
-
+            val port = binding.port.text.toString()
             viewModel.setPeerSessionInfo(
                 PeerConnectionInfo(
                     ip = ip,
@@ -84,7 +82,7 @@ class SenderManualConnectionFragment :
             ) // Store values
 
             viewModel.handleCertificate(
-                ip = binding.connectCode.text.toString(),
+                ip = binding.ipAddress.text.toString(),
                 port = binding.port.text.toString(),
                 pin = binding.pin.text.toString()
             )
@@ -96,7 +94,7 @@ class SenderManualConnectionFragment :
             bundle.putString("payload", hash)
             viewModel.setPeerSessionInfo(
                 PeerConnectionInfo(
-                    ip = binding.connectCode.text.toString(),
+                    ip = binding.ipAddress.text.toString(),
                     port = binding.port.text.toString(),
                     pin = binding.pin.text.toString().toInt(),
                     hash = hash
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 611d870d6..caef5a10b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
+import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
@@ -40,7 +41,7 @@ class SenderVerificationFragment :
                 if (session != null) {
                     peerConnectionInfo = session
                 }
-                binding.hashContentTextView.text = session?.hash
+                binding.hashContentTextView.text = session?.hash?.formatHash()
             }
         }
 
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 67e6c4ffb..53d5235ed 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -63,6 +63,7 @@
     <TextView
         android:id="@+id/hashContentTextView"
         style="@style/Tella_Main_White_Text.Meduim"
+        android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
diff --git a/mobile/src/main/res/layout/sender_manual_connection.xml b/mobile/src/main/res/layout/sender_manual_connection.xml
index 7b1c0e8ba..f3f25d469 100644
--- a/mobile/src/main/res/layout/sender_manual_connection.xml
+++ b/mobile/src/main/res/layout/sender_manual_connection.xml
@@ -67,11 +67,11 @@
             app:layout_constraintTop_toBottomOf="@+id/titleTextView">
 
             <EditText
-                android:id="@+id/connectCode"
+                android:id="@+id/ip_address"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/open_sans"
-                android:hint="@string/connect_code"
+                android:hint="@string/ip_address"
                 android:imeOptions="actionNext"
                 android:importantForAutofill="no"
                 android:inputType="textNoSuggestions"

From c08816cedae07e589bd58ad86b399f1c5bef5bfd Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 24 Jun 2025 11:47:51 +0100
Subject: [PATCH 033/153] wip reject flow and refactor code

---
 .../tella/mobile/util/NavigationManager.kt    | 16 +++---
 .../mobile/views/fragment/peertopeer/Event.kt | 20 +++++++
 .../peertopeer/PeerToPeerViewModel.kt         |  1 +
 .../fragment/peertopeer/SenderViewModel.kt    | 22 ++++----
 .../peertopeer/WaitingFragmentSender.kt       | 40 ++++++++++++++
 ...Fragment.kt => WaitingReceiverFragment.kt} | 52 +++++++++----------
 .../receipentflow/QRCodeFragment.kt           |  8 +--
 .../receipentflow/RecipientSuccessFragment.kt |  2 +-
 .../RecipientVerificationFragment.kt          |  8 +--
 .../receipentflow/ShowDeviceInfoFragment.kt   |  4 +-
 .../senderflow/PrepareUploadFragment.kt       | 14 ++---
 .../senderflow/SenderVerificationFragment.kt  |  4 +-
 .../res/navigation/peer_to_peer_graph.xml     | 26 ++++++----
 mobile/src/main/res/values/strings.xml        |  3 ++
 14 files changed, 143 insertions(+), 77 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{WaitingFragment.kt => WaitingReceiverFragment.kt} (53%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index dbd59de0c..bbc243016 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -201,24 +201,24 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_deviceInfoScreen_to_recipientVerificationScreen)
     }
 
-    fun navigateFromQrCodeScreenToWaitingFragment() {
-        navigateToWithBundle(R.id.action_qrCodeScreen_to_waitingFragment)
+    fun navigateFromQrCodeScreenToWaitingReceiverFragment() {
+        navigateToWithBundle(R.id.action_qrCodeScreen_to_waitingReceiverFragment)
     }
 
-    fun navigateFromPrepareUploadFragmentToWaitingFragment() {
-        navigateToWithBundle(R.id.action_prepareUploadFragment_to_waitingFragment)
+    fun navigateFromPrepareUploadFragmentToWaitingSenderFragment() {
+        navigateToWithBundle(R.id.action_prepareUploadFragment_to_waitingSenderFragment)
     }
 
     fun navigateConnectManuallyVerificationFragmentToprepareUploadFragment(){
         navigateToWithBundle(R.id.action_connectManuallyVerificationFragment_to_prepareUploadFragment)
     }
 
-    fun navigateFromRecipientVerificationScreenToWaitingFragment(){
-        navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingFragment)
+    fun navigateFromRecipientVerificationScreenToWaitingReceiverFragment(){
+        navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingReceiverFragment)
     }
 
-    fun navigateFromWaitingFragmentToRecipientSuccessFragment(){
-        navigateToWithBundle(R.id.action_waitingFragment_to_recipientSuccessFragment)
+    fun navigateFromWaitingReceiverFragmentToRecipientSuccessFragment(){
+        navigateToWithBundle(R.id.action_waitingReceiverFragment_to_recipientSuccessFragment)
     }
 
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt
new file mode 100644
index 000000000..17f216dde
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt
@@ -0,0 +1,20 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+/**
+ * Created by wafa on 23/6/2025.
+ */
+class Event<out T>(private val content: T) {
+    private var hasBeenHandled = false
+
+    /** Returns the content if not handled, else null */
+    fun getContentIfNotHandled(): T? {
+        return if (hasBeenHandled) null
+        else {
+            hasBeenHandled = true
+            content
+        }
+    }
+
+    /** Always returns the content, even if already handled */
+    fun peekContent(): T = content
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 124fd569f..a0fb47958 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -223,6 +223,7 @@ class PeerToPeerViewModel @Inject constructor(
     fun clearPrepareRequest() {
         _incomingPrepareRequest.value = null
         hasNavigatedToSuccessFragment = false
+
     }
     fun setPeerSessionInfo(info: PeerConnectionInfo) {
         _sessionInfo.value = info
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index d370f1404..ba7445f7b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -1,25 +1,23 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.apache.commons.httpclient.HttpException
+import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
 import timber.log.Timber
-import java.io.File
 import javax.inject.Inject
 
 
@@ -29,8 +27,9 @@ class SenderViewModel @Inject constructor(
 ) : ViewModel() {
     private val _prepareResults = MutableLiveData<PeerPrepareUploadResponse>()
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
-    private val _prepareRejected = MutableLiveData<Boolean>()
-    val prepareRejected: LiveData<Boolean> = _prepareRejected
+    private val _prepareRejected = MutableLiveData<Event<Boolean>>()
+    val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
+
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -85,12 +84,15 @@ class SenderViewModel @Inject constructor(
                 Timber.d("Success: transmissionId = $transmissionId")
                 _prepareResults.postValue(PeerPrepareUploadResponse(transmissionId))
             }.onFailure { error ->
-              //  if (error.message?.contains("403") == true) {
-                    _prepareRejected.postValue(true)
-
-            }
+                //  if (error.message?.contains("403") == true) {
+                withContext(Dispatchers.Main) {
+                    _prepareRejected.value = Event(true)
+                }
             }
         }
+    }
+
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt
new file mode 100644
index 000000000..bc5f2fa73
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt
@@ -0,0 +1,40 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.os.bundleOf
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.bus.SingleLiveEvent
+import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.hzontal.shared_ui.utils.DialogUtils
+
+/**
+ * Created by wafa on 3/6/2025.
+ */
+class WaitingSenderFragment :
+    BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
+    private val viewModelSender: SenderViewModel by activityViewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        binding.toolbar.setStartTextTitle(getString(R.string.send_files))
+        binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
+
+        binding.toolbar.backClickListener = {
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
+
+        viewModelSender.prepareRejected.observe(viewLifecycleOwner) { event ->
+            event.getContentIfNotHandled()?.let { wasRejected ->
+                if (wasRejected) {
+                    findNavController().previousBackStackEntry
+                        ?.savedStateHandle
+                        ?.set("transferRejected", true)
+                    findNavController().popBackStack()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
similarity index 53%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
index cffd1010a..3db4cc313 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
@@ -2,7 +2,6 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
@@ -13,25 +12,30 @@ import org.hzontal.shared_ui.utils.DialogUtils
 /**
  * Created by wafa on 3/6/2025.
  */
-class WaitingFragment :
+
+class WaitingReceiverFragment :
     BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
+
     private val viewModel: PeerToPeerViewModel by activityViewModels()
-    private val viewModelSender: SenderViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val isSender = arguments?.getBoolean("isSender") ?: false
+        setupToolbar()
+        observeIncomingPrepareRequest()
+        observeSenderRejection()
+    }
 
-        binding.toolbar.backClickListener = {
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
-        if (!isSender) {
-            binding.toolbar.setStartTextTitle(getString(R.string.receive_files))
-            binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
-        } else {
-            binding.toolbar.setStartTextTitle(getString(R.string.send_files))
-            binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
+    private fun setupToolbar() {
+        binding.toolbar.apply {
+            setStartTextTitle(getString(R.string.receive_files))
+            backClickListener = {
+                navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+            }
         }
 
+        binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
+    }
+
+    private fun observeIncomingPrepareRequest() {
         viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
             if (request != null && !viewModel.hasNavigatedToSuccessFragment) {
                 viewModel.hasNavigatedToSuccessFragment = true
@@ -39,33 +43,27 @@ class WaitingFragment :
                 val fileCount = request.files.size
                 bundle.putInt("fileCount", fileCount)
                 bundle.putString("sessionId", request.sessionId)
-                navManager().navigateFromWaitingFragmentToRecipientSuccessFragment()
-            }
-        }
 
-        viewModelSender.prepareRejected.observe(viewLifecycleOwner) { wasRejected ->
-            if (wasRejected) {
-                findNavController().previousBackStackEntry
-                    ?.savedStateHandle
-                    ?.set("prepare_upload_result", true)
-
-                findNavController().popBackStack()
+                navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
             }
         }
+    }
 
+    private fun observeSenderRejection() {
         val navBackStackEntry = findNavController().currentBackStackEntry
-        navBackStackEntry?.savedStateHandle?.getLiveData<Boolean>("prepare_upload")
+        navBackStackEntry?.savedStateHandle
+            ?.getLiveData<Boolean>("receiverDeclined")
             ?.observe(viewLifecycleOwner) { wasRejected ->
                 if (wasRejected) {
                     DialogUtils.showBottomMessage(
-                        baseActivity, "Sender's files rejected.",
-                        true
+                        baseActivity,
+                        getString(R.string.sender_files_rejected),
+                        isError = true
                     )
                 }
             }
     }
 
-
     override fun onStop() {
         super.onStop()
         viewModel.clearPrepareRequest()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 41fa4c4fc..1d767fb51 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -47,8 +47,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingFragment()
+              //  bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
             } else {
@@ -116,8 +116,8 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     private fun initObservers() {
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingFragment()
+               // bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
             } else {
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 21dcc8418..5fb8abca2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -51,7 +51,7 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
                 // Set result safely via SavedStateHandle
                 findNavController().previousBackStackEntry
                     ?.savedStateHandle
-                    ?.set("prepare_upload", true)
+                    ?.set("receiverDeclined", true)
 
                 // Pop back
                 findNavController().popBackStack()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 94efa2a15..c698a5dea 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -33,8 +33,8 @@ class RecipientVerificationFragment :
             if (success) {
                 binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
                 binding.confirmAndConnectBtn.setOnClickListener {
-                    bundle.putBoolean("isSender", false)
-                    navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+                 //   bundle.putBoolean("isSender", false)
+                    navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
                 }
             }
         }
@@ -51,8 +51,8 @@ class RecipientVerificationFragment :
     private fun initListeners() {
         binding.confirmAndConnectBtn.setOnClickListener {
             binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
-            bundle.putBoolean("isSender", false)
-            navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+          //  bundle.putBoolean("isSender", false)
+            navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
         }
 
         binding.toolbar.backClickListener = {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 5994cd7bf..88afc2975 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -58,8 +58,8 @@ class ShowDeviceInfoFragment :
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingFragment()
+            //    bundle.putBoolean("isSender", false)
+                navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
             } else {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index ecde5ea79..422700a3d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -97,11 +97,11 @@ class PrepareUploadFragment :
         }
         val navBackStackEntry = findNavController().currentBackStackEntry
         navBackStackEntry?.savedStateHandle
-            ?.getLiveData<Boolean>("prepare_upload_result")
+            ?.getLiveData<Boolean>("transferRejected")
             ?.observe(viewLifecycleOwner) { wasRejected ->
                 if (wasRejected) {
                     DialogUtils.showBottomMessage(
-                        baseActivity, "Recipient rejected the files.",
+                        baseActivity, getString(R.string.recipient_rejected_the_files),
                         true
                     )
                 }
@@ -111,7 +111,7 @@ class PrepareUploadFragment :
                 val id = response.transmissionId
             DialogUtils.showBottomMessage(
                 baseActivity,
-                "The receiver accepted the files transfer ",
+                getString(R.string.the_receiver_accepted_the_files_transfer),
                 false,
                 3000
             )
@@ -139,12 +139,8 @@ class PrepareUploadFragment :
 
     private fun checkIsNewDraftEntry() {
         if (isNewDraft) {
-           // binding.deleteBtn.invisible()
-          //  binding.sendLaterBtn.show()
             binding.sendReportBtn.text = getString(R.string.collect_end_action_submit)
         } else {
-           // binding.deleteBtn.show()
-          //  binding.sendLaterBtn.invisible()
             binding.sendReportBtn.text = getString(R.string.Send_Action_Label)
         }
     }
@@ -304,8 +300,8 @@ class PrepareUploadFragment :
                     if (selectedFiles.isNotEmpty()) {
                         viewModel.prepareUploadsFromVaultFiles(selectedFiles)
                         // navigate to waiting view
-                        bundle.putBoolean("isSender", true)
-                        navManager().navigateFromPrepareUploadFragmentToWaitingFragment()
+                        //bundle.putBoolean("isSender", true)
+                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
                     } else {
                         showToast("No file selected")
                     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index caef5a10b..caa9cf423 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -64,8 +64,8 @@ class SenderVerificationFragment :
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingFragment()
+               // bundle.putBoolean("isSender", false)
+                navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
             } else {
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 1442900e1..effc7eff2 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -63,8 +63,8 @@
             android:id="@+id/action_qrCodeScreen_to_deviceInfoScreen"
             app:destination="@id/deviceInfoScreen" />
         <action
-            android:id="@+id/action_qrCodeScreen_to_waitingFragment"
-            app:destination="@id/waitingFragment" />
+            android:id="@+id/action_qrCodeScreen_to_waitingReceiverFragment"
+            app:destination="@id/waitingReceiverFragment" />
     </fragment>
 
     <fragment
@@ -84,8 +84,8 @@
         android:label="RecipientVerificationScreen"
         tools:layout="@layout/connect_manually_verification">
         <action
-            android:id="@+id/action_recipientVerificationScreen_to_waitingFragment"
-            app:destination="@id/waitingFragment" />
+            android:id="@+id/action_recipientVerificationScreen_to_waitingReceiverFragment"
+            app:destination="@id/waitingReceiverFragment" />
     </fragment>
 
     <fragment
@@ -94,8 +94,8 @@
         android:label="PrepareUploadFragment"
         tools:layout="@layout/fragment_prepare_upload" >
         <action
-            android:id="@+id/action_prepareUploadFragment_to_waitingFragment"
-            app:destination="@id/waitingFragment" />
+            android:id="@+id/action_prepareUploadFragment_to_waitingSenderFragment"
+            app:destination="@id/waitingSenderFragment" />
     </fragment>
 
     <fragment
@@ -108,22 +108,28 @@
             app:destination="@id/connectManuallyVerificationFragment" />
     </fragment>
     <fragment
-        android:id="@+id/waitingFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingFragment"
+        android:id="@+id/waitingReceiverFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingReceiverFragment"
         tools:layout="@layout/fragment_waiting"
-        android:label="WaitingFragment" >
+        android:label="WaitingReceiverFragment" >
         <action
-            android:id="@+id/action_waitingFragment_to_recipientSuccessFragment"
+            android:id="@+id/action_waitingReceiverFragment_to_recipientSuccessFragment"
             app:destination="@id/recipientSuccessFragment" />
     </fragment>
     <fragment
         android:id="@+id/successConnectFragment"
         android:name="org.horizontal.tella.mobile.views.dialog.uwazi.step6.SuccessConnectFragment"
+        tools:layout="@layout/fragment_success_connect_flow"
         android:label="SuccessConnectFragment" />
     <fragment
         android:id="@+id/recipientSuccessFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientSuccessFragment"
         tools:layout="@layout/fragment_recipient_success"
         android:label="RecipientSuccessFragment" />
+    <fragment
+        android:id="@+id/waitingSenderFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingSenderFragment"
+        tools:layout="@layout/fragment_waiting"
+        android:label="WaitingSenderFragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 9bfebd469..e63f72737 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1048,4 +1048,7 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="exit_nearby_sharing">Exit nearby sharing?</string>
   <string name="your_progress_will_be_lost">Your progress will be lost.</string>
   <string name="ip_address">IP address</string>
+    <string name="sender_files_rejected">Sender\'s files rejected.</string>
+  <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
+  <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
 </resources>

From 1302359389da5235e50c434394d0324411b988ad Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 24 Jun 2025 12:29:06 +0100
Subject: [PATCH 034/153] change naming

---
 .../views/fragment/peertopeer/WaitingReceiverFragment.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
index 3db4cc313..67f98f5d2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
@@ -21,7 +21,7 @@ class WaitingReceiverFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setupToolbar()
         observeIncomingPrepareRequest()
-        observeSenderRejection()
+        observeReceiverRejection()
     }
 
     private fun setupToolbar() {
@@ -49,7 +49,7 @@ class WaitingReceiverFragment :
         }
     }
 
-    private fun observeSenderRejection() {
+    private fun observeReceiverRejection() {
         val navBackStackEntry = findNavController().currentBackStackEntry
         navBackStackEntry?.savedStateHandle
             ?.getLiveData<Boolean>("receiverDeclined")

From a34f59b49d143ecebc5111279def2e425b51f313 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 24 Jun 2025 17:00:58 +0100
Subject: [PATCH 035/153] WIP manual register flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 34 +++++++++++--------
 .../domain/peertopeer/IncomingRegistration.kt |  6 ++++
 .../fragment/peertopeer/PeerEventManager.kt   | 21 ++++++++++--
 .../peertopeer/PeerToPeerViewModel.kt         | 17 ++++++++++
 .../RecipientVerificationFragment.kt          | 29 ++++++++++++++--
 .../senderflow/SenderVerificationFragment.kt  | 16 ++++-----
 6 files changed, 93 insertions(+), 30 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/IncomingRegistration.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index d92cbea5b..f37804b4f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -22,6 +22,7 @@ import io.ktor.server.routing.routing
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
@@ -34,6 +35,7 @@ import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
 import java.util.UUID
+import kotlin.coroutines.Continuation
 
 const val port = 53317
 
@@ -51,6 +53,9 @@ class TellaPeerToPeerServer(
     override val certificatePem: String
         get() = CertificateUtils.certificateToPem(certificate)
 
+    private val pendingRegistrations = mutableMapOf<String, Continuation<PeerResponse>>()
+
+
     override fun start() {
         val keyStore = KeyStore.getInstance("PKCS12").apply {
             load(null, null)
@@ -96,27 +101,25 @@ class TellaPeerToPeerServer(
                         val request = try {
                             call.receive<PeerRegisterPayload>()
                         } catch (e: Exception) {
-                            call.respondText(
-                                """{"error": "Invalid request body"}""",
-                                ContentType.Application.Json,
-                                HttpStatusCode.BadRequest
-                            )
+                            call.respond(HttpStatusCode.BadRequest, "Invalid request body")
                             return@post
                         }
 
-                        val sessionId = UUID.randomUUID().toString()
+                        val registrationId = UUID.randomUUID().toString()
 
-                        // Emit registration success event asynchronously
+                        val accepted = PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
+
+                        if (!accepted) {
+                            call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
+                            return@post
+                        }
+
+                        val sessionId = registrationId // or generate a separate one
                         launch {
                             PeerEventManager.emitRegistrationSuccess()
                         }
 
-                        call.respondText(
-                            Gson().toJson(PeerResponse(sessionId)),
-                            ContentType.Application.Json,
-                            HttpStatusCode.OK
-                        )
-
+                        call.respond(HttpStatusCode.OK, PeerResponse(sessionId))
                     }
                     post("/api/v1/prepare-upload") {
                         val request = try {
@@ -135,7 +138,10 @@ class TellaPeerToPeerServer(
 
                         if (accepted) {
                             val transmissionId = UUID.randomUUID().toString()
-                            call.respond(HttpStatusCode.OK, PeerPrepareUploadResponse(transmissionId))
+                            call.respond(
+                                HttpStatusCode.OK,
+                                PeerPrepareUploadResponse(transmissionId)
+                            )
                         } else {
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/IncomingRegistration.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/IncomingRegistration.kt
new file mode 100644
index 000000000..bc983a3f3
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/IncomingRegistration.kt
@@ -0,0 +1,6 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+data class IncomingRegistration(
+    val registrationId: String,
+    val payload: PeerRegisterPayload
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
index 8185f82a8..26c2e1c9a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
@@ -1,12 +1,10 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.response.respond
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
+import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 
 /**
  * Created by wafa on 3/6/2025.
@@ -15,6 +13,12 @@ object PeerEventManager {
 
     // MutableSharedFlow to emit registration events, replay 1 to send last event to new collectors
     val registrationEvents = MutableSharedFlow<Boolean>(replay = 1)
+    private val _registrationRequests = MutableSharedFlow<Pair<String, PeerRegisterPayload>>(replay = 1)
+    val registrationRequests = _registrationRequests.asSharedFlow()
+
+    private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+
+
 
     // Call this when registration succeeds
     suspend fun emitRegistrationSuccess() {
@@ -39,4 +43,15 @@ object PeerEventManager {
     fun resolveUserDecision(sessionId: String, accepted: Boolean) {
         decisionMap.remove(sessionId)?.complete(accepted)
     }
+
+    suspend fun emitIncomingRegistrationRequest(registrationId: String, payload: PeerRegisterPayload): Boolean {
+        val deferred = CompletableDeferred<Boolean>()
+        registrationDecisionMap[registrationId] = deferred
+        _registrationRequests.emit(registrationId to payload)
+        return deferred.await()
+    }
+
+    fun confirmRegistration(registrationId: String, accepted: Boolean) {
+        registrationDecisionMap.remove(registrationId)?.complete(accepted)
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index a0fb47958..11d0f1249 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -24,6 +24,7 @@ import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
 import timber.log.Timber
@@ -55,6 +56,8 @@ class PeerToPeerViewModel @Inject constructor(
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
     private val _incomingPrepareRequest = MutableLiveData<PrepareUploadRequest?>()
     val incomingPrepareRequest: MutableLiveData<PrepareUploadRequest?> = _incomingPrepareRequest
+    private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
+    val incomingRequest: StateFlow<IncomingRegistration?> = _incomingRequest
 
     init {
         viewModelScope.launch {
@@ -68,6 +71,12 @@ class PeerToPeerViewModel @Inject constructor(
                 _registrationServerSuccess.postValue(success)
             }
         }
+
+        viewModelScope.launch {
+            PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
+                _incomingRequest.value = IncomingRegistration(registrationId, payload)
+            }
+        }
     }
 
     fun resetRegistrationState() {
@@ -220,6 +229,14 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+    fun onUserConfirmedRegistration(registrationId: String) {
+        PeerEventManager.confirmRegistration(registrationId, accepted = true)
+    }
+
+    fun onUserRejectedRegistration(registrationId: String) {
+        PeerEventManager.confirmRegistration(registrationId, accepted = false)
+    }
+
     fun clearPrepareRequest() {
         _incomingPrepareRequest.value = null
         hasNavigatedToSuccessFragment = false
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index c698a5dea..1901eb5ee 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -3,8 +3,11 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.google.gson.Gson
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
@@ -29,12 +32,32 @@ class RecipientVerificationFragment :
         }
         initListeners()
         initView()
+
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                viewModel.incomingRequest.collect { request ->
+                    if (request != null) {
+                        binding.confirmAndConnectBtn.isEnabled = true
+                        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+
+                        // Set the click listener when the request is available
+                        binding.confirmAndConnectBtn.setOnClickListener {
+                            viewModel.onUserConfirmedRegistration(request.registrationId)
+                        }
+                    } else {
+                        binding.confirmAndConnectBtn.isEnabled = false
+                        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange16_btn)
+                        binding.confirmAndConnectBtn.setOnClickListener(null) // Optional: clear listener
+                    }
+                }
+            }
+        }
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+                bundle.putBoolean("isSender", false)
+                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
                 binding.confirmAndConnectBtn.setOnClickListener {
-                 //   bundle.putBoolean("isSender", false)
-                    navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
+
                 }
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index caa9cf423..f80d6a199 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -3,7 +3,10 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
@@ -61,16 +64,9 @@ class SenderVerificationFragment :
 
     private fun initObservers() {
 
-        viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                // Navigate to the next screen
-               // bundle.putBoolean("isSender", false)
-                navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
-                //  reset the LiveData state if we want to consume event once
-                viewModel.resetRegistrationState()
-            } else {
-            }
-        }
+
+
+
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()

From a430931e9e820ed31a40ebfbc6915072b47bf0b4 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 26 Jun 2025 16:29:40 +0100
Subject: [PATCH 036/153] Revert "change the connectCode to ipAdress"

This reverts commit d311889ecbcd20913709d15e7fa7511f9afb234f.
---
 .../tella/mobile/domain/peertopeer/PeerConnectionPayload.kt   | 4 ++--
 .../views/fragment/peertopeer/receipentflow/QRCodeFragment.kt | 2 +-
 .../peertopeer/receipentflow/ShowDeviceInfoFragment.kt        | 4 ++--
 .../fragment/peertopeer/senderflow/ScanQrCodeFragment.kt      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
index 81bb98411..7a28595c5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
@@ -3,8 +3,8 @@ package org.horizontal.tella.mobile.domain.peertopeer
 import com.google.gson.annotations.SerializedName
 
 data class PeerConnectionPayload(
-    @SerializedName("ip_address")
-    val ipAdress: String,
+    @SerializedName("connect_code")
+    val connectCode: String,
 
     @SerializedName("port")
     val port: Int,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 1d767fb51..b1082a021 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -69,7 +69,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val port = port
 
         payload = PeerConnectionPayload(
-            ipAdress = ip,
+            connectCode = ip,
             port = port,
             certificateHash = certHash,
             pin = pin
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 88afc2975..60937962a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -30,7 +30,7 @@ class ShowDeviceInfoFragment :
     }
 
     private fun initView() {
-        binding.connectCode.setRightText(payload?.ipAdress)
+        binding.connectCode.setRightText(payload?.connectCode)
         binding.pin.setRightText(payload?.pin)
         binding.port.setRightText(payload?.port.toString())
     }
@@ -45,7 +45,7 @@ class ShowDeviceInfoFragment :
             viewModel.clientHash.collect { hash ->
                 viewModel.setPeerSessionInfo(
                     PeerConnectionInfo(
-                        ip = payload?.ipAdress.toString(),
+                        ip = payload?.connectCode.toString(),
                         port = payload?.port.toString(),
                         pin = payload?.pin?.toInt()!!,
                         hash = hash
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 8e06174a1..99e265911 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -61,7 +61,7 @@ class ScanQrCodeFragment :
                         val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
 
                         viewModel.startRegistration(
-                            ip = payload.ipAdress,
+                            ip = payload.connectCode,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
                             pin = payload.pin

From f717ab3611394f996bf1ee47ebb5972e0819e69d Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 26 Jun 2025 20:28:36 +0100
Subject: [PATCH 037/153] Finish connect flow

---
 mobile/src/main/AndroidManifest.xml           |  1 +
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  4 ++--
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 10 ++--------
 .../{ => remote}/PrepareUploadRequest.kt      |  3 ++-
 .../{data => domain}/peertopeer/FileItem.kt   |  2 +-
 .../fragment/peertopeer/PeerEventManager.kt   |  2 +-
 .../peertopeer/PeerToPeerViewModel.kt         |  9 ++++++---
 .../receipentflow/QRCodeFragment.kt           |  9 +++------
 .../RecipientVerificationFragment.kt          | 20 +++++++++----------
 9 files changed, 28 insertions(+), 32 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/{ => remote}/PrepareUploadRequest.kt (66%)
 rename mobile/src/main/java/org/horizontal/tella/mobile/{data => domain}/peertopeer/FileItem.kt (78%)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 37ad47641..bdc0b94e2 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
 
     <queries>
         <intent>
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index d0682d980..2eacbadc8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -11,9 +11,10 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.json.JSONObject
-import java.io.File
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
@@ -74,7 +75,6 @@ class TellaPeerToPeerClient {
 
             val jsonPayload = Json.encodeToString(payload)
             val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
-            Log.d("PeerClient", "Request payload: $requestBody")
 
             val client = getClientWithFingerprintValidation(expectedFingerprint)
             val request = Request.Builder()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index f37804b4f..c66cd3f48 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -1,8 +1,6 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
 import android.util.Log
-import com.google.gson.Gson
-import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.call
@@ -19,12 +17,12 @@ import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.routing
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
@@ -35,7 +33,6 @@ import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
 import java.util.UUID
-import kotlin.coroutines.Continuation
 
 const val port = 53317
 
@@ -53,9 +50,6 @@ class TellaPeerToPeerServer(
     override val certificatePem: String
         get() = CertificateUtils.certificateToPem(certificate)
 
-    private val pendingRegistrations = mutableMapOf<String, Continuation<PeerResponse>>()
-
-
     override fun start() {
         val keyStore = KeyStore.getInstance("PKCS12").apply {
             load(null, null)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
similarity index 66%
rename from mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
index 2653e826a..803f30c08 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PrepareUploadRequest.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
@@ -1,7 +1,8 @@
-package org.horizontal.tella.mobile.data.peertopeer
+package org.horizontal.tella.mobile.data.peertopeer.remote
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 
 @Serializable
 data class PrepareUploadRequest(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
similarity index 78%
rename from mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
index 8c4071fac..f089be108 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FileItem.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.data.peertopeer
+package org.horizontal.tella.mobile.domain.peertopeer
 
 import kotlinx.serialization.Serializable
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
index 26c2e1c9a..5b4da64b0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
@@ -3,7 +3,7 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 
 /**
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 11d0f1249..e939abaf0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
-import org.horizontal.tella.mobile.data.peertopeer.PrepareUploadRequest
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
@@ -230,10 +230,13 @@ class PeerToPeerViewModel @Inject constructor(
     }
 
     fun onUserConfirmedRegistration(registrationId: String) {
-        PeerEventManager.confirmRegistration(registrationId, accepted = true)
+        viewModelScope.launch {
+            PeerEventManager.confirmRegistration(registrationId, true)
+            _registrationSuccess.postValue(true)
+        }
     }
-
     fun onUserRejectedRegistration(registrationId: String) {
+        //TODO when the user reject i THINK the client should go back to the
         PeerEventManager.confirmRegistration(registrationId, accepted = false)
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index b1082a021..4a643d659 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -17,7 +17,6 @@ import org.horizontal.tella.mobile.data.peertopeer.port
 import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
-import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import javax.inject.Inject
@@ -26,9 +25,9 @@ import javax.inject.Inject
 class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCodeBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
-    private var server: TellaServer? = null
     private var payload: PeerConnectionPayload? = null
     private lateinit var qrPayload: String
+
     @Inject
     lateinit var peerServerStarterManager: PeerServerStarterManager
 
@@ -47,7 +46,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-              //  bundle.putBoolean("isSender", false)
+                //  bundle.putBoolean("isSender", false)
                 navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
@@ -63,7 +62,6 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
 
         peerServerStarterManager.startServer(ip, keyPair, certificate, config)
 
-
         val certHash = CertificateUtils.getPublicKeyHash(certificate)
         val pin = (100000..999999).random().toString()
         val port = port
@@ -79,7 +77,6 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         generateQrCode(qrPayload)
     }
 
-
     private fun generateQrCode(content: String) {
         try {
             val barcodeEncoder = BarcodeEncoder()
@@ -116,7 +113,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     private fun initObservers() {
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-               // bundle.putBoolean("isSender", false)
+                bundle.putBoolean("isSender", false)
                 navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
             } else {
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 1901eb5ee..c2210ab67 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -44,6 +44,12 @@ class RecipientVerificationFragment :
                         binding.confirmAndConnectBtn.setOnClickListener {
                             viewModel.onUserConfirmedRegistration(request.registrationId)
                         }
+
+                        binding.discardBtn.setOnClickListener {
+                            peerServerStarterManager.stopServer()
+                            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+                            viewModel.onUserRejectedRegistration(request.registrationId)
+                        }
                     } else {
                         binding.confirmAndConnectBtn.isEnabled = false
                         binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange16_btn)
@@ -54,11 +60,8 @@ class RecipientVerificationFragment :
         }
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                bundle.putBoolean("isSender", false)
-                navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
-                binding.confirmAndConnectBtn.setOnClickListener {
-
-                }
+                    bundle.putBoolean("isSender", false)
+                    navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
             }
         }
     }
@@ -72,11 +75,6 @@ class RecipientVerificationFragment :
     }
 
     private fun initListeners() {
-        binding.confirmAndConnectBtn.setOnClickListener {
-            binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
-          //  bundle.putBoolean("isSender", false)
-            navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
-        }
 
         binding.toolbar.backClickListener = {
             peerServerStarterManager.stopServer()
@@ -87,6 +85,8 @@ class RecipientVerificationFragment :
             peerServerStarterManager.stopServer()
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
+
+        binding.confirmAndConnectBtn.setOnClickListener(null)
     }
 
 }
\ No newline at end of file

From 2b180cb93f0f8c9bfac61c62d591b6c463dbb7f6 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 27 Jun 2025 11:02:44 +0100
Subject: [PATCH 038/153] finish reject flow

---
 .../{WaitingFragmentSender.kt => WaitingSenderFragment.kt} | 7 +++----
 .../receipentflow/RecipientVerificationFragment.kt         | 5 ++++-
 .../peertopeer/senderflow/PrepareUploadFragment.kt         | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{WaitingFragmentSender.kt => WaitingSenderFragment.kt} (87%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt
similarity index 87%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt
index bc5f2fa73..5a3bc4340 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingFragmentSender.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt
@@ -2,14 +2,12 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import com.hzontal.tella_vault.VaultFile
 import org.horizontal.tella.mobile.R
-import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
@@ -21,7 +19,8 @@ class WaitingSenderFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolbar.setStartTextTitle(getString(R.string.send_files))
         binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
-
+        val selectedFiles = arguments?.getSerializable("selectedFiles") as? List<VaultFile> ?: emptyList()
+        viewModelSender.prepareUploadsFromVaultFiles(selectedFiles)
         binding.toolbar.backClickListener = {
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index c2210ab67..7781897fd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -60,7 +60,10 @@ class RecipientVerificationFragment :
         }
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                    bundle.putBoolean("isSender", false)
+                bundle.putBoolean("isSender", false)
+            //    navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
+                binding.confirmAndConnectBtn.setOnClickListener {
+                 //   bundle.putBoolean("isSender", false)
                     navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 422700a3d..476c26574 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -298,10 +298,11 @@ class PrepareUploadFragment :
                 if (isSubmitEnabled) {
                     val selectedFiles = filesRecyclerViewAdapter.getFiles()
                     if (selectedFiles.isNotEmpty()) {
-                        viewModel.prepareUploadsFromVaultFiles(selectedFiles)
+                        bundle.putSerializable("selectedFiles", ArrayList(selectedFiles)) // assuming VaultFile is Serializable
+                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
+                        //viewModel.prepareUploadsFromVaultFiles(selectedFiles)
                         // navigate to waiting view
                         //bundle.putBoolean("isSender", true)
-                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
                     } else {
                         showToast("No file selected")
                     }

From 6b126e0c1d39b40cabdab9c73494fc4e39f63686 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 27 Jun 2025 11:09:45 +0100
Subject: [PATCH 039/153] fix merge conflicts

---
 .../receipentflow/RecipientVerificationFragment.kt         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 7781897fd..acaa3bbe0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -61,10 +61,9 @@ class RecipientVerificationFragment :
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 bundle.putBoolean("isSender", false)
-            //    navManager().navigateFromRecipientVerificationScreenToWaitingFragment()
-                binding.confirmAndConnectBtn.setOnClickListener {
-                 //   bundle.putBoolean("isSender", false)
-                    navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
+              ///  binding.confirmAndConnectBtn.setOnClickListener {
+                navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
+          //  }
             }
         }
     }

From c4d338cc9397a8086b86196556e9c4c8aba887e8 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 30 Jun 2025 12:18:11 +0100
Subject: [PATCH 040/153] delete old code

---
 .../peertopeer/receipentflow/RecipientVerificationFragment.kt  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index acaa3bbe0..67181b4be 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -60,10 +60,7 @@ class RecipientVerificationFragment :
         }
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                bundle.putBoolean("isSender", false)
-              ///  binding.confirmAndConnectBtn.setOnClickListener {
                 navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
-          //  }
             }
         }
     }

From a195b50842e7939621fc64c33232807efb449f53 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 30 Jun 2025 15:12:25 +0100
Subject: [PATCH 041/153] wip import files

---
 .../peertopeer/activity/PeerToPeerActivity.kt | 58 +++++++++++++++++++
 .../senderflow/PrepareUploadFragment.kt       | 21 +------
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
index 83c42259f..69ea4fe4b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -2,24 +2,82 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.activity
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.viewModels
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.gson.Gson
+import com.hzontal.tella_vault.VaultFile
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ActivityPeerToPeerBinding
+import org.horizontal.tella.mobile.mvvm.media.MediaImportViewModel
+import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.base_ui.BaseLockActivity
+import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILE_KEY
+import timber.log.Timber
 
 class PeerToPeerActivity : BaseLockActivity() {
     private lateinit var binding: ActivityPeerToPeerBinding
+    private val mediaImportViewModel: MediaImportViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityPeerToPeerBinding.inflate(layoutInflater)
         setContentView(binding.getRoot())
+        initObservers()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
+        // Handle import results
+        if (requestCode == C.IMPORT_VIDEO || requestCode == C.IMPORT_IMAGE || requestCode == C.IMPORT_FILE) {
+            handleImportResult(requestCode, data)
+            return
+        }
+
         // Delegate onActivityResult to child fragments
         supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
             it.onActivityResult(requestCode, resultCode, data)
         }
+
+    }
+
+    private fun handleImportResult(requestCode: Int, data: Intent?) {
+        try {
+            if (data != null) {
+                val uri = data.data
+                if (uri != null) {
+                    divviupUtils.runFileImportEvent()
+                    when (requestCode) {
+                        C.IMPORT_FILE -> mediaImportViewModel.importFile(uri)
+                    }
+                }
+            }
+        } catch (e: NullPointerException) {
+            // Handle null pointer exception
+            showToast(R.string.gallery_toast_fail_importing_file)
+            FirebaseCrashlytics.getInstance().recordException(e)
+            Timber.e(e, "NullPointerException occurred: ${e.message}")
+        } catch (e: Exception) {
+            // Handle other exceptions
+            FirebaseCrashlytics.getInstance().recordException(e)
+            Timber.e(e, "NullPointerException occurred: ${e.message}")
+        }
+    }
+
+    private fun onMediaFileImported(vaultFile: VaultFile) {
+        val list: MutableList<String> = ArrayList()
+        list.add(vaultFile.id)
+        onActivityResult(
+            C.MEDIA_FILE_ID, RESULT_OK, Intent().putExtra(VAULT_FILE_KEY, Gson().toJson(list))
+        )
+    }
+
+    private fun onImportError(throwable: Throwable?) {
+        Timber.d(throwable)
+    }
+
+    private fun initObservers() {
+        mediaImportViewModel.mediaFileLiveData.observe(this, ::onMediaFileImported)
+        mediaImportViewModel.importError.observe(this, ::onImportError)
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 476c26574..c0564ef3d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -256,16 +256,7 @@ class PrepareUploadFragment :
     }
 
     private fun putFiles(vaultFileList: List<VaultFile>) {
-        val filteredFiles = vaultFileList.filter { file ->
-            isValidFile(file)
-        }.also {
-            if (it.size != vaultFileList.size) {
-                showToast(getString(R.string.nextcloud_file_size_limit))
-            }
-        }
-
-        // Insert the filtered files
-        filteredFiles.forEach { file ->
+        vaultFileList.forEach { file ->
             filesRecyclerViewAdapter.insertAttachment(file)
         }
 
@@ -299,10 +290,8 @@ class PrepareUploadFragment :
                     val selectedFiles = filesRecyclerViewAdapter.getFiles()
                     if (selectedFiles.isNotEmpty()) {
                         bundle.putSerializable("selectedFiles", ArrayList(selectedFiles)) // assuming VaultFile is Serializable
-                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
-                        //viewModel.prepareUploadsFromVaultFiles(selectedFiles)
                         // navigate to waiting view
-                        //bundle.putBoolean("isSender", true)
+                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
                     } else {
                         showToast("No file selected")
                     }
@@ -322,12 +311,6 @@ class PrepareUploadFragment :
         )
     }
 
-    // Helper function to check if the file is valid (less than or equal to 20MB)
-    private fun isValidFile(file: VaultFile): Boolean {
-        val isFileSizeValid = file.size <= 20 * 1024 * 1024 // 20MB in bytes
-        return isFileSizeValid
-    }
-
     override fun playMedia(mediaFile: VaultFile?) {
     }
 

From 874597dabe7bbd655fa10e41e3e6c121279aa002 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 1 Jul 2025 12:20:10 +0100
Subject: [PATCH 042/153] fix hash generation to match the ios

---
 .../horizontal/tella/mobile/certificate/CertificateUtils.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
index 1f12b1179..25431735a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -40,10 +40,11 @@ object CertificateUtils {
     fun decodeBase64(encodedString: String): ByteArray =
         Base64.decode(encodedString, Base64.NO_WRAP)
 
+
     fun getPublicKeyHash(certificate: X509Certificate): String {
         val digest = java.security.MessageDigest.getInstance("SHA-256")
-        val hash = digest.digest(certificate.publicKey.encoded)
-        return hash.joinToString("") { "%04x".format(it) }
+        val hash = digest.digest(certificate.encoded)
+        return hash.joinToString("") { "%02x".format(it) } // <-- fix here
     }
 
     fun createSSLContext(

From 30862cb77d0c1084729167dd46e7263960538aa9 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 1 Jul 2025 14:08:16 +0100
Subject: [PATCH 043/153] Fix qr code flow

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 46 +++++++++++--------
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 10 ++--
 .../domain/peertopeer/PeerRegisterPayload.kt  |  3 +-
 .../tella/mobile/util/Extensions.kt           |  3 --
 .../peertopeer/PeerToPeerViewModel.kt         | 14 +++++-
 .../senderflow/ScanQrCodeFragment.kt          |  3 +-
 .../senderflow/SenderVerificationFragment.kt  |  5 +-
 7 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 2eacbadc8..236542047 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -62,7 +62,8 @@ class TellaPeerToPeerClient {
         ip: String,
         port: String,
         expectedFingerprint: String,
-        pin: String
+        pin: String,
+        autoUpload: Boolean
     ): Result<String> = withContext(Dispatchers.IO) {
         val url = "https://$ip:$port/api/v1/register"
         Log.d("PeerClient", "Connecting to: $url")
@@ -70,7 +71,8 @@ class TellaPeerToPeerClient {
         try {
             val payload = PeerRegisterPayload(
                 pin = pin,
-                nonce = UUID.randomUUID().toString()
+                nonce = UUID.randomUUID().toString(),
+                autoUpload
             )
 
             val jsonPayload = Json.encodeToString(payload)
@@ -162,8 +164,16 @@ class TellaPeerToPeerClient {
                 } else {
                     Log.e("PrepareUpload", "Server error ${response.code}: ${response.message}")
                     when (response.code) {
-                        400 -> Log.e("PrepareUpload", "Bad Request – likely missing or invalid fields.")
-                        403 -> Log.e("PrepareUpload", "Forbidden – the server is refusing the request.")
+                        400 -> Log.e(
+                            "PrepareUpload",
+                            "Bad Request – likely missing or invalid fields."
+                        )
+
+                        403 -> Log.e(
+                            "PrepareUpload",
+                            "Forbidden – the server is refusing the request."
+                        )
+
                         409 -> Log.e("PrepareUpload", "Conflict – maybe another active session.")
                         500 -> Log.e("PrepareUpload", "Internal Server Error – try again later.")
                         else -> Log.e("PrepareUpload", "Unhandled server error code.")
@@ -179,21 +189,21 @@ class TellaPeerToPeerClient {
     }
 
 
-    suspend fun fetchServerFingerprint(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
-        try {
-            val socket = SSLSocketFactory.getDefault()
-                .createSocket(ip, port) as SSLSocket
-            socket.soTimeout = 5000
-            socket.startHandshake()
-
-            val cert = socket.session.peerCertificates[0] as X509Certificate
-            val fingerprint = CertificateUtils.getPublicKeyHash(cert)
-            Result.success(fingerprint)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
+    suspend fun fetchServerFingerprint(ip: String, port: Int): Result<String> =
+        withContext(Dispatchers.IO) {
+            try {
+                val socket = SSLSocketFactory.getDefault()
+                    .createSocket(ip, port) as SSLSocket
+                socket.soTimeout = 5000
+                socket.startHandshake()
 
+                val cert = socket.session.peerCertificates[0] as X509Certificate
+                val fingerprint = CertificateUtils.getPublicKeyHash(cert)
+                Result.success(fingerprint)
+            } catch (e: Exception) {
+                Result.failure(e)
+            }
+        }
 
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index c66cd3f48..c479a53b7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -101,20 +101,24 @@ class TellaPeerToPeerServer(
 
                         val registrationId = UUID.randomUUID().toString()
 
-                        val accepted = PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
+                        val accepted = if (request.autoAccept) {
+                            true // Automatically accept
+                        } else {
+                            PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
+                        }
 
                         if (!accepted) {
                             call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
                             return@post
                         }
 
-                        val sessionId = registrationId // or generate a separate one
                         launch {
                             PeerEventManager.emitRegistrationSuccess()
                         }
 
-                        call.respond(HttpStatusCode.OK, PeerResponse(sessionId))
+                        call.respond(HttpStatusCode.OK, PeerResponse(registrationId))
                     }
+
                     post("/api/v1/prepare-upload") {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
index d9c399056..fc5f65d2b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
@@ -6,5 +6,6 @@ import java.util.UUID
 @Serializable
 data class PeerRegisterPayload(
     val pin: String,
-    val nonce: String = UUID.randomUUID().toString()
+    val nonce: String = UUID.randomUUID().toString(),
+    val autoAccept: Boolean = false,
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
index 514cdf6d9..3e4cb8ba6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
@@ -18,9 +18,6 @@ import androidx.navigation.NavController
 import com.google.gson.Gson
 import com.google.gson.JsonParseException
 import com.google.gson.reflect.TypeToken
-/*import org. cleaninsights.sdk.Campaign
-import org.cleaninsights.sdk.CleanInsights
-import org.cleaninsights.sdk.CleanInsightsConfiguration*/
 import timber.log.Timber
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index e939abaf0..56913d24a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -82,9 +82,11 @@ class PeerToPeerViewModel @Inject constructor(
     fun resetRegistrationState() {
         _registrationServerSuccess.postValue(false)
     }
+
     fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
         PeerEventManager.resolveUserDecision(sessionId, accepted)
     }
+
     @RequiresApi(Build.VERSION_CODES.M)
     @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
     fun fetchCurrentNetworkInfo() {
@@ -194,9 +196,15 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-    fun startRegistration(ip: String, port: String, hash: String, pin: String) {
+    fun startRegistration(
+        ip: String,
+        port: String,
+        hash: String,
+        pin: String,
+        autoUpload: Boolean
+    ) {
         viewModelScope.launch {
-            val result = peerClient.registerPeerDevice(ip, port, hash, pin)
+            val result = peerClient.registerPeerDevice(ip, port, hash, pin, autoUpload)
             result.onSuccess { sessionId ->
                 PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
                 // update UI state
@@ -235,6 +243,7 @@ class PeerToPeerViewModel @Inject constructor(
             _registrationSuccess.postValue(true)
         }
     }
+
     fun onUserRejectedRegistration(registrationId: String) {
         //TODO when the user reject i THINK the client should go back to the
         PeerEventManager.confirmRegistration(registrationId, accepted = false)
@@ -245,6 +254,7 @@ class PeerToPeerViewModel @Inject constructor(
         hasNavigatedToSuccessFragment = false
 
     }
+
     fun setPeerSessionInfo(info: PeerConnectionInfo) {
         _sessionInfo.value = info
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 99e265911..3c50a2d9b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -64,7 +64,8 @@ class ScanQrCodeFragment :
                             ip = payload.connectCode,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
-                            pin = payload.pin
+                            pin = payload.pin,
+                            autoUpload = true
                         )
 
                     } catch (e: Exception) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index f80d6a199..615ffab85 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -53,7 +53,8 @@ class SenderVerificationFragment :
                 ip = peerConnectionInfo.ip,
                 port = peerConnectionInfo.port,
                 hash = peerConnectionInfo.hash,
-                pin = peerConnectionInfo.pin.toString()
+                pin = peerConnectionInfo.pin.toString(),
+                autoUpload = false
             )
         }
 
@@ -65,8 +66,6 @@ class SenderVerificationFragment :
     private fun initObservers() {
 
 
-
-
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()

From 0fcf9d08aa05c3ce27cce248889ff21d138002e8 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 1 Jul 2025 21:21:56 +0100
Subject: [PATCH 044/153] Correct ios/android connect flow

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  4 +-
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 10 ++--
 .../peertopeer/PeerConnectionPayload.kt       |  4 +-
 .../domain/peertopeer/PeerRegisterPayload.kt  |  2 +-
 .../peertopeer/PeerToPeerViewModel.kt         |  7 +++
 .../receipentflow/QRCodeFragment.kt           |  5 +-
 .../RecipientVerificationFragment.kt          | 49 ++++++++++---------
 .../receipentflow/ShowDeviceInfoFragment.kt   |  4 +-
 .../senderflow/ScanQrCodeFragment.kt          |  2 +-
 .../senderflow/SenderVerificationFragment.kt  |  4 +-
 10 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 236542047..c71fbbb77 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -72,11 +72,11 @@ class TellaPeerToPeerClient {
             val payload = PeerRegisterPayload(
                 pin = pin,
                 nonce = UUID.randomUUID().toString(),
-                autoUpload
+             //   autoUpload
             )
 
             val jsonPayload = Json.encodeToString(payload)
-            val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
+            val requestBody = jsonPayload.toRequestBody()
 
             val client = getClientWithFingerprintValidation(expectedFingerprint)
             val request = Request.Builder()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index c479a53b7..35e125aeb 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -101,11 +101,11 @@ class TellaPeerToPeerServer(
 
                         val registrationId = UUID.randomUUID().toString()
 
-                        val accepted = if (request.autoAccept) {
-                            true // Automatically accept
-                        } else {
-                            PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
-                        }
+                       // val accepted = if (request.autoAccept) {
+                         //   true // Automatically accept
+                        //} else {
+                        val accepted =   PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
+                        //}
 
                         if (!accepted) {
                             call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
index 7a28595c5..c708ed611 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerConnectionPayload.kt
@@ -3,8 +3,8 @@ package org.horizontal.tella.mobile.domain.peertopeer
 import com.google.gson.annotations.SerializedName
 
 data class PeerConnectionPayload(
-    @SerializedName("connect_code")
-    val connectCode: String,
+    @SerializedName("ip_address")
+    val ipAddress : String,
 
     @SerializedName("port")
     val port: Int,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
index fc5f65d2b..9ae20e47e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
@@ -7,5 +7,5 @@ import java.util.UUID
 data class PeerRegisterPayload(
     val pin: String,
     val nonce: String = UUID.randomUUID().toString(),
-    val autoAccept: Boolean = false,
+   // val autoAccept: Boolean = false,
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 56913d24a..a38b7fa43 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -39,6 +39,7 @@ class PeerToPeerViewModel @Inject constructor(
     peerToPeerManager: PeerToPeerManager
 ) : ViewModel() {
 
+    var isManualConnection: Boolean = true // default is manual
     var hasNavigatedToSuccessFragment = false
     private val _networkInfo = MutableLiveData<NetworkInfo>()
     val networkInfo: LiveData<NetworkInfo> = _networkInfo
@@ -75,6 +76,12 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
+
+                if (!isManualConnection) {
+                    // QR-mode: auto-accept immediately
+                    PeerEventManager.confirmRegistration(registrationId, true)
+                    _registrationSuccess.postValue(true)
+                }
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 4a643d659..6be61ad9a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -43,6 +43,9 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
         handleBack()
         handleConnectManually()
+
+        viewModel.isManualConnection = false
+
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
@@ -67,7 +70,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val port = port
 
         payload = PeerConnectionPayload(
-            connectCode = ip,
+            ipAddress = ip,
             port = port,
             certificateHash = certHash,
             pin = pin
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 67181b4be..9234e6a34 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -31,7 +31,31 @@ class RecipientVerificationFragment :
             payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
         }
         initListeners()
-        initView()
+        initObservers()
+    }
+
+    private fun initListeners() {
+
+        binding.toolbar.backClickListener = {
+            peerServerStarterManager.stopServer()
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
+
+        binding.discardBtn.setOnClickListener {
+            peerServerStarterManager.stopServer()
+            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        }
+
+        binding.confirmAndConnectBtn.setOnClickListener(null)
+    }
+
+    private fun initObservers() {
+        lifecycleScope.launchWhenStarted {
+            viewModel.sessionInfo.collect { session ->
+                binding.hashContentTextView.text = session?.hash?.formatHash()
+            }
+        }
+        viewModel.isManualConnection = true
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
@@ -65,27 +89,4 @@ class RecipientVerificationFragment :
         }
     }
 
-    private fun initView() {
-        lifecycleScope.launchWhenStarted {
-            viewModel.sessionInfo.collect { session ->
-                binding.hashContentTextView.text = session?.hash?.formatHash()
-            }
-        }
-    }
-
-    private fun initListeners() {
-
-        binding.toolbar.backClickListener = {
-            peerServerStarterManager.stopServer()
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
-
-        binding.discardBtn.setOnClickListener {
-            peerServerStarterManager.stopServer()
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
-
-        binding.confirmAndConnectBtn.setOnClickListener(null)
-    }
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 60937962a..559e8872e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -30,7 +30,7 @@ class ShowDeviceInfoFragment :
     }
 
     private fun initView() {
-        binding.connectCode.setRightText(payload?.connectCode)
+        binding.connectCode.setRightText(payload?.ipAddress)
         binding.pin.setRightText(payload?.pin)
         binding.port.setRightText(payload?.port.toString())
     }
@@ -45,7 +45,7 @@ class ShowDeviceInfoFragment :
             viewModel.clientHash.collect { hash ->
                 viewModel.setPeerSessionInfo(
                     PeerConnectionInfo(
-                        ip = payload?.connectCode.toString(),
+                        ip = payload?.ipAddress.toString(),
                         port = payload?.port.toString(),
                         pin = payload?.pin?.toInt()!!,
                         hash = hash
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 3c50a2d9b..7a8687cbe 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -61,7 +61,7 @@ class ScanQrCodeFragment :
                         val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
 
                         viewModel.startRegistration(
-                            ip = payload.connectCode,
+                            ip = payload.ipAddress,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
                             pin = payload.pin,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 615ffab85..c243bb344 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -3,10 +3,7 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
@@ -65,6 +62,7 @@ class SenderVerificationFragment :
 
     private fun initObservers() {
 
+        viewModel.isManualConnection = true
 
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {

From fa439ca9e6b07acbd4d3c8eabf32652d9a15468d Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 2 Jul 2025 14:06:14 +0100
Subject: [PATCH 045/153] refactor code save sessionId

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 35 +++++++----------
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 24 ++++++------
 .../peertopeer/remote/PrepareUploadResult.kt  | 13 +++++++
 .../fragment/peertopeer/SenderViewModel.kt    | 39 +++++++++++++------
 4 files changed, 67 insertions(+), 44 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index c71fbbb77..fadf69ed2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -12,6 +12,7 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.json.JSONObject
@@ -125,7 +126,7 @@ class TellaPeerToPeerClient {
         title: String,
         files: List<VaultFile>,
         sessionId: String
-    ): Result<String> = withContext(Dispatchers.IO) {
+    ): PrepareUploadResult = withContext(Dispatchers.IO) {
         val url = "https://$ip:$port/api/v1/prepare-upload"
 
         val fileItems = files.map {
@@ -150,41 +151,31 @@ class TellaPeerToPeerClient {
                 .addHeader("Content-Type", "application/json")
                 .build()
 
-            return@withContext client.newCall(request).execute().use { response ->
+            client.newCall(request).execute().use { response ->
                 val body = response.body?.string()
 
                 if (response.isSuccessful && body != null) {
-                    try {
+                    return@withContext try {
                         val transmissionId = JSONObject(body).getString("transmissionId")
-                        Result.success(transmissionId)
+                        PrepareUploadResult.Success(transmissionId)
                     } catch (e: Exception) {
                         Log.e("PrepareUpload", "Invalid JSON response: $body", e)
-                        Result.failure(Exception("Malformed server response"))
+                        PrepareUploadResult.Failure(Exception("Malformed server response"))
                     }
                 } else {
                     Log.e("PrepareUpload", "Server error ${response.code}: ${response.message}")
-                    when (response.code) {
-                        400 -> Log.e(
-                            "PrepareUpload",
-                            "Bad Request – likely missing or invalid fields."
-                        )
-
-                        403 -> Log.e(
-                            "PrepareUpload",
-                            "Forbidden – the server is refusing the request."
-                        )
-
-                        409 -> Log.e("PrepareUpload", "Conflict – maybe another active session.")
-                        500 -> Log.e("PrepareUpload", "Internal Server Error – try again later.")
-                        else -> Log.e("PrepareUpload", "Unhandled server error code.")
+                    return@withContext when (response.code) {
+                        400 -> PrepareUploadResult.BadRequest
+                        403 -> PrepareUploadResult.Forbidden
+                        409 -> PrepareUploadResult.Conflict
+                        500 -> PrepareUploadResult.ServerError
+                        else -> PrepareUploadResult.Failure(Exception("Unhandled server error ${response.code}"))
                     }
-                    Result.failure(Exception("Server returned error ${response.code}"))
                 }
             }
-
         } catch (e: Exception) {
             Log.e("PrepareUpload", "Exception during upload: ${e.message}", e)
-            Result.failure(e)
+            PrepareUploadResult.Failure(e)
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 35e125aeb..dddd6a4ba 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -42,9 +42,9 @@ class TellaPeerToPeerServer(
     private val keyPair: KeyPair,
     private val certificate: X509Certificate,
     private val keyStoreConfig: KeyStoreConfig,
-    private val peerToPeerManager: PeerToPeerManager
+    private val peerToPeerManager: PeerToPeerManager,
 ) : TellaServer {
-
+    private var serverSession: PeerResponse? = null
     private var engine: ApplicationEngine? = null
 
     override val certificatePem: String
@@ -99,12 +99,15 @@ class TellaPeerToPeerServer(
                             return@post
                         }
 
-                        val registrationId = UUID.randomUUID().toString()
+                        val sessionId = UUID.randomUUID().toString()
+                        val session = PeerResponse(sessionId)
+                        // Store the session in a shared serverSession variable
+                        serverSession = session
 
                        // val accepted = if (request.autoAccept) {
                          //   true // Automatically accept
                         //} else {
-                        val accepted =   PeerEventManager.emitIncomingRegistrationRequest(registrationId, request)
+                        val accepted =   PeerEventManager.emitIncomingRegistrationRequest(sessionId, request)
                         //}
 
                         if (!accepted) {
@@ -115,8 +118,7 @@ class TellaPeerToPeerServer(
                         launch {
                             PeerEventManager.emitRegistrationSuccess()
                         }
-
-                        call.respond(HttpStatusCode.OK, PeerResponse(registrationId))
+                        call.respond(HttpStatusCode.OK, session)
                     }
 
                     post("/api/v1/prepare-upload") {
@@ -132,6 +134,11 @@ class TellaPeerToPeerServer(
                             return@post
                         }
 
+                        if (request.sessionId != serverSession?.sessionId) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                            return@post
+                        }
+
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
 
                         if (accepted) {
@@ -143,11 +150,6 @@ class TellaPeerToPeerServer(
                         } else {
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
-//                        val transmissionId = UUID.randomUUID().toString()
-//                        call.respond(
-//                            HttpStatusCode.OK,
-//                            PeerPrepareUploadResponse(transmissionId)
-//                        )
                     }
                 }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
new file mode 100644
index 000000000..6e05b56a4
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
@@ -0,0 +1,13 @@
+package org.horizontal.tella.mobile.data.peertopeer.remote
+
+/**
+ * Created by wafa on 2/7/2025.
+ */
+sealed class PrepareUploadResult {
+    data class Success(val transmissionId: String) : PrepareUploadResult()
+    object Forbidden : PrepareUploadResult()
+    object BadRequest : PrepareUploadResult()
+    object Conflict : PrepareUploadResult()
+    object ServerError : PrepareUploadResult()
+    data class Failure(val exception: Throwable) : PrepareUploadResult()
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index ba7445f7b..17879c871 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
@@ -71,28 +72,44 @@ class SenderViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
-            val result = peerClient.prepareUpload(
+            when (val result = peerClient.prepareUpload(
                 ip = info.ip,
                 port = info.port,
                 expectedFingerprint = info.expectedFingerprint,
                 title = title,
                 files = files,
                 sessionId = info.sessionId
-            )
+            )) {
+                is PrepareUploadResult.Success -> {
+                    Timber.d("Success: transmissionId = ${result.transmissionId}")
+                    _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissionId))
+                }
+
+                is PrepareUploadResult.Forbidden -> {
+                    withContext(Dispatchers.Main) {
+                        Timber.w("Upload rejected by receiver")
+                        _prepareRejected.value = Event(true)
+                    }
+                }
+
+                is PrepareUploadResult.BadRequest -> {
+                    Timber.e("Bad request – possibly invalid data")
+                }
 
-            result.onSuccess { transmissionId ->
-                Timber.d("Success: transmissionId = $transmissionId")
-                _prepareResults.postValue(PeerPrepareUploadResponse(transmissionId))
-            }.onFailure { error ->
-                //  if (error.message?.contains("403") == true) {
-                withContext(Dispatchers.Main) {
-                    _prepareRejected.value = Event(true)
+                is PrepareUploadResult.Conflict -> {
+                    Timber.e("Upload conflict – another session may be active")
+                }
+
+                is PrepareUploadResult.ServerError -> {
+                    Timber.e("Internal server error – try again later")
+                }
+
+                is PrepareUploadResult.Failure -> {
+                    Timber.e(result.exception, "Unhandled error during upload")
                 }
             }
         }
     }
-
-
 }
 
 

From 9108c34523d5a9884816582b9a1c45179b14e17c Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 2 Jul 2025 16:22:49 +0100
Subject: [PATCH 046/153] Fix prepare upload (ios/Android)

---
 .../tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index fadf69ed2..4c5579389 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -141,7 +141,7 @@ class TellaPeerToPeerClient {
 
         val requestPayload = PrepareUploadRequest(title, sessionId, fileItems)
         val jsonPayload = Json.encodeToString(requestPayload)
-        val requestBody = jsonPayload.toRequestBody("application/json".toMediaType())
+        val requestBody = jsonPayload.toRequestBody()
         val client = getClientWithFingerprintValidation(expectedFingerprint)
 
         try {

From 0f07fe751894b57a12e251858b85ae5227fea07f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 2 Jul 2025 17:11:51 +0100
Subject: [PATCH 047/153] add error in case adressIp is null

---
 .../certificate/CertificateGenerator.kt       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
index 766bcd477..0f8dc74ca 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateGenerator.kt
@@ -22,9 +22,11 @@ object CertificateGenerator {
     fun generateCertificate(
         commonName: String = "Tella Android",
         organization: String = "Tella",
-        validityDays: Int = 365,
+        validityDays: Int = 7,
         ipAddress: String
     ): Pair<KeyPair, X509Certificate> {
+        require(ipAddress.isNotBlank()) { "IP address must not be empty when generating a certificate." }
+
         val keyGen = KeyPairGenerator.getInstance("RSA")
         keyGen.initialize(2048)
         val keyPair = keyGen.generateKeyPair()
@@ -41,18 +43,16 @@ object CertificateGenerator {
             issuer, serialNumber, now, validTo, subject, keyPair.public
         )
 
-        if (ipAddress.isNotEmpty()) {
-            val san = org.bouncycastle.asn1.x509.GeneralNames(
-                org.bouncycastle.asn1.x509.GeneralName(
-                    org.bouncycastle.asn1.x509.GeneralName.iPAddress, ipAddress
-                )
-            )
-            certBuilder.addExtension(
-                org.bouncycastle.asn1.x509.Extension.subjectAlternativeName,
-                false,
-                san
+        val san = org.bouncycastle.asn1.x509.GeneralNames(
+            org.bouncycastle.asn1.x509.GeneralName(
+                org.bouncycastle.asn1.x509.GeneralName.iPAddress, ipAddress
             )
-        }
+        )
+        certBuilder.addExtension(
+            org.bouncycastle.asn1.x509.Extension.subjectAlternativeName,
+            false,
+            san
+        )
 
         val signer = JcaContentSignerBuilder("SHA256withRSA")
             .build(keyPair.private)
@@ -65,4 +65,5 @@ object CertificateGenerator {
         return Pair(keyPair, certificate)
     }
 
+
 }
\ No newline at end of file

From 9e9eab457e1952827575bed12d6f0dae39e6566a Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 2 Jul 2025 19:11:19 +0100
Subject: [PATCH 048/153] get the mimeType dynamically  and save the
 transmissionId

---
 .../tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt | 8 ++++++--
 .../java/org/horizontal/tella/mobile/util/FileUtil.java   | 6 +++---
 .../views/fragment/peertopeer/PeerSessionManager.kt       | 8 +++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 4c5579389..d0ccd0355 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -6,7 +6,6 @@ import kotlinx.serialization.encodeToString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -15,6 +14,8 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
+import org.horizontal.tella.mobile.util.FileUtil.getMimeType
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
 import java.security.SecureRandom
 import java.security.cert.CertificateException
@@ -130,11 +131,12 @@ class TellaPeerToPeerClient {
         val url = "https://$ip:$port/api/v1/prepare-upload"
 
         val fileItems = files.map {
+            val mimeType = getMimeType(it.name) ?: "application/octet-stream"
             P2PFile(
                 id = it.id,
                 fileName = it.name,
                 size = it.size,
-                fileType = "application/octet-stream",
+                fileType = mimeType,
                 sha256 = it.hash
             )
         }
@@ -157,6 +159,8 @@ class TellaPeerToPeerClient {
                 if (response.isSuccessful && body != null) {
                     return@withContext try {
                         val transmissionId = JSONObject(body).getString("transmissionId")
+                        // Store it in the session manager
+                        PeerSessionManager.setTransmissionId(transmissionId)
                         PrepareUploadResult.Success(transmissionId)
                     } catch (e: Exception) {
                         Log.e("PrepareUpload", "Invalid JSON response: $body", e)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/FileUtil.java b/mobile/src/main/java/org/horizontal/tella/mobile/util/FileUtil.java
index 80201e071..54a0c4930 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/FileUtil.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/FileUtil.java
@@ -62,9 +62,9 @@ public static String getPrimaryMime(String mimeType) {
 
     @Nullable
     public static String getMimeType(@NonNull String filename) {
-        return MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-                MimeTypeMap.getFileExtensionFromUrl(filename.toLowerCase())
-        );
+        String extension = MimeTypeMap.getFileExtensionFromUrl(filename.toLowerCase());
+        // Return the corresponding MIME type or null if unknown
+        return extension != null ? MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) : null;
     }
 
   /*  public static MediaFile.Type getMediaFileType(@NonNull String filename) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
index b5f8caa3e..94b6128af 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -10,7 +10,8 @@ data class PeerConnectionInfo(
     val expectedFingerprint: String = "",
     val sessionId: String = "",
     val hash: String = "",
-    val pin: Int = 0
+    val pin: Int = 0,
+    var transmissionId: String? = null
 )
 
 object PeerSessionManager {
@@ -29,6 +30,11 @@ object PeerSessionManager {
 
     fun isSessionValid(): Boolean = connectionInfo != null
 
+    fun setTransmissionId(id: String) {
+        connectionInfo?.transmissionId = id
+    }
+
+    fun getTransmissionId(): String? = connectionInfo?.transmissionId
     fun clear() {
         connectionInfo = null
     }

From 44e478c9c3a876eb44c4c2f93679d1bba626aa7d Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 3 Jul 2025 12:49:07 +0100
Subject: [PATCH 049/153] Improve code, unify routes api

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 28 ++++++-------------
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  7 +++--
 .../data/peertopeer/remote/PeerApiRoutes.kt   | 11 ++++++++
 .../peertopeer/PeerToPeerViewModel.kt         |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index d0ccd0355..06aa5a9fc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -10,6 +10,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
@@ -17,6 +18,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
+import timber.log.Timber
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
@@ -65,9 +67,10 @@ class TellaPeerToPeerClient {
         port: String,
         expectedFingerprint: String,
         pin: String,
-        autoUpload: Boolean
     ): Result<String> = withContext(Dispatchers.IO) {
-        val url = "https://$ip:$port/api/v1/register"
+
+        val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
+
         Log.d("PeerClient", "Connecting to: $url")
 
         try {
@@ -90,6 +93,7 @@ class TellaPeerToPeerClient {
             client.newCall(request).execute().use { response ->
                 if (!response.isSuccessful) {
                     val errorBody = response.body.string()
+                    TODO("WE SHOULD USE TIMBER INSTEAD")
                     Log.e(
                         "PeerClient", """
                     HTTP ${response.code} Error
@@ -128,7 +132,8 @@ class TellaPeerToPeerClient {
         files: List<VaultFile>,
         sessionId: String
     ): PrepareUploadResult = withContext(Dispatchers.IO) {
-        val url = "https://$ip:$port/api/v1/prepare-upload"
+
+        val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
         val fileItems = files.map {
             val mimeType = getMimeType(it.name) ?: "application/octet-stream"
@@ -184,21 +189,4 @@ class TellaPeerToPeerClient {
     }
 
 
-    suspend fun fetchServerFingerprint(ip: String, port: Int): Result<String> =
-        withContext(Dispatchers.IO) {
-            try {
-                val socket = SSLSocketFactory.getDefault()
-                    .createSocket(ip, port) as SSLSocket
-                socket.soTimeout = 5000
-                socket.startHandshake()
-
-                val cert = socket.session.peerCertificates[0] as X509Certificate
-                val fingerprint = CertificateUtils.getPublicKeyHash(cert)
-                Result.success(fingerprint)
-            } catch (e: Exception) {
-                Result.failure(e)
-            }
-        }
-
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index dddd6a4ba..8319b53d1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
@@ -83,7 +84,7 @@ class TellaPeerToPeerServer(
                         call.respondText("The server is running securely over HTTPS.")
                     }
 
-                    post("/api/v1/ping") {
+                    post(PeerApiRoutes.PING) {
                         val hash = CertificateUtils.getPublicKeyHash(certificate)
                         CoroutineScope(Dispatchers.IO).launch {
                             peerToPeerManager.notifyClientConnected(hash)
@@ -91,7 +92,7 @@ class TellaPeerToPeerServer(
                         call.respondText("pong", status = HttpStatusCode.OK)
                     }
 
-                    post("/api/v1/register") {
+                    post(PeerApiRoutes.REGISTER) {
                         val request = try {
                             call.receive<PeerRegisterPayload>()
                         } catch (e: Exception) {
@@ -121,7 +122,7 @@ class TellaPeerToPeerServer(
                         call.respond(HttpStatusCode.OK, session)
                     }
 
-                    post("/api/v1/prepare-upload") {
+                    post(PeerApiRoutes.PREPARE_UPLOAD) {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
                         } catch (e: Exception) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
new file mode 100644
index 000000000..5f8ae716b
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
@@ -0,0 +1,11 @@
+package org.horizontal.tella.mobile.data.peertopeer.remote
+
+object PeerApiRoutes {
+    const val REGISTER = "/api/v1/register"
+    const val PREPARE_UPLOAD = "/api/v1/prepare-upload"
+    const val PING = "/api/v1/ping"
+
+    fun buildUrl(ip: String, port: String, endpoint: String): String {
+        return "https://$ip:$port$endpoint"
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index a38b7fa43..39a3b196d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -211,7 +211,7 @@ class PeerToPeerViewModel @Inject constructor(
         autoUpload: Boolean
     ) {
         viewModelScope.launch {
-            val result = peerClient.registerPeerDevice(ip, port, hash, pin, autoUpload)
+            val result = peerClient.registerPeerDevice(ip, port, hash, pin)
             result.onSuccess { sessionId ->
                 PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
                 // update UI state

From abb43c7c4087b084864e25c52ea829b45264f4c2 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 3 Jul 2025 15:01:00 +0100
Subject: [PATCH 050/153] unify code in TellaPeerToPeerClient

---
 .../data/peertopeer/PeerToPeerConstants.kt    | 13 +++++++++++
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 23 ++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt
new file mode 100644
index 000000000..6359cd70a
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt
@@ -0,0 +1,13 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+/**
+ * Created by wafa on 3/7/2025.
+ */
+object PeerToPeerConstants {
+    const val TRANSMISSION_ID_KEY = "transmissionId"
+    const val CONTENT_TYPE_JSON = "application/json"
+    const val CONTENT_TYPE = "Content-Type"
+    const val CONTENT_TYPE_OCTET = "application/octet-stream"
+
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 06aa5a9fc..fa67a93a5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -2,14 +2,17 @@ package org.horizontal.tella.mobile.data.peertopeer
 
 import android.util.Log
 import com.hzontal.tella_vault.VaultFile
-import kotlinx.serialization.encodeToString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_JSON
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_OCTET
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
@@ -18,15 +21,12 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
-import timber.log.Timber
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
@@ -77,7 +77,7 @@ class TellaPeerToPeerClient {
             val payload = PeerRegisterPayload(
                 pin = pin,
                 nonce = UUID.randomUUID().toString(),
-             //   autoUpload
+                //   autoUpload
             )
 
             val jsonPayload = Json.encodeToString(payload)
@@ -87,7 +87,7 @@ class TellaPeerToPeerClient {
             val request = Request.Builder()
                 .url(url)
                 .post(requestBody)
-                .addHeader("Content-Type", "application/json")
+                .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
                 .build()
 
             client.newCall(request).execute().use { response ->
@@ -105,8 +105,8 @@ class TellaPeerToPeerClient {
                     return@use Result.failure(Exception("HTTP ${response.code}: $errorBody"))
                 }
 
-                val contentType = response.header("Content-Type") ?: ""
-                if (!contentType.contains("application/json")) {
+                val contentType = response.header(CONTENT_TYPE) ?: ""
+                if (!contentType.contains(CONTENT_TYPE_JSON)) {
                     Log.w("PeerClient", "Unexpected Content-Type: $contentType")
                 }
 
@@ -136,7 +136,7 @@ class TellaPeerToPeerClient {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
         val fileItems = files.map {
-            val mimeType = getMimeType(it.name) ?: "application/octet-stream"
+            val mimeType = getMimeType(it.name) ?: CONTENT_TYPE_OCTET
             P2PFile(
                 id = it.id,
                 fileName = it.name,
@@ -155,7 +155,7 @@ class TellaPeerToPeerClient {
             val request = Request.Builder()
                 .url(url)
                 .post(requestBody)
-                .addHeader("Content-Type", "application/json")
+                .addHeader(PeerToPeerConstants.CONTENT_TYPE, PeerToPeerConstants.CONTENT_TYPE_JSON)
                 .build()
 
             client.newCall(request).execute().use { response ->
@@ -163,7 +163,8 @@ class TellaPeerToPeerClient {
 
                 if (response.isSuccessful && body != null) {
                     return@withContext try {
-                        val transmissionId = JSONObject(body).getString("transmissionId")
+                        val transmissionId =
+                            JSONObject(body).getString(PeerToPeerConstants.TRANSMISSION_ID_KEY)
                         // Store it in the session manager
                         PeerSessionManager.setTransmissionId(transmissionId)
                         PrepareUploadResult.Success(transmissionId)

From fdfae55d6959f19957d3de82230891b09631f037 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 3 Jul 2025 16:51:35 +0100
Subject: [PATCH 051/153] Fix wifi integration

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  12 +-
 .../tella/mobile/util/ConnectionType.kt       | 144 ++++++++++++++++++
 .../peertopeer/PeerToPeerViewModel.kt         | 133 ++--------------
 .../peertopeer/data/ConnectionType.kt         |   5 -
 .../fragment/peertopeer/data/NetWorkInfo.kt   |   8 -
 .../receipentflow/ConnectHotspotFragment.kt   |  72 +++++++--
 .../senderflow/ScanQrCodeFragment.kt          |   5 +-
 .../senderflow/SenderVerificationFragment.kt  |   3 +-
 8 files changed, 225 insertions(+), 157 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 8319b53d1..74342bee6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -105,14 +105,18 @@ class TellaPeerToPeerServer(
                         // Store the session in a shared serverSession variable
                         serverSession = session
 
-                       // val accepted = if (request.autoAccept) {
-                         //   true // Automatically accept
+                        // val accepted = if (request.autoAccept) {
+                        //   true // Automatically accept
                         //} else {
-                        val accepted =   PeerEventManager.emitIncomingRegistrationRequest(sessionId, request)
+                        val accepted =
+                            PeerEventManager.emitIncomingRegistrationRequest(sessionId, request)
                         //}
 
                         if (!accepted) {
-                            call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
+                            call.respond(
+                                HttpStatusCode.Forbidden,
+                                "Receiver rejected the registration"
+                            )
                             return@post
                         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
new file mode 100644
index 000000000..411da5c58
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
@@ -0,0 +1,144 @@
+package org.horizontal.tella.mobile.util
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiManager
+import android.os.Build
+import android.text.format.Formatter
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import java.net.Inet4Address
+import java.net.NetworkInterface
+
+enum class ConnectionType {
+    WIFI, CELLULAR, HOTSPOT, NONE
+}
+
+data class NetworkInfo(
+    val connectionType: ConnectionType,
+    val ssid: String?,
+    val ipAddress: String?,
+    var port: String = "53317"
+)
+
+class NetworkInfoManager(private val context: Context) {
+
+    private val _networkInfo = MutableLiveData<NetworkInfo>()
+    val networkInfo: LiveData<NetworkInfo> = _networkInfo
+
+    private var currentNetworkInfo: NetworkInfo = NetworkInfo(ConnectionType.NONE, null, null)
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
+    fun fetchCurrentNetworkInfo() {
+        val connectivityManager =
+            ContextCompat.getSystemService(context, ConnectivityManager::class.java)
+        val network = connectivityManager?.activeNetwork
+        val capabilities = connectivityManager?.getNetworkCapabilities(network)
+
+        when {
+            capabilities == null -> {
+                _networkInfo.postValue(NetworkInfo(ConnectionType.NONE, null, null))
+            }
+
+            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
+                val wifiManager =
+                    context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
+
+                val wifiInfo = wifiManager?.connectionInfo
+
+                val ssid = when {
+                    wifiInfo?.ssid != null && wifiInfo.ssid != WifiManager.UNKNOWN_SSID ->
+                        wifiInfo.ssid.trim('"')
+
+                    else -> "Unknown WiFi (check location permissions)"
+                }
+
+                val ipAddress = wifiInfo?.ipAddress?.let {
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                        Formatter.formatIpAddress(it)
+                    } else {
+                        // Provide fallback logic if needed for newer APIs
+                        getLocalIpAddress()
+                    }
+                }
+
+                _networkInfo.postValue(NetworkInfo(ConnectionType.WIFI, ssid, ipAddress))
+            }
+
+            isDeviceHotspotEnabled(context) -> {
+                val hotspotSSID = getDeviceHotspotSSID(context) ?: "Hotspot"
+                val hotspotIpAddress = getDeviceHotspotIpAddress()
+                _networkInfo.postValue(NetworkInfo(ConnectionType.HOTSPOT, hotspotSSID, hotspotIpAddress))
+            }
+
+            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
+                _networkInfo.postValue(NetworkInfo(ConnectionType.CELLULAR, null, null))
+            }
+
+            else -> {
+                _networkInfo.postValue(NetworkInfo(ConnectionType.NONE, null, null))
+            }
+        }
+
+        currentNetworkInfo = _networkInfo.value ?: NetworkInfo(ConnectionType.NONE, null, null)
+    }
+
+    private fun isDeviceHotspotEnabled(context: Context): Boolean {
+        val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        return try {
+            val method = wifiManager.javaClass.getDeclaredMethod("isWifiApEnabled")
+            method.isAccessible = true
+            method.invoke(wifiManager) as? Boolean ?: false
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
+    }
+
+    private fun getDeviceHotspotSSID(context: Context): String? {
+        val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        return try {
+            val method = wifiManager.javaClass.getDeclaredMethod("getWifiApConfiguration")
+            method.isAccessible = true
+            val config = method.invoke(wifiManager)
+            val ssidField = config?.javaClass?.getDeclaredField("SSID")
+            ssidField?.isAccessible = true
+            ssidField?.get(config) as? String
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    private fun getDeviceHotspotIpAddress(): String? {
+        return try {
+            val interfaces = NetworkInterface.getNetworkInterfaces()
+            for (intf in interfaces) {
+                if (!intf.isUp || intf.isLoopback) continue
+                for (addr in intf.inetAddresses) {
+                    if (!addr.isLoopbackAddress && addr is Inet4Address) {
+                        return addr.hostAddress
+                    }
+                }
+            }
+            null
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    private fun getLocalIpAddress(): String? {
+        return try {
+            NetworkInterface.getNetworkInterfaces().toList().flatMap { it.inetAddresses.toList() }
+                .firstOrNull { !it.isLoopbackAddress && it is Inet4Address }?.hostAddress
+        } catch (e: Exception) {
+            null
+        }
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 39a3b196d..3ae59fad6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -1,15 +1,8 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
-import android.annotation.SuppressLint
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-import android.net.wifi.WifiInfo
-import android.net.wifi.WifiManager
 import android.os.Build
-import android.text.format.Formatter
 import androidx.annotation.RequiresApi
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -20,16 +13,14 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
-import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
-import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
-import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
-import org.horizontal.tella.mobile.views.fragment.peertopeer.data.NetworkInfo
+import org.horizontal.tella.mobile.util.NetworkInfo
+import org.horizontal.tella.mobile.util.NetworkInfoManager
 import timber.log.Timber
-import java.net.Inet4Address
-import java.net.NetworkInterface
 import javax.inject.Inject
 
 @HiltViewModel
@@ -41,8 +32,6 @@ class PeerToPeerViewModel @Inject constructor(
 
     var isManualConnection: Boolean = true // default is manual
     var hasNavigatedToSuccessFragment = false
-    private val _networkInfo = MutableLiveData<NetworkInfo>()
-    val networkInfo: LiveData<NetworkInfo> = _networkInfo
     var currentNetworkInfo: NetworkInfo? = null
     private val _registrationSuccess = MutableLiveData<Boolean>()
     val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
@@ -59,6 +48,8 @@ class PeerToPeerViewModel @Inject constructor(
     val incomingPrepareRequest: MutableLiveData<PrepareUploadRequest?> = _incomingPrepareRequest
     private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
     val incomingRequest: StateFlow<IncomingRegistration?> = _incomingRequest
+    private val networkInfoManager = NetworkInfoManager(context)
+    val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
 
     init {
         viewModelScope.launch {
@@ -94,121 +85,17 @@ class PeerToPeerViewModel @Inject constructor(
         PeerEventManager.resolveUserDecision(sessionId, accepted)
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
-    @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
-    fun fetchCurrentNetworkInfo() {
-        val connectivityManager =
-            ContextCompat.getSystemService(context, ConnectivityManager::class.java)
-        val network = connectivityManager?.activeNetwork
-        val capabilities = connectivityManager?.getNetworkCapabilities(network)
-
-        when {
-            capabilities == null -> {
-                _networkInfo.value = NetworkInfo(ConnectionType.NONE, null, null)
-            }
-
-            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
-                val wifiManager =
-                    context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-                val wifiInfo = wifiManager.connectionInfo
-
-                val ssid =
-                    if (!wifiInfo.ssid.isNullOrEmpty() && wifiInfo.ssid != WifiManager.UNKNOWN_SSID) {
-                        wifiInfo.ssid.trim('"')
-                    } else {
-                        getWifiSsidFromCapabilities(capabilities) ?: "Hotspot"
-                    }
-
-                val ipAddress = Formatter.formatIpAddress(wifiInfo.ipAddress)
-                _networkInfo.value = NetworkInfo(ConnectionType.WIFI, ssid, ipAddress)
-            }
-
-            isDeviceHotspotEnabled(context) -> {
-                val hotspotSSID = getDeviceHotspotSSID(context) ?: "Hotspot"
-                val hotspotIpAddress = getDeviceHotspotIpAddress()
-                _networkInfo.value =
-                    NetworkInfo(ConnectionType.HOTSPOT, hotspotSSID, hotspotIpAddress)
-            }
-
-            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
-                _networkInfo.value = NetworkInfo(ConnectionType.CELLULAR, null, null)
-            }
-
-            else -> {
-                _networkInfo.value = NetworkInfo(ConnectionType.NONE, null, null)
-            }
-        }
 
-
-        currentNetworkInfo = _networkInfo.value
-    }
-
-    @SuppressLint("DiscouragedPrivateApi")
-    private fun getDeviceHotspotSSID(context: Context): String? {
-        return try {
-            val wifiManager =
-                context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-            val method = wifiManager.javaClass.getDeclaredMethod("getWifiApConfiguration")
-            method.isAccessible = true
-            val wifiConfig = method.invoke(wifiManager)
-            wifiConfig?.let {
-                val ssidField = it.javaClass.getDeclaredField("SSID")
-                ssidField.isAccessible = true
-                (ssidField.get(it) as? String)?.trim('"')
-            }
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    @SuppressLint("DiscouragedPrivateApi")
-    private fun isDeviceHotspotEnabled(context: Context): Boolean {
-        return try {
-            val wifiManager =
-                context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-            val method = wifiManager.javaClass.getDeclaredMethod("isWifiApEnabled")
-            method.isAccessible = true
-            method.invoke(wifiManager) as Boolean
-        } catch (e: Exception) {
-            false
-        }
-    }
-
-    private fun getWifiSsidFromCapabilities(capabilities: NetworkCapabilities): String? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            (capabilities.transportInfo as? WifiInfo)?.ssid?.trim('"')
-        } else {
-            null
-        }
-    }
-
-    private fun getDeviceHotspotIpAddress(): String? {
-        return try {
-            val networkInterfaces = NetworkInterface.getNetworkInterfaces()
-            networkInterfaces.iterator().forEach { networkInterface ->
-                networkInterface.inetAddresses.iterator().forEach { inetAddress ->
-                    if (!inetAddress.isLoopbackAddress && inetAddress is Inet4Address) {
-                        if (networkInterface.displayName.contains("wlan") || networkInterface.displayName.contains(
-                                "ap"
-                            )
-                        ) {
-                            return inetAddress.hostAddress
-                        }
-                    }
-                }
-            }
-            null
-        } catch (e: Exception) {
-            null
-        }
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun updateNetworkInfo() {
+        networkInfoManager.fetchCurrentNetworkInfo()
     }
 
     fun startRegistration(
         ip: String,
         port: String,
         hash: String,
-        pin: String,
-        autoUpload: Boolean
+        pin: String
     ) {
         viewModelScope.launch {
             val result = peerClient.registerPeerDevice(ip, port, hash, pin)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
deleted file mode 100644
index 4cca5a3b9..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/ConnectionType.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer.data
-
-enum class ConnectionType {
-    WIFI, CELLULAR, HOTSPOT, NONE
-}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt
deleted file mode 100644
index ffaf84136..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/data/NetWorkInfo.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer.data
-
-data class NetworkInfo(
-    val type: ConnectionType,
-    val networkName: String?,
-    val ipAddress: String?,
-    var port: String = "53317"
-)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 4331fb4fe..0ce670c43 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -1,17 +1,23 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
+import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.Manifest.permission.ACCESS_NETWORK_STATE
+import android.Manifest.permission.ACCESS_WIFI_STATE
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
+import org.horizontal.tella.mobile.util.ConnectionType
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
-import org.horizontal.tella.mobile.views.fragment.peertopeer.data.ConnectionType
 
 @AndroidEntryPoint
 class ConnectHotspotFragment :
@@ -20,21 +26,35 @@ class ConnectHotspotFragment :
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var isCheckboxChecked = false
 
+    @RequiresApi(Build.VERSION_CODES.M)
+    private val requestPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
+            val fineLocationGranted = permissions[ACCESS_FINE_LOCATION] ?: false
+            val wifiStateGranted = permissions[ACCESS_WIFI_STATE] ?: false
+            val networkStateGranted = permissions[ACCESS_NETWORK_STATE] ?: false
+
+            if (fineLocationGranted && wifiStateGranted && networkStateGranted) {
+                viewModel.updateNetworkInfo()
+            } else {
+                baseActivity.showToast("Location and network permissions are required to get WiFi SSID.")
+            }
+        }
 
     @RequiresApi(Build.VERSION_CODES.M)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initObservers()
         initListeners()
-        viewModel.fetchCurrentNetworkInfo()
+        checkAndRequestPermissions()
     }
 
     private fun initObservers() {
         viewModel.networkInfo.observe(viewLifecycleOwner) { info ->
-            when (info.type) {
+            viewModel.currentNetworkInfo = info
+            when (info.connectionType) {
                 ConnectionType.HOTSPOT, ConnectionType.WIFI, ConnectionType.CELLULAR -> {
-                    binding.currentWifiText.setRightText(info.networkName)
-                    updateNextButtonState(ConnectionType.HOTSPOT)
+                    binding.currentWifiText.setRightText(info.ssid ?: "Unknown")
+                    updateNextButtonState(info.connectionType)
                 }
 
                 ConnectionType.NONE -> {
@@ -46,18 +66,14 @@ class ConnectHotspotFragment :
     }
 
     private fun initListeners() {
-
         binding.currentWifi.setOnCheckedChangeListener { isChecked ->
             isCheckboxChecked = isChecked
-            updateNextButtonState(viewModel.currentNetworkInfo?.type)
+            val currentType = viewModel.networkInfo.value?.connectionType ?: ConnectionType.NONE
+            updateNextButtonState(currentType)
         }
 
         binding.toolbar.backClickListener = { baseActivity.onBackPressed() }
-
-        binding.nextBtn.setOnClickListener { }
-
         binding.backBtn.setOnClickListener { baseActivity.onBackPressed() }
-
     }
 
     private fun updateNextButtonState(connectionType: ConnectionType?) {
@@ -80,4 +96,36 @@ class ConnectHotspotFragment :
         navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
     }
 
-}
\ No newline at end of file
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun checkAndRequestPermissions() {
+        val permissionsToRequest = mutableListOf<String>()
+
+        if (ContextCompat.checkSelfPermission(
+                baseActivity,
+                ACCESS_FINE_LOCATION
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionsToRequest.add(ACCESS_FINE_LOCATION)
+        }
+        if (ContextCompat.checkSelfPermission(
+                baseActivity,
+                ACCESS_WIFI_STATE
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionsToRequest.add(ACCESS_WIFI_STATE)
+        }
+        if (ContextCompat.checkSelfPermission(
+                baseActivity,
+                ACCESS_NETWORK_STATE
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionsToRequest.add(ACCESS_NETWORK_STATE)
+        }
+
+        if (permissionsToRequest.isNotEmpty()) {
+            requestPermissionLauncher.launch(permissionsToRequest.toTypedArray())
+        } else {
+            viewModel.updateNetworkInfo()
+        }
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 7a8687cbe..6691a6461 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -64,8 +64,7 @@ class ScanQrCodeFragment :
                             ip = payload.ipAddress,
                             port = payload.port.toString(),
                             hash = payload.certificateHash,
-                            pin = payload.pin,
-                            autoUpload = true
+                            pin = payload.pin
                         )
 
                     } catch (e: Exception) {
@@ -117,7 +116,7 @@ class ScanQrCodeFragment :
         }
     }
 
-    private fun initObservers(){
+    private fun initObservers() {
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateFromScanQrCodeToPrepareUploadFragment()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index c243bb344..f5b2b9dc0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -50,8 +50,7 @@ class SenderVerificationFragment :
                 ip = peerConnectionInfo.ip,
                 port = peerConnectionInfo.port,
                 hash = peerConnectionInfo.hash,
-                pin = peerConnectionInfo.pin.toString(),
-                autoUpload = false
+                pin = peerConnectionInfo.pin.toString()
             )
         }
 

From 4351bcf00a3f7bbde7ce2d03bfa39fe579bf6fdb Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 4 Jul 2025 19:03:47 +0100
Subject: [PATCH 052/153] refactor code

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index fa67a93a5..9f5a6c71e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -1,6 +1,5 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
-import android.util.Log
 import com.hzontal.tella_vault.VaultFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -21,6 +20,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
+import timber.log.Timber
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
@@ -70,9 +70,7 @@ class TellaPeerToPeerClient {
     ): Result<String> = withContext(Dispatchers.IO) {
 
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
-
-        Log.d("PeerClient", "Connecting to: $url")
-
+        Timber.d("Connecting to: $url")
         try {
             val payload = PeerRegisterPayload(
                 pin = pin,
@@ -93,21 +91,14 @@ class TellaPeerToPeerClient {
             client.newCall(request).execute().use { response ->
                 if (!response.isSuccessful) {
                     val errorBody = response.body.string()
-                    TODO("WE SHOULD USE TIMBER INSTEAD")
-                    Log.e(
-                        "PeerClient", """
-                    HTTP ${response.code} Error
-                    URL: $url
-                    Headers: ${response.headers}
-                    Body: $errorBody
-                """.trimIndent()
-                    )
+                    Timber.e( """HTTP ${response.code} Error URL: $url Headers: ${response.headers}  Body: $errorBody """.trimIndent())
                     return@use Result.failure(Exception("HTTP ${response.code}: $errorBody"))
                 }
 
                 val contentType = response.header(CONTENT_TYPE) ?: ""
                 if (!contentType.contains(CONTENT_TYPE_JSON)) {
-                    Log.w("PeerClient", "Unexpected Content-Type: $contentType")
+                    Timber.e("PeerClient Unexpected Content-Type: %s", contentType)
+
                 }
 
                 val body = response.body?.string() ?: ""
@@ -119,7 +110,7 @@ class TellaPeerToPeerClient {
                 }
             }
         } catch (e: Exception) {
-            Log.e("PeerClient", "Request failed", e)
+            Timber.e(e, "PeerClient Request failed")
             Result.failure(e)
         }
     }
@@ -155,7 +146,7 @@ class TellaPeerToPeerClient {
             val request = Request.Builder()
                 .url(url)
                 .post(requestBody)
-                .addHeader(PeerToPeerConstants.CONTENT_TYPE, PeerToPeerConstants.CONTENT_TYPE_JSON)
+                .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
                 .build()
 
             client.newCall(request).execute().use { response ->
@@ -169,11 +160,11 @@ class TellaPeerToPeerClient {
                         PeerSessionManager.setTransmissionId(transmissionId)
                         PrepareUploadResult.Success(transmissionId)
                     } catch (e: Exception) {
-                        Log.e("PrepareUpload", "Invalid JSON response: $body", e)
+                        Timber.e(e, "Invalid JSON response: %s", body)
                         PrepareUploadResult.Failure(Exception("Malformed server response"))
                     }
                 } else {
-                    Log.e("PrepareUpload", "Server error ${response.code}: ${response.message}")
+                    Timber.e("Server error %d: %s", response.code, response.message)
                     return@withContext when (response.code) {
                         400 -> PrepareUploadResult.BadRequest
                         403 -> PrepareUploadResult.Forbidden
@@ -184,7 +175,7 @@ class TellaPeerToPeerClient {
                 }
             }
         } catch (e: Exception) {
-            Log.e("PrepareUpload", "Exception during upload: ${e.message}", e)
+            Timber.e(e, "Exception during upload")
             PrepareUploadResult.Failure(e)
         }
     }

From 25152dd721736537d26cb1451c8587f49507dee8 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 4 Jul 2025 20:06:07 +0100
Subject: [PATCH 053/153] fix audio recorder

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  5 +-
 .../senderflow/PrepareUploadFragment.kt       | 63 +++++++++++++------
 .../views/fragment/recorder/MicActivity.kt    |  9 ++-
 3 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 9f5a6c71e..5ec73bb3c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -127,7 +127,7 @@ class TellaPeerToPeerClient {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
         val fileItems = files.map {
-            val mimeType = getMimeType(it.name) ?: CONTENT_TYPE_OCTET
+            val mimeType = it.mimeType ?: CONTENT_TYPE_OCTET
             P2PFile(
                 id = it.id,
                 fileName = it.name,
@@ -150,7 +150,7 @@ class TellaPeerToPeerClient {
                 .build()
 
             client.newCall(request).execute().use { response ->
-                val body = response.body?.string()
+                val body = response.body.string()
 
                 if (response.isSuccessful && body != null) {
                     return@withContext try {
@@ -172,6 +172,7 @@ class TellaPeerToPeerClient {
                         500 -> PrepareUploadResult.ServerError
                         else -> PrepareUploadResult.Failure(Exception("Unhandled server error ${response.code}"))
                     }
+
                 }
             }
         } catch (e: Exception) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index c0564ef3d..182129333 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -4,9 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.view.Gravity
 import android.view.View
-import android.widget.Toast
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -16,14 +14,16 @@ import com.hzontal.tella_locking_ui.common.extensions.onChange
 import com.hzontal.tella_vault.VaultFile
 import com.hzontal.tella_vault.filter.FilterType
 import dagger.hilt.android.AndroidEntryPoint
+import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.bus.EventObserver
+import org.horizontal.tella.mobile.bus.event.AudioRecordEvent
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
 import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companion.CAPTURE_WITH_AUTO_UPLOAD
-import org.horizontal.tella.mobile.views.activity.viewer.sharedViewModel
 import org.horizontal.tella.mobile.views.adapters.reports.ReportsFilesRecyclerViewAdapter
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
@@ -31,6 +31,7 @@ import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_RE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
 import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.recorder.MicActivity
 import org.horizontal.tella.mobile.views.fragment.recorder.REPORT_ENTRY
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.AttachmentsActivitySelector
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILES_FILTER
@@ -42,6 +43,8 @@ import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.IVaultFilesSelector
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesSheet
 import org.hzontal.shared_ui.utils.DialogUtils
 
+var PREPARE_UPLOAD_ENTRY = "PREPARE_UPLOAD_ENTRY"
+
 @AndroidEntryPoint
 class PrepareUploadFragment :
     BaseBindingFragment<FragmentPrepareUploadBinding>(FragmentPrepareUploadBinding::inflate),
@@ -51,6 +54,8 @@ class PrepareUploadFragment :
     private var reportInstance: ReportInstance? = null
     private val viewModel: SenderViewModel by viewModels()
     private var isNewDraft = true
+    private var disposables =
+        MyApplication.bus().createCompositeDisposable()
 
     private val filesRecyclerViewAdapter: ReportsFilesRecyclerViewAdapter by lazy {
         ReportsFilesRecyclerViewAdapter(this)
@@ -68,6 +73,7 @@ class PrepareUploadFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         initView()
         initData()
+        onAudioRecordingListener()
     }
 
     private fun initView() {
@@ -108,30 +114,31 @@ class PrepareUploadFragment :
             }
 
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
-                val id = response.transmissionId
+            val id = response.transmissionId
             DialogUtils.showBottomMessage(
                 baseActivity,
                 getString(R.string.the_receiver_accepted_the_files_transfer),
                 false,
                 3000
             )
-                // navigate to next screen
+            // navigate to next screen
         }
 
-        binding.toolbar.backClickListener = {  BottomSheetUtils.showConfirmSheet(
-            baseActivity.supportFragmentManager,
-            getString((R.string.exit_nearby_sharing)),
-            getString(R.string.your_progress_will_be_lost),
-            getString(R.string.action_exit),
-            getString(R.string.action_cancel),
-            object : BottomSheetUtils.ActionConfirmed {
-                override fun accept(isConfirmed: Boolean) {
-                    if (isConfirmed) {
-                        findNavController().popBackStack()
+        binding.toolbar.backClickListener = {
+            BottomSheetUtils.showConfirmSheet(
+                baseActivity.supportFragmentManager,
+                getString((R.string.exit_nearby_sharing)),
+                getString(R.string.your_progress_will_be_lost),
+                getString(R.string.action_exit),
+                getString(R.string.action_cancel),
+                object : BottomSheetUtils.ActionConfirmed {
+                    override fun accept(isConfirmed: Boolean) {
+                        if (isConfirmed) {
+                            findNavController().popBackStack()
+                        }
                     }
                 }
-            }
-        )
+            )
         }
         highLightButtonsInit()
         checkIsNewDraftEntry()
@@ -146,7 +153,6 @@ class PrepareUploadFragment :
     }
 
 
-
     private fun highLightButtonsInit() {
         binding.apply {
             reportTitleEt.let { title ->
@@ -245,6 +251,9 @@ class PrepareUploadFragment :
         } catch (e: java.lang.Exception) {
             FirebaseCrashlytics.getInstance().recordException(e)
         }
+        val intent = Intent(activity, MicActivity::class.java)
+        intent.putExtra(PREPARE_UPLOAD_ENTRY, true)
+        baseActivity.startActivity(intent)
     }
 
     @Deprecated("Deprecated in Java")
@@ -271,7 +280,7 @@ class PrepareUploadFragment :
 
     private fun highLightButtons() {
         val isSubmitEnabled =
-            isTitleEnabled  && filesRecyclerViewAdapter.getFiles()
+            isTitleEnabled && filesRecyclerViewAdapter.getFiles()
                 .isNotEmpty()
 
         val disabled: Float = context?.getString(R.string.alpha_disabled)?.toFloat() ?: 1.0f
@@ -289,7 +298,10 @@ class PrepareUploadFragment :
                 if (isSubmitEnabled) {
                     val selectedFiles = filesRecyclerViewAdapter.getFiles()
                     if (selectedFiles.isNotEmpty()) {
-                        bundle.putSerializable("selectedFiles", ArrayList(selectedFiles)) // assuming VaultFile is Serializable
+                        bundle.putSerializable(
+                            "selectedFiles",
+                            ArrayList(selectedFiles)
+                        ) // assuming VaultFile is Serializable
                         // navigate to waiting view
                         navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
                     } else {
@@ -301,6 +313,7 @@ class PrepareUploadFragment :
             }
         }
     }
+
     private fun showSubmitReportErrorSnackBar() {
         val errorRes = R.string.Snackbar_Submit_Files_Error
 
@@ -323,4 +336,14 @@ class PrepareUploadFragment :
         return true
     }
 
+    private fun onAudioRecordingListener() {
+        disposables.wire(
+            AudioRecordEvent::class.java,
+            object : EventObserver<AudioRecordEvent?>() {
+                override fun onNext(event: AudioRecordEvent) {
+                    putFiles(listOf(event.vaultFile))
+                }
+            })
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/recorder/MicActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/recorder/MicActivity.kt
index dc4b2e3b1..ce3dcc687 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/recorder/MicActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/recorder/MicActivity.kt
@@ -33,6 +33,7 @@ import org.horizontal.tella.mobile.views.activity.MetadataActivity
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companion.VAULT_CURRENT_ROOT_PARENT
 import org.horizontal.tella.mobile.views.activity.viewer.toolBar
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PREPARE_UPLOAD_ENTRY
 import org.horizontal.tella.mobile.views.interfaces.VerificationWorkStatusCallback
 import java.util.Locale
 import java.util.UUID
@@ -44,6 +45,7 @@ class MicActivity : MetadataActivity(),
     private var animator: ObjectAnimator? = null
     private var isCollect: Boolean = false
     private var isReport: Boolean = false
+    private var isPrepareUpload = false
     private var notRecording = false
     private var lastUpdateTime: Long = 0
     private var isAddingInProgress = false
@@ -75,6 +77,7 @@ class MicActivity : MetadataActivity(),
         if (intent != null) {
             isCollect = intent.getBooleanExtra(COLLECT_ENTRY, false)
             isReport = intent.getBooleanExtra(REPORT_ENTRY, false)
+            isPrepareUpload = intent.getBooleanExtra(PREPARE_UPLOAD_ENTRY, false)
             currentRootParent = intent.getStringExtra(VAULT_CURRENT_ROOT_PARENT)
         }
 
@@ -93,11 +96,11 @@ class MicActivity : MetadataActivity(),
         recordingName = findViewById(R.id.rec_name)
         toolBar = findViewById(R.id.toolbar)
 
-        if (isCollect || isReport || currentRootParent?.isNotEmpty() == true) {
+        if (isCollect || isReport || isPrepareUpload || currentRootParent?.isNotEmpty() == true) {
             mPlay.visibility = View.GONE
         }
 
-        if (isCollect || currentRootParent?.isNotEmpty() == true) {
+        if (isCollect || isPrepareUpload || currentRootParent?.isNotEmpty() == true) {
             toolBar.navigationIcon =
                 ContextCompat.getDrawable(this, R.drawable.ic_close_white)
 
@@ -304,7 +307,7 @@ class MicActivity : MetadataActivity(),
     }
 
     private fun maybeReturnCollectRecording(vaultFile: VaultFile?) {
-        if (isCollect) {
+        if (isCollect || isPrepareUpload) {
             MyApplication.bus().post(AudioRecordEvent(vaultFile))
         }
         if (isReport) {

From 9dc0e97b374fb6c33fea3570e8f644962d8ce834 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 4 Jul 2025 21:17:22 +0100
Subject: [PATCH 054/153] WIP unify code

---
 .../tella/mobile/MyApplication.java           |  3 ++
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 49 +++++++++++--------
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 38 +++++++++++---
 .../managers/PeerServerStarterManager.kt      |  9 +++-
 .../peertopeer/remote/PrepareUploadResult.kt  |  8 +--
 .../peertopeer/remote/RegisterPeerResult.kt   | 12 +++++
 .../peertopeer/PeerEventManager.kt            |  3 +-
 .../fragment/peertopeer => util}/Event.kt     |  2 +-
 .../peertopeer/PeerToPeerViewModel.kt         | 43 +++++++++++++---
 .../fragment/peertopeer/SenderViewModel.kt    |  5 +-
 .../receipentflow/QRCodeFragment.kt           |  8 +--
 .../WaitingReceiverFragment.kt                |  3 +-
 .../{ => senderflow}/WaitingSenderFragment.kt |  3 +-
 .../res/navigation/peer_to_peer_graph.xml     |  4 +-
 14 files changed, 137 insertions(+), 53 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/RegisterPeerResult.kt
 rename mobile/src/main/java/org/horizontal/tella/mobile/{views/fragment => domain}/peertopeer/PeerEventManager.kt (93%)
 rename mobile/src/main/java/org/horizontal/tella/mobile/{views/fragment/peertopeer => util}/Event.kt (87%)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{ => receipentflow}/WaitingReceiverFragment.kt (93%)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{ => senderflow}/WaitingSenderFragment.kt (91%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java b/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
index 4204f9020..1ca39ffd3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/MyApplication.java
@@ -8,6 +8,7 @@
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.http.HttpResponseCache;
 import android.os.Build;
 import android.os.StrictMode;
 import android.os.Bundle;
@@ -20,6 +21,7 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.hilt.work.HiltWorkerFactory;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 import androidx.work.Configuration;
 
@@ -169,6 +171,7 @@ public static void resetKeys() {
 
     @Override
     protected void attachBaseContext(Context newBase) {
+        MultiDex.install(this);
         CommonPrefs.getInstance().init(newBase);
         SharedPrefs.getInstance().init(newBase);
         super.attachBaseContext(LocaleManager.getInstance().getLocalizedContext(newBase));
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 5ec73bb3c..186d1b23a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -15,9 +16,9 @@ import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_T
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
+import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
-import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
 import timber.log.Timber
@@ -67,21 +68,22 @@ class TellaPeerToPeerClient {
         port: String,
         expectedFingerprint: String,
         pin: String,
-    ): Result<String> = withContext(Dispatchers.IO) {
+    ): RegisterPeerResult = withContext(Dispatchers.IO) {
 
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
         Timber.d("Connecting to: $url")
+
         try {
             val payload = PeerRegisterPayload(
                 pin = pin,
-                nonce = UUID.randomUUID().toString(),
-                //   autoUpload
+                nonce = UUID.randomUUID().toString()
             )
 
             val jsonPayload = Json.encodeToString(payload)
             val requestBody = jsonPayload.toRequestBody()
 
             val client = getClientWithFingerprintValidation(expectedFingerprint)
+
             val request = Request.Builder()
                 .url(url)
                 .post(requestBody)
@@ -89,32 +91,37 @@ class TellaPeerToPeerClient {
                 .build()
 
             client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) {
-                    val errorBody = response.body.string()
-                    Timber.e( """HTTP ${response.code} Error URL: $url Headers: ${response.headers}  Body: $errorBody """.trimIndent())
-                    return@use Result.failure(Exception("HTTP ${response.code}: $errorBody"))
-                }
-
-                val contentType = response.header(CONTENT_TYPE) ?: ""
-                if (!contentType.contains(CONTENT_TYPE_JSON)) {
-                    Timber.e("PeerClient Unexpected Content-Type: %s", contentType)
+                val body = response.body?.string().orEmpty()
 
+                if (response.isSuccessful) {
+                    return@use try {
+                        val json = JSONObject(body)
+                        val sessionId = json.getString("sessionId")
+                        RegisterPeerResult.Success(sessionId)
+                    } catch (e: Exception) {
+                        RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
+                    }
                 }
 
-                val body = response.body?.string() ?: ""
-                return@use try {
-                    val json = JSONObject(body)
-                    Result.success(json.getString("sessionId"))
-                } catch (e: Exception) {
-                    Result.failure(Exception("Invalid JSON response: ${e.message}"))
+                // Handle known status codes
+                return@use when (response.code) {
+                    400 -> RegisterPeerResult.InvalidFormat
+                    401 -> RegisterPeerResult.InvalidPin
+                    403 -> RegisterPeerResult.RejectedByReceiver
+                    409 -> RegisterPeerResult.Conflict
+                    429 -> RegisterPeerResult.TooManyRequests
+                    500 -> RegisterPeerResult.ServerError
+                    else -> RegisterPeerResult.Failure(Exception("Unhandled error ${response.code}: $body"))
                 }
             }
+
         } catch (e: Exception) {
-            Timber.e(e, "PeerClient Request failed")
-            Result.failure(e)
+            Timber.e(e, "registerPeerDevice failed")
+            return@withContext RegisterPeerResult.Failure(e)
         }
     }
 
+
     suspend fun prepareUpload(
         ip: String,
         port: String,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 74342bee6..5d1e5cdd5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -29,7 +29,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerEventManager
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
@@ -40,6 +40,7 @@ const val port = 53317
 class TellaPeerToPeerServer(
     private val ip: String,
     private val serverPort: Int = port,
+    private val pin: Int,
     private val keyPair: KeyPair,
     private val certificate: X509Certificate,
     private val keyStoreConfig: KeyStoreConfig,
@@ -96,21 +97,36 @@ class TellaPeerToPeerServer(
                         val request = try {
                             call.receive<PeerRegisterPayload>()
                         } catch (e: Exception) {
-                            call.respond(HttpStatusCode.BadRequest, "Invalid request body")
+                            call.respond(HttpStatusCode.BadRequest, "Invalid request format")
                             return@post
                         }
 
+                        //TODO CHECK IF THE PIN IS CORRECT
+                        if (!isValidPin(request.pin) || pin.toString() != request.pin) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid PIN")
+                            return@post
+                        }
+
+                        if (serverSession != null) {
+                            call.respond(HttpStatusCode.Conflict, "Active session already exists")
+                            return@post
+                        }
+
+                        // if (isRateLimited(...)) {
+                        //     call.respond(HttpStatusCode.TooManyRequests, "Too many requests")
+                        //     return@post
+                        // }
+
                         val sessionId = UUID.randomUUID().toString()
                         val session = PeerResponse(sessionId)
-                        // Store the session in a shared serverSession variable
                         serverSession = session
 
-                        // val accepted = if (request.autoAccept) {
-                        //   true // Automatically accept
-                        //} else {
-                        val accepted =
+                        val accepted = try {
                             PeerEventManager.emitIncomingRegistrationRequest(sessionId, request)
-                        //}
+                        } catch (e: Exception) {
+                            call.respond(HttpStatusCode.InternalServerError, "Internal error")
+                            return@post
+                        }
 
                         if (!accepted) {
                             call.respond(
@@ -123,9 +139,11 @@ class TellaPeerToPeerServer(
                         launch {
                             PeerEventManager.emitRegistrationSuccess()
                         }
+
                         call.respond(HttpStatusCode.OK, session)
                     }
 
+
                     post(PeerApiRoutes.PREPARE_UPLOAD) {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
@@ -165,4 +183,8 @@ class TellaPeerToPeerServer(
     override fun stop() {
         engine?.stop(1000, 5000)
     }
+
+    private fun isValidPin(pin: String): Boolean {
+        return pin.length == 6 // or whatever your rule is
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 046ac8e5a..d396f078a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -16,11 +16,18 @@ class PeerServerStarterManager @Inject constructor(
 ) {
     private var server: TellaPeerToPeerServer? = null
 
-    fun startServer(ip: String, keyPair: KeyPair, cert: X509Certificate, config: KeyStoreConfig) {
+    fun startServer(
+        ip: String,
+        keyPair: KeyPair,
+        pin: Int,
+        cert: X509Certificate,
+        config: KeyStoreConfig
+    ) {
         if (server == null) {
             server = TellaPeerToPeerServer(
                 ip = ip,
                 keyPair = keyPair,
+                pin = pin,
                 certificate = cert,
                 keyStoreConfig = config,
                 peerToPeerManager = peerToPeerManager
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
index 6e05b56a4..3aa161221 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
@@ -5,9 +5,9 @@ package org.horizontal.tella.mobile.data.peertopeer.remote
  */
 sealed class PrepareUploadResult {
     data class Success(val transmissionId: String) : PrepareUploadResult()
-    object Forbidden : PrepareUploadResult()
-    object BadRequest : PrepareUploadResult()
-    object Conflict : PrepareUploadResult()
-    object ServerError : PrepareUploadResult()
+    data object Forbidden : PrepareUploadResult()
+    data object BadRequest : PrepareUploadResult()
+    data object Conflict : PrepareUploadResult()
+    data object ServerError : PrepareUploadResult()
     data class Failure(val exception: Throwable) : PrepareUploadResult()
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/RegisterPeerResult.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/RegisterPeerResult.kt
new file mode 100644
index 000000000..204056f2f
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/RegisterPeerResult.kt
@@ -0,0 +1,12 @@
+package org.horizontal.tella.mobile.data.peertopeer.remote
+
+sealed class RegisterPeerResult {
+    data class Success(val sessionId: String) : RegisterPeerResult()
+    data object InvalidFormat : RegisterPeerResult()      // 400
+    data object InvalidPin : RegisterPeerResult()         // 401
+    data object Conflict : RegisterPeerResult()           // 409
+    data object TooManyRequests : RegisterPeerResult()    // 429
+    data object ServerError : RegisterPeerResult()        // 500
+    data object RejectedByReceiver : RegisterPeerResult() // 403
+    data class Failure(val exception: Throwable) : RegisterPeerResult()
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
similarity index 93%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 5b4da64b0..4f24426a5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -1,10 +1,9 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.domain.peertopeer
 
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
-import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 
 /**
  * Created by wafa on 3/6/2025.
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/Event.kt
similarity index 87%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/util/Event.kt
index 17f216dde..d3649b743 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/Event.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/Event.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.util
 
 /**
  * Created by wafa on 23/6/2025.
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 3ae59fad6..1fd34f1ce 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -17,7 +17,9 @@ import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
+import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import timber.log.Timber
@@ -98,18 +100,45 @@ class PeerToPeerViewModel @Inject constructor(
         pin: String
     ) {
         viewModelScope.launch {
-            val result = peerClient.registerPeerDevice(ip, port, hash, pin)
-            result.onSuccess { sessionId ->
-                PeerSessionManager.saveConnectionInfo(ip, port, hash, sessionId)
-                // update UI state
-                _registrationSuccess.postValue(true)
-            }.onFailure { error ->
-                Timber.d("error ***** $error")
+            when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
+                is RegisterPeerResult.Success -> {
+                    PeerSessionManager.saveConnectionInfo(ip, port, hash, result.sessionId)
+                    _registrationSuccess.postValue(true)
+                }
+
+                RegisterPeerResult.InvalidPin -> {
+                    _getHashError.postValue(Exception("Invalid PIN"))
+                }
+
+                RegisterPeerResult.InvalidFormat -> {
+                    _getHashError.postValue(Exception("Invalid request format"))
+                }
+
+                RegisterPeerResult.Conflict -> {
+                    _getHashError.postValue(Exception("Active session already exists"))
+                }
+
+                RegisterPeerResult.TooManyRequests -> {
+                    _getHashError.postValue(Exception("Too many requests, try again later"))
+                }
+
+                RegisterPeerResult.ServerError -> {
+                    _getHashError.postValue(Exception("Server error, try again later"))
+                }
 
+                RegisterPeerResult.RejectedByReceiver -> {
+                    _getHashError.postValue(Exception("Receiver rejected the registration"))
+                }
+
+                is RegisterPeerResult.Failure -> {
+                    Timber.e(result.exception, "Registration failed")
+                    _getHashError.postValue(result.exception)
+                }
             }
         }
     }
 
+
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
             val result = FingerprintFetcher.fetch(ip, port.toInt())
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 17879c871..e78e013ae 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -17,6 +17,7 @@ import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
+import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
 import timber.log.Timber
 import javax.inject.Inject
@@ -46,8 +47,8 @@ class SenderViewModel @Inject constructor(
                                     .subscribeOn(Schedulers.io())
                                     .onErrorReturn { null } // safe, allows null
                             }
-                            .filter { it != null } // filter out nulls
-                            .map { it!! } // safe to force unwrap if you're sure it's not null now
+                            .filter { true } // filter out nulls
+                            .map { it } // safe to force unwrap if you're sure it's not null now
                             .toList()
                     }
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 6be61ad9a..7f75ac6f6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -63,17 +63,19 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val (keyPair, certificate) = CertificateGenerator.generateCertificate(ipAddress = ip)
         val config = KeyStoreConfig()
 
-        peerServerStarterManager.startServer(ip, keyPair, certificate, config)
 
         val certHash = CertificateUtils.getPublicKeyHash(certificate)
-        val pin = (100000..999999).random().toString()
+        val pin = (100000..999999).random()
         val port = port
 
+        peerServerStarterManager.startServer(ip, keyPair, pin, certificate, config)
+
+
         payload = PeerConnectionPayload(
             ipAddress = ip,
             port = port,
             certificateHash = certHash,
-            pin = pin
+            pin = pin.toString()
         )
 
         qrPayload = Gson().toJson(payload)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
similarity index 93%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index 67f98f5d2..990714528 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
@@ -7,6 +7,7 @@ import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
similarity index 91%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index 5a3bc4340..6570e8100 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
 import android.os.Bundle
 import android.view.View
@@ -8,6 +8,7 @@ import com.hzontal.tella_vault.VaultFile
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
 
 /**
  * Created by wafa on 3/6/2025.
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index effc7eff2..a68756270 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -109,7 +109,7 @@
     </fragment>
     <fragment
         android:id="@+id/waitingReceiverFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingReceiverFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.WaitingReceiverFragment"
         tools:layout="@layout/fragment_waiting"
         android:label="WaitingReceiverFragment" >
         <action
@@ -128,7 +128,7 @@
         android:label="RecipientSuccessFragment" />
     <fragment
         android:id="@+id/waitingSenderFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.WaitingSenderFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.WaitingSenderFragment"
         tools:layout="@layout/fragment_waiting"
         android:label="WaitingSenderFragment" />
 

From d2557e2e853c04342f2ba48cad29a5c2c0216f09 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 7 Jul 2025 13:09:24 +0100
Subject: [PATCH 055/153] refactor code

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 115 +++++++++---------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 186d1b23a..3fda5b503 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -5,7 +5,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -55,12 +54,9 @@ class TellaPeerToPeerClient {
             init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
         }
 
-        return OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
-            .sslSocketFactory(sslContext.socketFactory, trustManager)
-            .build()
+        return OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS)
+            .sslSocketFactory(sslContext.socketFactory, trustManager).build()
     }
 
     suspend fun registerPeerDevice(
@@ -69,41 +65,36 @@ class TellaPeerToPeerClient {
         expectedFingerprint: String,
         pin: String,
     ): RegisterPeerResult = withContext(Dispatchers.IO) {
-
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
         Timber.d("Connecting to: $url")
 
-        try {
-            val payload = PeerRegisterPayload(
-                pin = pin,
-                nonce = UUID.randomUUID().toString()
-            )
-
-            val jsonPayload = Json.encodeToString(payload)
-            val requestBody = jsonPayload.toRequestBody()
+        val payload = PeerRegisterPayload(
+            pin = pin, nonce = UUID.randomUUID().toString()
+        )
 
-            val client = getClientWithFingerprintValidation(expectedFingerprint)
+        val jsonPayload = Json.encodeToString(payload)
+        val requestBody = jsonPayload.toRequestBody()
+        val client = getClientWithFingerprintValidation(expectedFingerprint)
 
-            val request = Request.Builder()
-                .url(url)
-                .post(requestBody)
-                .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+        val request =
+            Request.Builder().url(url).post(requestBody).addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
                 .build()
 
+        return@withContext try {
             client.newCall(request).execute().use { response ->
                 val body = response.body?.string().orEmpty()
 
                 if (response.isSuccessful) {
-                    return@use try {
-                        val json = JSONObject(body)
-                        val sessionId = json.getString("sessionId")
-                        RegisterPeerResult.Success(sessionId)
-                    } catch (e: Exception) {
-                        RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
-                    }
+                    return@use parseSessionIdFromResponse(body)
                 }
 
-                // Handle known status codes
+                Timber.w(
+                    """registerPeerDevice failed
+                   Status: ${response.code}
+                   URL: $url
+                   Body: $body""".trimIndent()
+                )
+
                 return@use when (response.code) {
                     400 -> RegisterPeerResult.InvalidFormat
                     401 -> RegisterPeerResult.InvalidPin
@@ -114,13 +105,22 @@ class TellaPeerToPeerClient {
                     else -> RegisterPeerResult.Failure(Exception("Unhandled error ${response.code}: $body"))
                 }
             }
-
         } catch (e: Exception) {
-            Timber.e(e, "registerPeerDevice failed")
-            return@withContext RegisterPeerResult.Failure(e)
+            Timber.e(e, "registerPeerDevice request failed")
+            RegisterPeerResult.Failure(e)
         }
     }
 
+    private fun parseSessionIdFromResponse(body: String): RegisterPeerResult {
+        return try {
+            val json = JSONObject(body)
+            val sessionId = json.getString("sessionId")
+            RegisterPeerResult.Success(sessionId)
+        } catch (e: Exception) {
+            Timber.e(e, "Malformed JSON response: %s", body)
+            RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
+        }
+    }
 
     suspend fun prepareUpload(
         ip: String,
@@ -157,34 +157,39 @@ class TellaPeerToPeerClient {
                 .build()
 
             client.newCall(request).execute().use { response ->
-                val body = response.body.string()
-
-                if (response.isSuccessful && body != null) {
-                    return@withContext try {
-                        val transmissionId =
-                            JSONObject(body).getString(PeerToPeerConstants.TRANSMISSION_ID_KEY)
-                        // Store it in the session manager
-                        PeerSessionManager.setTransmissionId(transmissionId)
-                        PrepareUploadResult.Success(transmissionId)
-                    } catch (e: Exception) {
-                        Timber.e(e, "Invalid JSON response: %s", body)
-                        PrepareUploadResult.Failure(Exception("Malformed server response"))
-                    }
-                } else {
-                    Timber.e("Server error %d: %s", response.code, response.message)
-                    return@withContext when (response.code) {
-                        400 -> PrepareUploadResult.BadRequest
-                        403 -> PrepareUploadResult.Forbidden
-                        409 -> PrepareUploadResult.Conflict
-                        500 -> PrepareUploadResult.ServerError
-                        else -> PrepareUploadResult.Failure(Exception("Unhandled server error ${response.code}"))
-                    }
+                val responseBody = response.body?.string().orEmpty()
 
+                return@withContext if (response.isSuccessful) {
+                    parseTransmissionId(responseBody)
+                } else {
+                    Timber.e("Server error ${response.code}: ${response.message}")
+                    handleServerError(response.code, responseBody)
                 }
             }
         } catch (e: Exception) {
             Timber.e(e, "Exception during upload")
-            PrepareUploadResult.Failure(e)
+            return@withContext PrepareUploadResult.Failure(e)
+        }
+    }
+
+    private fun parseTransmissionId(body: String): PrepareUploadResult {
+        return try {
+            val transmissionId = JSONObject(body).getString(PeerToPeerConstants.TRANSMISSION_ID_KEY)
+            PeerSessionManager.setTransmissionId(transmissionId)
+            PrepareUploadResult.Success(transmissionId)
+        } catch (e: Exception) {
+            Timber.e(e, "Invalid JSON response: %s", body)
+            PrepareUploadResult.Failure(Exception("Malformed server response"))
+        }
+    }
+
+    private fun handleServerError(code: Int, body: String): PrepareUploadResult {
+        return when (code) {
+            400 -> PrepareUploadResult.BadRequest
+            403 -> PrepareUploadResult.Forbidden
+            409 -> PrepareUploadResult.Conflict
+            500 -> PrepareUploadResult.ServerError
+            else -> PrepareUploadResult.Failure(Exception("Unhandled server error $code: $body"))
         }
     }
 

From 9240ee98afaeed802341a89fe846851d1bcd4539 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 8 Jul 2025 12:55:43 +0100
Subject: [PATCH 056/153] wip save the fileId and tokens refactor code of
 prepareUpload

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 12 ++--
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 63 ++++++++++---------
 .../peertopeer/remote/PrepareUploadResult.kt  |  5 +-
 .../peertopeer/PeerPrepareUploadResponse.kt   |  7 ++-
 .../fragment/peertopeer/PeerSessionManager.kt | 15 +++--
 .../senderflow/PrepareUploadFragment.kt       |  2 +-
 6 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 3fda5b503..54c0dadc6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -17,6 +17,7 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
+import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
@@ -174,15 +175,18 @@ class TellaPeerToPeerClient {
 
     private fun parseTransmissionId(body: String): PrepareUploadResult {
         return try {
-            val transmissionId = JSONObject(body).getString(PeerToPeerConstants.TRANSMISSION_ID_KEY)
-            PeerSessionManager.setTransmissionId(transmissionId)
-            PrepareUploadResult.Success(transmissionId)
+            val response = Json.decodeFromString<PeerPrepareUploadResponse>(body)
+
+            response.files.forEach {
+                PeerSessionManager.saveTransmissionId(it.id, it.transmissionId)
+            }
+
+            PrepareUploadResult.Success(response.files)
         } catch (e: Exception) {
             Timber.e(e, "Invalid JSON response: %s", body)
             PrepareUploadResult.Failure(Exception("Malformed server response"))
         }
     }
-
     private fun handleServerError(code: Int, body: String): PrepareUploadResult {
         return when (code) {
             400 -> PrepareUploadResult.BadRequest
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 5d1e5cdd5..fbcf7a659 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -24,6 +24,7 @@ import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
+import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
@@ -143,36 +144,40 @@ class TellaPeerToPeerServer(
                         call.respond(HttpStatusCode.OK, session)
                     }
 
+                        post(PeerApiRoutes.PREPARE_UPLOAD) {
+                            val request = try {
+                                call.receive<PrepareUploadRequest>()
+                            } catch (e: Exception) {
+                                call.respond(HttpStatusCode.BadRequest, "Invalid body: ${e.message}")
+                                return@post
+                            }
+
+                            if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
+                                call.respond(HttpStatusCode.BadRequest, "Missing required fields")
+                                return@post
+                            }
+
+                            if (request.sessionId != serverSession?.sessionId) {
+                                call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                                return@post
+                            }
+
+                            val accepted = PeerEventManager.emitPrepareUploadRequest(request)
+                            if (accepted) {
+                                val files = request.files.map { file ->
+                                    FileInfo(
+                                        id = file.id,
+                                        transmissionId = UUID.randomUUID().toString()
+                                    )
+                                }
+                                call.respond(
+                                    HttpStatusCode.OK,
+                                    PeerPrepareUploadResponse(files = files)
+                                )
+                            } else {
+                                call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
+                            }
 
-                    post(PeerApiRoutes.PREPARE_UPLOAD) {
-                        val request = try {
-                            call.receive<PrepareUploadRequest>()
-                        } catch (e: Exception) {
-                            call.respond(HttpStatusCode.BadRequest, "Invalid body: ${e.message}")
-                            return@post
-                        }
-
-                        if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
-                            call.respond(HttpStatusCode.BadRequest, "Missing required fields")
-                            return@post
-                        }
-
-                        if (request.sessionId != serverSession?.sessionId) {
-                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
-                            return@post
-                        }
-
-                        val accepted = PeerEventManager.emitPrepareUploadRequest(request)
-
-                        if (accepted) {
-                            val transmissionId = UUID.randomUUID().toString()
-                            call.respond(
-                                HttpStatusCode.OK,
-                                PeerPrepareUploadResponse(transmissionId)
-                            )
-                        } else {
-                            call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
-                        }
                     }
                 }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
index 3aa161221..8a39af8ec 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadResult.kt
@@ -1,10 +1,13 @@
 package org.horizontal.tella.mobile.data.peertopeer.remote
 
+import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
+
+
 /**
  * Created by wafa on 2/7/2025.
  */
 sealed class PrepareUploadResult {
-    data class Success(val transmissionId: String) : PrepareUploadResult()
+    data class Success(val transmissions: List<FileInfo>) : PrepareUploadResult()
     data object Forbidden : PrepareUploadResult()
     data object BadRequest : PrepareUploadResult()
     data object Conflict : PrepareUploadResult()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
index acfc25782..6ebf9d860 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
@@ -3,6 +3,11 @@ package org.horizontal.tella.mobile.domain.peertopeer
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PeerPrepareUploadResponse(
+data class FileInfo(
+    val id: String,
     val transmissionId: String
+)
+
+data class PeerPrepareUploadResponse(
+    val files: List<FileInfo>
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
index 94b6128af..cf78f1b21 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -30,12 +30,17 @@ object PeerSessionManager {
 
     fun isSessionValid(): Boolean = connectionInfo != null
 
-    fun setTransmissionId(id: String) {
-        connectionInfo?.transmissionId = id
+    private val transmissionMap = mutableMapOf<String, String>() // fileId -> transmissionId
+
+    fun saveTransmissionId(fileId: String, transmissionId: String) {
+        transmissionMap[fileId] = transmissionId
+    }
+
+    fun getTransmissionId(fileId: String): String? {
+        return transmissionMap[fileId]
     }
 
-    fun getTransmissionId(): String? = connectionInfo?.transmissionId
-    fun clear() {
-        connectionInfo = null
+    fun clearTransmissions() {
+        transmissionMap.clear()
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 182129333..7f85ab699 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -114,7 +114,7 @@ class PrepareUploadFragment :
             }
 
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
-            val id = response.transmissionId
+            val transmissionId = response.files.firstOrNull()?.transmissionId
             DialogUtils.showBottomMessage(
                 baseActivity,
                 getString(R.string.the_receiver_accepted_the_files_transfer),

From fa3a9bed73a084e97a09765ec41051e969563239 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 8 Jul 2025 18:03:06 +0100
Subject: [PATCH 057/153] WIP fix prepare upload files

---
 .../entity/peertopeer/PeerToPeerInstance.kt   | 17 +++++
 .../receipentflow/RecipientSuccessFragment.kt |  4 +-
 .../senderflow/PrepareUploadFragment.kt       | 17 +++--
 .../senderflow/UploadFilesFragment.kt         | 45 +++++++++++++
 .../main/res/layout/fragment_send_report.xml  | 19 +++---
 .../main/res/layout/fragment_upload_files.xml | 64 +++++++++++++++++++
 mobile/src/main/res/values/strings.xml        |  1 +
 7 files changed, 147 insertions(+), 20 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
 create mode 100644 mobile/src/main/res/layout/fragment_upload_files.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
new file mode 100644
index 000000000..eb3079149
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
@@ -0,0 +1,17 @@
+package org.horizontal.tella.mobile.domain.entity.peertopeer
+
+import org.horizontal.tella.mobile.domain.entity.EntityStatus
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
+
+class PeerToPeerInstance(
+    var id: Long = -1,
+    var updated: Long = 0,
+    var metadata: Map<String, List<Any>> = mutableMapOf(),
+    var status: EntityStatus = EntityStatus.UNKNOWN,
+    var widgetMediaFiles: List<FormMediaFile> = mutableListOf(),
+    var formPartStatus: FormMediaFileStatus = FormMediaFileStatus.UNKNOWN,
+    var title: String = "",
+    var description: String = "",
+    var current: Long = 0
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 5fb8abca2..540b268f4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -2,10 +2,7 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
-import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.setFragmentResult
 import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
@@ -47,6 +44,7 @@ class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBin
             }
 
             rejectBtn.setOnClickListener {
+                //TODO WE MOVE THIS TO THE NAV MANAGER
                 viewModel.confirmPrepareUpload(sessionId, false)
                 // Set result safely via SavedStateHandle
                 findNavController().previousBackStackEntry
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 7f85ab699..2175104ab 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -19,7 +19,7 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.bus.EventObserver
 import org.horizontal.tella.mobile.bus.event.AudioRecordEvent
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
-import org.horizontal.tella.mobile.domain.entity.reports.ReportInstance
+import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
@@ -44,6 +44,7 @@ import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesShe
 import org.hzontal.shared_ui.utils.DialogUtils
 
 var PREPARE_UPLOAD_ENTRY = "PREPARE_UPLOAD_ENTRY"
+var BUNDLE_PEER_TO_PEER_FORM_INSTANCE = "BUNDLE_PEER_TO_PEER_FORM_INSTANCE"
 
 @AndroidEntryPoint
 class PrepareUploadFragment :
@@ -51,7 +52,7 @@ class PrepareUploadFragment :
     IReportAttachmentsHandler, OnNavBckListener {
     private lateinit var gridLayoutManager: GridLayoutManager
     private var isTitleEnabled = false
-    private var reportInstance: ReportInstance? = null
+    private var peerToPeerInstance: PeerToPeerInstance? = null
     private val viewModel: SenderViewModel by viewModels()
     private var isNewDraft = true
     private var disposables =
@@ -90,13 +91,13 @@ class PrepareUploadFragment :
         }
 
         arguments?.let { bundle ->
-            if (bundle.get(BUNDLE_REPORT_FORM_INSTANCE) != null) {
-                reportInstance = bundle.get(BUNDLE_REPORT_FORM_INSTANCE) as ReportInstance
-                bundle.remove(BUNDLE_REPORT_FORM_INSTANCE)
+            if (bundle.get(BUNDLE_PEER_TO_PEER_FORM_INSTANCE) != null) {
+                peerToPeerInstance = bundle.get(BUNDLE_PEER_TO_PEER_FORM_INSTANCE) as PeerToPeerInstance
+                bundle.remove(BUNDLE_PEER_TO_PEER_FORM_INSTANCE)
             }
         }
 
-        reportInstance?.let { instance ->
+        peerToPeerInstance?.let { instance ->
             binding.reportTitleEt.setText(instance.title)
             putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
             isNewDraft = false
@@ -134,7 +135,7 @@ class PrepareUploadFragment :
                 object : BottomSheetUtils.ActionConfirmed {
                     override fun accept(isConfirmed: Boolean) {
                         if (isConfirmed) {
-                            findNavController().popBackStack()
+                           back()
                         }
                     }
                 }
@@ -165,7 +166,6 @@ class PrepareUploadFragment :
             }
 
         }
-
     }
 
     private fun exitOrSave() {
@@ -175,7 +175,6 @@ class PrepareUploadFragment :
     @SuppressLint("StringFormatInvalid")
     private fun initData() {
 
-
     }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
new file mode 100644
index 000000000..c0cf40d9b
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
@@ -0,0 +1,45 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.ReportsFormEndView
+
+class UploadFilesFragment :
+    BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+
+    private fun showFormEndView() {
+        /*   if (reportInstance == null) {
+               return
+           }
+
+           reportInstance?.let { reportFormInstance ->
+
+               endView = ReportsFormEndView(
+                   activity,
+                   reportFormInstance.title,
+                   reportFormInstance.description,
+               )
+               endView.setInstance(
+                   reportFormInstance, MyApplication.isConnectedToInternet(baseActivity), false
+               )
+               binding.endViewContainer.removeAllViews()
+               binding.endViewContainer.addView(endView)
+               endView.clearPartsProgress(reportFormInstance)
+           }*/
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_send_report.xml b/mobile/src/main/res/layout/fragment_send_report.xml
index 8ebbf7bb1..ed3455116 100644
--- a/mobile/src/main/res/layout/fragment_send_report.xml
+++ b/mobile/src/main/res/layout/fragment_send_report.xml
@@ -32,19 +32,22 @@
         app:startTitle="@string/Reports_Title_Screen" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/next_btn"
-        style="@style/Submit_Text_Button"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="@dimen/activity_horizontal_large_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
+        style="@style/Unlock_White_Text"
         android:layout_marginBottom="18dp"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:id="@+id/cancel_btn"
+        android:text="@string/Uwazi_Submit_Later"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         android:background="@drawable/action_button_background"
-        android:text="@string/Reports_Pause"
+        android:backgroundTint="@color/wa_white_20"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
+        android:layout_marginStart="@dimen/activity_horizontal_large_margin"
+        />
 
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
diff --git a/mobile/src/main/res/layout/fragment_upload_files.xml b/mobile/src/main/res/layout/fragment_upload_files.xml
new file mode 100644
index 000000000..19be7b0ff
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_upload_files.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple"
+    tools:context=".views.fragment.uwazi.send.UwaziSendFragment">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/endViewContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_alignParentTop="true"
+        android:clipToPadding="false"
+        android:scrollbarStyle="outsideOverlay"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:rightIcon="@drawable/ic_delete_white_24px"
+        app:rightIconContentDescription="@string/action_delete"
+        app:startTitle="@string/receiving_and_encrypting_files" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/next_btn"
+        style="@style/Submit_Text_Button"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="@dimen/activity_horizontal_large_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
+        android:layout_marginBottom="18dp"
+        android:background="@drawable/action_button_background"
+        android:text="@string/Reports_Pause"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress"
+        style="@style/Tella_Progress_Circular"
+        android:layout_marginTop="0dp"
+        android:indeterminate="false"
+        android:progressTint="@color/tigers_eye"
+        android:visibility="gone"
+        app:indicatorSize="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:trackThickness="3dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index e63f72737..d59305d2b 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1051,4 +1051,5 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
     <string name="sender_files_rejected">Sender\'s files rejected.</string>
   <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
   <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
+  <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
 </resources>

From 80e89761f4bbbd250e5929bf6d253eefec596da7 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 8 Jul 2025 19:20:15 +0100
Subject: [PATCH 058/153] WIP submission

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 26 ++++---
 .../data/peertopeer/model/P2PServerState.kt   | 68 +++++++++++++++++++
 .../peertopeer/remote/PrepareUploadRequest.kt |  5 +-
 .../fragment/peertopeer/SenderViewModel.kt    |  4 +-
 .../senderflow/PrepareUploadFragment.kt       | 23 +------
 .../res/layout/fragment_prepare_upload.xml    |  2 +-
 mobile/src/main/res/values-ar/strings.xml     |  1 +
 mobile/src/main/res/values-be/strings.xml     |  1 +
 mobile/src/main/res/values-blk/strings.xml    |  1 +
 mobile/src/main/res/values-bn/strings.xml     |  1 +
 mobile/src/main/res/values-es-rCU/strings.xml |  1 +
 mobile/src/main/res/values-es/strings.xml     |  1 +
 mobile/src/main/res/values-fa-rIR/strings.xml |  1 +
 mobile/src/main/res/values-fr/strings.xml     |  1 +
 mobile/src/main/res/values-hdpi/strings.xml   |  4 ++
 mobile/src/main/res/values-in/strings.xml     |  1 +
 mobile/src/main/res/values-kac/strings.xml    |  1 +
 mobile/src/main/res/values-kn/strings.xml     |  1 +
 mobile/src/main/res/values-ksw/strings.xml    |  1 +
 mobile/src/main/res/values-ku/strings.xml     |  1 +
 mobile/src/main/res/values-mdpi/strings.xml   |  4 ++
 mobile/src/main/res/values-ml/strings.xml     |  1 +
 mobile/src/main/res/values-my/strings.xml     |  1 +
 mobile/src/main/res/values-ndc/strings.xml    |  1 +
 mobile/src/main/res/values-pt-rMZ/strings.xml |  1 +
 mobile/src/main/res/values-pt/strings.xml     |  1 +
 mobile/src/main/res/values-ru/strings.xml     |  1 +
 mobile/src/main/res/values-sn-rZW/strings.xml |  1 +
 .../src/main/res/values-sw600dp/strings.xml   |  4 ++
 mobile/src/main/res/values-ta/strings.xml     |  1 +
 mobile/src/main/res/values-tr/strings.xml     |  1 +
 mobile/src/main/res/values-ts/strings.xml     |  1 +
 mobile/src/main/res/values-v21/strings.xml    |  4 ++
 mobile/src/main/res/values-v26/strings.xml    |  4 ++
 mobile/src/main/res/values-vi/strings.xml     |  1 +
 mobile/src/main/res/values-w820dp/strings.xml |  4 ++
 mobile/src/main/res/values-xhdpi/strings.xml  |  4 ++
 mobile/src/main/res/values-xxhdpi/strings.xml |  4 ++
 mobile/src/main/res/values/strings.xml        |  1 +
 39 files changed, 145 insertions(+), 40 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
 create mode 100644 mobile/src/main/res/values-hdpi/strings.xml
 create mode 100644 mobile/src/main/res/values-mdpi/strings.xml
 create mode 100644 mobile/src/main/res/values-sw600dp/strings.xml
 create mode 100644 mobile/src/main/res/values-v21/strings.xml
 create mode 100644 mobile/src/main/res/values-v26/strings.xml
 create mode 100644 mobile/src/main/res/values-w820dp/strings.xml
 create mode 100644 mobile/src/main/res/values-xhdpi/strings.xml
 create mode 100644 mobile/src/main/res/values-xxhdpi/strings.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 54c0dadc6..6e88efd39 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -11,12 +11,10 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_JSON
-import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_OCTET
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
-import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
@@ -134,18 +132,18 @@ class TellaPeerToPeerClient {
 
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
-        val fileItems = files.map {
-            val mimeType = it.mimeType ?: CONTENT_TYPE_OCTET
-            P2PFile(
-                id = it.id,
-                fileName = it.name,
-                size = it.size,
-                fileType = mimeType,
-                sha256 = it.hash
-            )
-        }
-
-        val requestPayload = PrepareUploadRequest(title, sessionId, fileItems)
+//        val fileItems = files.map {
+//            val mimeType = it.mimeType ?: CONTENT_TYPE_OCTET
+//            P2PFile(
+//                id = it.id,
+//                fileName = it.name,
+//                size = it.size,
+//                fileType = mimeType,
+//                sha256 = it.hash
+//            )
+//        }
+
+        val requestPayload = PrepareUploadRequest(title, sessionId, files)
         val jsonPayload = Json.encodeToString(requestPayload)
         val requestBody = jsonPayload.toRequestBody()
         val client = getClientWithFingerprintValidation(expectedFingerprint)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
new file mode 100644
index 000000000..c170114b6
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
@@ -0,0 +1,68 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+// --- ENUMS ---
+
+enum class P2PFileStatus {
+    QUEUE,
+    SENDING,
+    FAILED,
+    FINISHED
+}
+
+enum class SessionStatus {
+    WAITING,
+    SENDING,
+    FINISHED,
+    FINISHED_WITH_ERRORS
+}
+
+data class P2PFile(
+    val name: String,
+    val size: Long
+)
+
+data class ReceivingFile(
+    var file: P2PFile,
+    var status: P2PFileStatus = P2PFileStatus.QUEUE,
+    var transmissionId: String? = null,
+    var path: String? = null,
+    var bytesReceived: Int = 0
+)
+
+class P2PSession(
+    val sessionId: String,
+    var status: SessionStatus = SessionStatus.WAITING,
+    var files: MutableMap<String, ReceivingFile> = mutableMapOf(),
+    var title: String? = null
+) {
+    val isActive: Boolean
+        get() = status == SessionStatus.WAITING || status == SessionStatus.SENDING
+
+    val hasFiles: Boolean
+        get() = files.isNotEmpty()
+}
+
+class P2PServerState(
+    var pin: String? = null,
+    var session: P2PSession? = null,
+    private var failedAttempts: Int = 0,
+    private var isUsingManualConnection: Boolean = false
+) {
+    private val maxFailedAttempts = 3
+
+    val hasReachedMaxAttempts: Boolean
+        get() = failedAttempts >= maxFailedAttempts
+
+    fun incrementFailedAttempts() {
+        failedAttempts++
+    }
+
+    fun reset() {
+        pin = null
+        session = null
+        failedAttempts = 0
+        isUsingManualConnection = false
+    }
+
+    fun getFailedAttempts(): Int = failedAttempts
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
index 803f30c08..d83eb6d7f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
@@ -1,12 +1,13 @@
 package org.horizontal.tella.mobile.data.peertopeer.remote
 
+import com.hzontal.tella_vault.VaultFile
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 
 @Serializable
 data class PrepareUploadRequest(
     val title: String,
     @SerialName("sessionId") val sessionId: String,
-    val files: List<P2PFile>
+    val files: List<FormMediaFile>
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index e78e013ae..c897f9d72 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -82,8 +82,8 @@ class SenderViewModel @Inject constructor(
                 sessionId = info.sessionId
             )) {
                 is PrepareUploadResult.Success -> {
-                    Timber.d("Success: transmissionId = ${result.transmissionId}")
-                    _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissionId))
+                    Timber.d("Success: transmissionId = ${result.transmissions}")
+                    _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissions))
                 }
 
                 is PrepareUploadResult.Forbidden -> {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 2175104ab..8bfdfb42f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -54,7 +54,6 @@ class PrepareUploadFragment :
     private var isTitleEnabled = false
     private var peerToPeerInstance: PeerToPeerInstance? = null
     private val viewModel: SenderViewModel by viewModels()
-    private var isNewDraft = true
     private var disposables =
         MyApplication.bus().createCompositeDisposable()
 
@@ -73,7 +72,6 @@ class PrepareUploadFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         initView()
-        initData()
         onAudioRecordingListener()
     }
 
@@ -100,7 +98,6 @@ class PrepareUploadFragment :
         peerToPeerInstance?.let { instance ->
             binding.reportTitleEt.setText(instance.title)
             putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
-            isNewDraft = false
         }
         val navBackStackEntry = findNavController().currentBackStackEntry
         navBackStackEntry?.savedStateHandle
@@ -115,7 +112,7 @@ class PrepareUploadFragment :
             }
 
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
-            val transmissionId = response.files.firstOrNull()?.transmissionId
+           // val transmissionId = response.files.firstOrNull()?.transmissionId
             DialogUtils.showBottomMessage(
                 baseActivity,
                 getString(R.string.the_receiver_accepted_the_files_transfer),
@@ -142,18 +139,8 @@ class PrepareUploadFragment :
             )
         }
         highLightButtonsInit()
-        checkIsNewDraftEntry()
     }
 
-    private fun checkIsNewDraftEntry() {
-        if (isNewDraft) {
-            binding.sendReportBtn.text = getString(R.string.collect_end_action_submit)
-        } else {
-            binding.sendReportBtn.text = getString(R.string.Send_Action_Label)
-        }
-    }
-
-
     private fun highLightButtonsInit() {
         binding.apply {
             reportTitleEt.let { title ->
@@ -169,15 +156,9 @@ class PrepareUploadFragment :
     }
 
     private fun exitOrSave() {
-
+         navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
     }
 
-    @SuppressLint("StringFormatInvalid")
-    private fun initData() {
-
-    }
-
-
     private fun showSelectFilesSheet() {
         showVaultSelectFilesSheet(baseActivity.supportFragmentManager,
             baseActivity.getString(R.string.Uwazi_WidgetMedia_Take_Photo),
diff --git a/mobile/src/main/res/layout/fragment_prepare_upload.xml b/mobile/src/main/res/layout/fragment_prepare_upload.xml
index a6d6ba9b3..9a97778df 100644
--- a/mobile/src/main/res/layout/fragment_prepare_upload.xml
+++ b/mobile/src/main/res/layout/fragment_prepare_upload.xml
@@ -108,7 +108,7 @@
             android:background="@drawable/bg_round_orange16_btn"
             android:fontFamily="@font/open_sans"
             android:gravity="center"
-            android:text="@string/collect.end_action_submit"
+            android:text="@string/send_files_title"
             android:textAlignment="center"
             android:textColor="@color/btn_dark_letter"
             android:textSize="16sp"
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index 88329fa03..47293ef16 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -1002,4 +1002,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+  <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-be/strings.xml b/mobile/src/main/res/values-be/strings.xml
index e15cf9128..cd0b91ffc 100644
--- a/mobile/src/main/res/values-be/strings.xml
+++ b/mobile/src/main/res/values-be/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-blk/strings.xml b/mobile/src/main/res/values-blk/strings.xml
index 1b45e091b..2a313d4cb 100644
--- a/mobile/src/main/res/values-blk/strings.xml
+++ b/mobile/src/main/res/values-blk/strings.xml
@@ -141,4 +141,5 @@
     <string name="feedback_title">Feedback</string>
     <string name="feedback_sent_msg">Your feedback has been sent</string>
     <string name="share_feedback_action">share feedback</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-bn/strings.xml b/mobile/src/main/res/values-bn/strings.xml
index 84a567b2f..0dbe34939 100644
--- a/mobile/src/main/res/values-bn/strings.xml
+++ b/mobile/src/main/res/values-bn/strings.xml
@@ -983,4 +983,5 @@
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-es-rCU/strings.xml b/mobile/src/main/res/values-es-rCU/strings.xml
index 2eee28df0..4a0dae9f7 100644
--- a/mobile/src/main/res/values-es-rCU/strings.xml
+++ b/mobile/src/main/res/values-es-rCU/strings.xml
@@ -1004,4 +1004,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index 975dca38f..3386c00f5 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -987,4 +987,5 @@ Este feedback es anónimo, así que asegúrate de incluir tu información de con
   <string name="report_submitted_msg">El reporte se envió correctamente.</string>
   <string name="Collect_MediaWidget_Attach_File">Adjuntar archivo</string>
   <string name="form_successfully_submitted">%1$s eviado correctamente</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-fa-rIR/strings.xml b/mobile/src/main/res/values-fa-rIR/strings.xml
index acd0716ca..a35c05c72 100644
--- a/mobile/src/main/res/values-fa-rIR/strings.xml
+++ b/mobile/src/main/res/values-fa-rIR/strings.xml
@@ -1000,4 +1000,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index 3663722c6..92a94193d 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -997,4 +997,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-hdpi/strings.xml b/mobile/src/main/res/values-hdpi/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-hdpi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index f4fc275ce..5eb7d714a 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -985,4 +985,5 @@ Apakah Anda ingin membagikan analitik kepada tim Tella?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Lampirkan berkas</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-kac/strings.xml b/mobile/src/main/res/values-kac/strings.xml
index 41bdb3bb3..ca83e630b 100644
--- a/mobile/src/main/res/values-kac/strings.xml
+++ b/mobile/src/main/res/values-kac/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-kn/strings.xml b/mobile/src/main/res/values-kn/strings.xml
index 0cbd35125..68cb63707 100644
--- a/mobile/src/main/res/values-kn/strings.xml
+++ b/mobile/src/main/res/values-kn/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-ksw/strings.xml b/mobile/src/main/res/values-ksw/strings.xml
index 4925acdbc..e2d812a15 100644
--- a/mobile/src/main/res/values-ksw/strings.xml
+++ b/mobile/src/main/res/values-ksw/strings.xml
@@ -986,4 +986,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-ku/strings.xml b/mobile/src/main/res/values-ku/strings.xml
index b24e629d1..88200b941 100644
--- a/mobile/src/main/res/values-ku/strings.xml
+++ b/mobile/src/main/res/values-ku/strings.xml
@@ -998,4 +998,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-mdpi/strings.xml b/mobile/src/main/res/values-mdpi/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-mdpi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ml/strings.xml b/mobile/src/main/res/values-ml/strings.xml
index cf87b4b5a..8be73fa59 100644
--- a/mobile/src/main/res/values-ml/strings.xml
+++ b/mobile/src/main/res/values-ml/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-my/strings.xml b/mobile/src/main/res/values-my/strings.xml
index b4e857b54..0a23a7884 100644
--- a/mobile/src/main/res/values-my/strings.xml
+++ b/mobile/src/main/res/values-my/strings.xml
@@ -986,4 +986,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-ndc/strings.xml b/mobile/src/main/res/values-ndc/strings.xml
index e51eeea79..e10faa1c3 100644
--- a/mobile/src/main/res/values-ndc/strings.xml
+++ b/mobile/src/main/res/values-ndc/strings.xml
@@ -977,4 +977,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="report_submitted_msg">Tsamba yako yatumirwa swakanaka</string>
   <string name="Collect_MediaWidget_Attach_File">Kuisa gwaro mapwepo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt-rMZ/strings.xml b/mobile/src/main/res/values-pt-rMZ/strings.xml
index 7ef64346b..a18e9217f 100644
--- a/mobile/src/main/res/values-pt-rMZ/strings.xml
+++ b/mobile/src/main/res/values-pt-rMZ/strings.xml
@@ -989,4 +989,5 @@ Gostaria de partilhar dados com a equipa do Tella?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Anexar arquivo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index f7fae1d91..c0bd0c369 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index 91085941b..31a6be0bc 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1013,4 +1013,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-sn-rZW/strings.xml b/mobile/src/main/res/values-sn-rZW/strings.xml
index e51eeea79..e10faa1c3 100644
--- a/mobile/src/main/res/values-sn-rZW/strings.xml
+++ b/mobile/src/main/res/values-sn-rZW/strings.xml
@@ -977,4 +977,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="report_submitted_msg">Tsamba yako yatumirwa swakanaka</string>
   <string name="Collect_MediaWidget_Attach_File">Kuisa gwaro mapwepo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-sw600dp/strings.xml b/mobile/src/main/res/values-sw600dp/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-sw600dp/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ta/strings.xml b/mobile/src/main/res/values-ta/strings.xml
index dc0fb6e84..9c5087049 100644
--- a/mobile/src/main/res/values-ta/strings.xml
+++ b/mobile/src/main/res/values-ta/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 5cec2fede..9dd131245 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -983,4 +983,5 @@ Tella ekibiyle analizleri paylaşmak ister misiniz?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Dosya ekle</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-ts/strings.xml b/mobile/src/main/res/values-ts/strings.xml
index c3d5ed713..3f77cd650 100644
--- a/mobile/src/main/res/values-ts/strings.xml
+++ b/mobile/src/main/res/values-ts/strings.xml
@@ -973,4 +973,5 @@ yi fanele ku ku nyika vutshokotshoko bya servhidor.</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Nghenisa arkivho</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-v21/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-v26/strings.xml b/mobile/src/main/res/values-v26/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-v26/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-vi/strings.xml b/mobile/src/main/res/values-vi/strings.xml
index 8821ff75b..1285723ee 100644
--- a/mobile/src/main/res/values-vi/strings.xml
+++ b/mobile/src/main/res/values-vi/strings.xml
@@ -993,4 +993,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="report_submitted_msg">Your report has successfully been submitted.</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="send_files_title">Send files</string>
 </resources>
diff --git a/mobile/src/main/res/values-w820dp/strings.xml b/mobile/src/main/res/values-w820dp/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-w820dp/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xhdpi/strings.xml b/mobile/src/main/res/values-xhdpi/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-xhdpi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xxhdpi/strings.xml b/mobile/src/main/res/values-xxhdpi/strings.xml
new file mode 100644
index 000000000..67ac84b3d
--- /dev/null
+++ b/mobile/src/main/res/values-xxhdpi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="send_files_title">Send files</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index d59305d2b..bd0a26dd8 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1052,4 +1052,5 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
   <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
   <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
+  <string name="send_files_title">Send files</string>
 </resources>

From 3ada26c2b5b2836cbf82d1bec78e546354f6b802 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 9 Jul 2025 12:38:17 +0100
Subject: [PATCH 059/153] WIP fix state

---
 ...PeerServer.kt => TELLAPeerToPeerServer.kt} | 90 ++++++++++++-------
 .../managers/PeerServerStarterManager.kt      | 15 ++--
 .../data/peertopeer/model/P2PServerState.kt   | 10 +--
 .../peertopeer/remote/PrepareUploadRequest.kt |  5 +-
 .../mobile/domain/peertopeer/FileItem.kt      | 12 ---
 .../tella/mobile/domain/peertopeer/P2PFile.kt | 42 +++++++++
 .../base/BaseReportsSendFragment.kt           |  2 +-
 7 files changed, 115 insertions(+), 61 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/{TellaPeerToPeerServer.kt => TELLAPeerToPeerServer.kt} (67%)
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
similarity index 67%
rename from mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
index fbcf7a659..01a0bff05 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
@@ -1,6 +1,5 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
-import android.util.Log
 import io.ktor.http.HttpStatusCode
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.call
@@ -22,15 +21,18 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
+import org.horizontal.tella.mobile.data.peertopeer.model.ReceivingFile
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
-import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
@@ -38,14 +40,15 @@ import java.util.UUID
 
 const val port = 53317
 
-class TellaPeerToPeerServer(
+class TELLAPeerToPeerServer(
     private val ip: String,
     private val serverPort: Int = port,
-    private val pin: Int,
+    private val pin: String,
     private val keyPair: KeyPair,
     private val certificate: X509Certificate,
     private val keyStoreConfig: KeyStoreConfig,
     private val peerToPeerManager: PeerToPeerManager,
+    private val p2PServerState: P2PServerState
 ) : TellaServer {
     private var serverSession: PeerResponse? = null
     private var engine: ApplicationEngine? = null
@@ -82,7 +85,6 @@ class TellaPeerToPeerServer(
                 routing {
                     // Root route to confirm the server is running
                     get("/") {
-                        Log.i("Test", "Server started")
                         call.respondText("The server is running securely over HTTPS.")
                     }
 
@@ -103,7 +105,7 @@ class TellaPeerToPeerServer(
                         }
 
                         //TODO CHECK IF THE PIN IS CORRECT
-                        if (!isValidPin(request.pin) || pin.toString() != request.pin) {
+                        if (!isValidPin(request.pin) || pin != request.pin) {
                             call.respond(HttpStatusCode.Unauthorized, "Invalid PIN")
                             return@post
                         }
@@ -138,47 +140,69 @@ class TellaPeerToPeerServer(
                         }
 
                         launch {
+                            p2PServerState.apply {
+                                pin = this@TELLAPeerToPeerServer.pin
+
+                            }
                             PeerEventManager.emitRegistrationSuccess()
                         }
 
                         call.respond(HttpStatusCode.OK, session)
                     }
+                    post(PeerApiRoutes.PREPARE_UPLOAD) {
+                        val request = try {
+                            call.receive<PrepareUploadRequest>()
+                        } catch (e: Exception) {
+                            call.respond(HttpStatusCode.BadRequest, "Invalid body: ${e.message}")
+                            return@post
+                        }
 
-                        post(PeerApiRoutes.PREPARE_UPLOAD) {
-                            val request = try {
-                                call.receive<PrepareUploadRequest>()
-                            } catch (e: Exception) {
-                                call.respond(HttpStatusCode.BadRequest, "Invalid body: ${e.message}")
-                                return@post
-                            }
+                        if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
+                            call.respond(HttpStatusCode.BadRequest, "Missing required fields")
+                            return@post
+                        }
 
-                            if (request.title.isBlank() || request.sessionId.isBlank() || request.files.isEmpty()) {
-                                call.respond(HttpStatusCode.BadRequest, "Missing required fields")
-                                return@post
-                            }
+                        if (request.sessionId != serverSession?.sessionId) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                            return@post
+                        }
 
-                            if (request.sessionId != serverSession?.sessionId) {
-                                call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                        val accepted = PeerEventManager.emitPrepareUploadRequest(request)
+                        if (accepted) {
+                            val sessionId = serverSession?.sessionId ?: run {
+                                call.respond(HttpStatusCode.InternalServerError, "Missing session")
                                 return@post
                             }
 
-                            val accepted = PeerEventManager.emitPrepareUploadRequest(request)
-                            if (accepted) {
-                                val files = request.files.map { file ->
-                                    FileInfo(
-                                        id = file.id,
-                                        transmissionId = UUID.randomUUID().toString()
-                                    )
-                                }
-                                call.respond(
-                                    HttpStatusCode.OK,
-                                    PeerPrepareUploadResponse(files = files)
+                            // Create a new P2PSession
+                            val session = P2PSession(sessionId = sessionId, title = request.title)
+
+                            val responseFiles = request.files.map { file ->
+                                val transmissionId = UUID.randomUUID().toString()
+                                val receivingFile = ReceivingFile(
+                                    file = file,
+                                    transmissionId = transmissionId
+                                )
+                                session.files[transmissionId] = receivingFile
+
+                                FileInfo(
+                                    id = file.id,
+                                    transmissionId = transmissionId
                                 )
-                            } else {
-                                call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                             }
 
+                            // Save session to server state
+                            p2PServerState.session = session
+
+                            call.respond(
+                                HttpStatusCode.OK,
+                                PeerPrepareUploadResponse(files = responseFiles)
+                            )
+                        } else {
+                            call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
+                        }
                     }
+
                 }
 
             }
@@ -190,6 +214,6 @@ class TellaPeerToPeerServer(
     }
 
     private fun isValidPin(pin: String): Boolean {
-        return pin.length == 6 // or whatever your rule is
+        return pin.length == 6
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index d396f078a..6628474eb 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -3,7 +3,8 @@ package org.horizontal.tella.mobile.data.peertopeer.managers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
+import org.horizontal.tella.mobile.data.peertopeer.TELLAPeerToPeerServer
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import java.security.KeyPair
 import java.security.cert.X509Certificate
@@ -14,23 +15,25 @@ import javax.inject.Singleton
 class PeerServerStarterManager @Inject constructor(
     private val peerToPeerManager: PeerToPeerManager
 ) {
-    private var server: TellaPeerToPeerServer? = null
+    private var server: TELLAPeerToPeerServer? = null
 
     fun startServer(
         ip: String,
         keyPair: KeyPair,
-        pin: Int,
+        pin: String,
         cert: X509Certificate,
-        config: KeyStoreConfig
+        config: KeyStoreConfig,
+        p2PServerState: P2PServerState,
     ) {
         if (server == null) {
-            server = TellaPeerToPeerServer(
+            server = TELLAPeerToPeerServer(
                 ip = ip,
                 keyPair = keyPair,
                 pin = pin,
                 certificate = cert,
                 keyStoreConfig = config,
-                peerToPeerManager = peerToPeerManager
+                peerToPeerManager = peerToPeerManager,
+                p2PServerState = p2PServerState
             )
             server?.start()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
index c170114b6..2d5c0ca4a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
@@ -1,5 +1,7 @@
 package org.horizontal.tella.mobile.data.peertopeer.model
 
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
+
 // --- ENUMS ---
 
 enum class P2PFileStatus {
@@ -16,11 +18,6 @@ enum class SessionStatus {
     FINISHED_WITH_ERRORS
 }
 
-data class P2PFile(
-    val name: String,
-    val size: Long
-)
-
 data class ReceivingFile(
     var file: P2PFile,
     var status: P2PFileStatus = P2PFileStatus.QUEUE,
@@ -30,7 +27,7 @@ data class ReceivingFile(
 )
 
 class P2PSession(
-    val sessionId: String,
+    var sessionId: String,
     var status: SessionStatus = SessionStatus.WAITING,
     var files: MutableMap<String, ReceivingFile> = mutableMapOf(),
     var title: String? = null
@@ -46,6 +43,7 @@ class P2PServerState(
     var pin: String? = null,
     var session: P2PSession? = null,
     private var failedAttempts: Int = 0,
+    //TODO ASK DHEKRA ABOIUT THIS
     private var isUsingManualConnection: Boolean = false
 ) {
     private val maxFailedAttempts = 3
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
index d83eb6d7f..803f30c08 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PrepareUploadRequest.kt
@@ -1,13 +1,12 @@
 package org.horizontal.tella.mobile.data.peertopeer.remote
 
-import com.hzontal.tella_vault.VaultFile
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 
 @Serializable
 data class PrepareUploadRequest(
     val title: String,
     @SerialName("sessionId") val sessionId: String,
-    val files: List<FormMediaFile>
+    val files: List<P2PFile>
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
deleted file mode 100644
index f089be108..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/FileItem.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.horizontal.tella.mobile.domain.peertopeer
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class P2PFile(
-    val id: String,
-    val fileName: String,
-    val size: Long,
-    val fileType: String,
-    val sha256: String
-)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
new file mode 100644
index 000000000..c4a6db2d8
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
@@ -0,0 +1,42 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class P2PFile(
+    val id: String,
+    val fileName: String,
+    val size: Long,
+    val fileType: String,
+    val sha256: String,
+    val thumb: ByteArray? = null
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as P2PFile
+
+        if (id != other.id) return false
+        if (fileName != other.fileName) return false
+        if (size != other.size) return false
+        if (fileType != other.fileType) return false
+        if (sha256 != other.sha256) return false
+        if (thumb != null) {
+            if (other.thumb == null) return false
+            if (!thumb.contentEquals(other.thumb)) return false
+        } else if (other.thumb != null) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + fileName.hashCode()
+        result = 31 * result + size.hashCode()
+        result = 31 * result + fileType.hashCode()
+        result = 31 * result + sha256.hashCode()
+        result = 31 * result + (thumb?.contentHashCode() ?: 0)
+        return result
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
index 1607e6f4c..635bb683b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
@@ -82,7 +82,7 @@ abstract class BaseReportsSendFragment :
         binding.toolbar.backClickListener = {
             handleBackButton()
         }
-        binding.toolbar.setRightIcon(icon = -1)
+        binding.setRightIcon(icon = -1)
 
         if (reportInstance?.status == EntityStatus.SUBMITTED) {
             binding.nextBtn.hide()

From af896c6fee1573e7b68cad7e22b87ac611be5ca0 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 9 Jul 2025 12:38:52 +0100
Subject: [PATCH 060/153] clean code

---
 .../tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
index 01a0bff05..c70929fd1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
@@ -174,9 +174,9 @@ class TELLAPeerToPeerServer(
                                 return@post
                             }
 
-                            // Create a new P2PSession
                             val session = P2PSession(sessionId = sessionId, title = request.title)
 
+
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
                                 val receivingFile = ReceivingFile(
@@ -191,7 +191,6 @@ class TELLAPeerToPeerServer(
                                 )
                             }
 
-                            // Save session to server state
                             p2PServerState.session = session
 
                             call.respond(

From 7968532e1989977b795ea05ecd650955213d90ce Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 9 Jul 2025 20:17:14 +0100
Subject: [PATCH 061/153] wip submission files workflow

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  26 +-
 ...PeerServer.kt => TellaPeerToPeerServer.kt} |   4 +-
 .../managers/PeerServerStarterManager.kt      |   6 +-
 .../domain/entity/collect/FormMediaFile.java  |   3 +
 .../entity/peertopeer/PeerToPeerInstance.kt   |   5 +-
 .../tella/mobile/util/NavigationManager.kt    |  13 +-
 .../mobile/views/base_ui/BaseActivity.kt      |   5 +-
 .../base/BaseReportsSendFragment.kt           |   2 +-
 .../fragment/peertopeer/PeerSessionManager.kt |  19 +-
 .../fragment/peertopeer/SenderViewModel.kt    |  29 ++-
 .../fragment/peertopeer/di/PeerModule.kt      |   7 +
 .../receipentflow/ConnectHotspotFragment.kt   |  10 +-
 .../receipentflow/QRCodeFragment.kt           |  13 +-
 .../senderflow/PrepareUploadFragment.kt       |  67 ++---
 .../senderflow/UploadFilesFragment.kt         |  54 ++--
 .../senderflow/WaitingSenderFragment.kt       |  15 +-
 .../uwazi/widgets/PeerToPeerEndView.java      | 246 ++++++++++++++++++
 .../main/res/layout/fragment_send_report.xml  |  19 +-
 .../main/res/layout/fragment_upload_files.xml |  30 ++-
 .../res/navigation/peer_to_peer_graph.xml     |  12 +-
 mobile/src/main/res/values/strings.xml        |   1 +
 21 files changed, 437 insertions(+), 149 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/{TELLAPeerToPeerServer.kt => TellaPeerToPeerServer.kt} (98%)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 6e88efd39..54c0dadc6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -11,10 +11,12 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_JSON
+import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_OCTET
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
@@ -132,18 +134,18 @@ class TellaPeerToPeerClient {
 
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
-//        val fileItems = files.map {
-//            val mimeType = it.mimeType ?: CONTENT_TYPE_OCTET
-//            P2PFile(
-//                id = it.id,
-//                fileName = it.name,
-//                size = it.size,
-//                fileType = mimeType,
-//                sha256 = it.hash
-//            )
-//        }
-
-        val requestPayload = PrepareUploadRequest(title, sessionId, files)
+        val fileItems = files.map {
+            val mimeType = it.mimeType ?: CONTENT_TYPE_OCTET
+            P2PFile(
+                id = it.id,
+                fileName = it.name,
+                size = it.size,
+                fileType = mimeType,
+                sha256 = it.hash
+            )
+        }
+
+        val requestPayload = PrepareUploadRequest(title, sessionId, fileItems)
         val jsonPayload = Json.encodeToString(requestPayload)
         val requestBody = jsonPayload.toRequestBody()
         val client = getClientWithFingerprintValidation(expectedFingerprint)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
similarity index 98%
rename from mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index c70929fd1..9642664c5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TELLAPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -40,7 +40,7 @@ import java.util.UUID
 
 const val port = 53317
 
-class TELLAPeerToPeerServer(
+class TellaPeerToPeerServer(
     private val ip: String,
     private val serverPort: Int = port,
     private val pin: String,
@@ -141,7 +141,7 @@ class TELLAPeerToPeerServer(
 
                         launch {
                             p2PServerState.apply {
-                                pin = this@TELLAPeerToPeerServer.pin
+                                pin = this@TellaPeerToPeerServer.pin
 
                             }
                             PeerEventManager.emitRegistrationSuccess()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 6628474eb..6449bc74f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -3,7 +3,7 @@ package org.horizontal.tella.mobile.data.peertopeer.managers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.horizontal.tella.mobile.data.peertopeer.TELLAPeerToPeerServer
+import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import java.security.KeyPair
@@ -15,7 +15,7 @@ import javax.inject.Singleton
 class PeerServerStarterManager @Inject constructor(
     private val peerToPeerManager: PeerToPeerManager
 ) {
-    private var server: TELLAPeerToPeerServer? = null
+    private var server: TellaPeerToPeerServer? = null
 
     fun startServer(
         ip: String,
@@ -26,7 +26,7 @@ class PeerServerStarterManager @Inject constructor(
         p2PServerState: P2PServerState,
     ) {
         if (server == null) {
-            server = TELLAPeerToPeerServer(
+            server = TellaPeerToPeerServer(
                 ip = ip,
                 keyPair = keyPair,
                 pin = pin,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/collect/FormMediaFile.java b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/collect/FormMediaFile.java
index 2db77b42f..1c51dc4ac 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/collect/FormMediaFile.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/collect/FormMediaFile.java
@@ -9,12 +9,15 @@ public class FormMediaFile extends VaultFile {
     public FormMediaFileStatus status; // break away from getters/setters :)
     public boolean uploading;
     public long uploadedSize;
+    public String transmissionId;
+
 
      public FormMediaFile() {
         super();
         status = FormMediaFileStatus.UNKNOWN;
         uploading = true;
         uploadedSize = 0;
+         transmissionId = "";
     }
 
     public static FormMediaFile fromMediaFile(@NonNull VaultFile vaultFile) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
index eb3079149..2312e005a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
@@ -7,11 +7,10 @@ import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
 class PeerToPeerInstance(
     var id: Long = -1,
     var updated: Long = 0,
-    var metadata: Map<String, List<Any>> = mutableMapOf(),
     var status: EntityStatus = EntityStatus.UNKNOWN,
     var widgetMediaFiles: List<FormMediaFile> = mutableListOf(),
     var formPartStatus: FormMediaFileStatus = FormMediaFileStatus.UNKNOWN,
     var title: String = "",
-    var description: String = "",
-    var current: Long = 0
+    var current: Long = 0,
+    var sessionID: String = ""
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index bbc243016..dc5d9cd3f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -185,6 +185,7 @@ class NavigationManager(
     fun navigateFromScanQrCodeToDeviceInfo() {
         navigateToWithBundle(R.id.action_qrCodeScreen_to_deviceInfoScreen)
     }
+
     fun navigateFromScanQrCodeToPrepareUploadFragment() {
         navigateToWithBundle(R.id.action_scanQrCodeScreen_to_prepareUploadFragment)
     }
@@ -197,7 +198,7 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_senderManualConnectionScreen_to_connectManuallyVerificationScreen)
     }
 
-    fun navigateFromDeviceInfoScreenTRecipientVerificationScreen(){
+    fun navigateFromDeviceInfoScreenTRecipientVerificationScreen() {
         navigateToWithBundle(R.id.action_deviceInfoScreen_to_recipientVerificationScreen)
     }
 
@@ -209,18 +210,22 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_prepareUploadFragment_to_waitingSenderFragment)
     }
 
-    fun navigateConnectManuallyVerificationFragmentToprepareUploadFragment(){
+    fun navigateConnectManuallyVerificationFragmentToprepareUploadFragment() {
         navigateToWithBundle(R.id.action_connectManuallyVerificationFragment_to_prepareUploadFragment)
     }
 
-    fun navigateFromRecipientVerificationScreenToWaitingReceiverFragment(){
+    fun navigateFromRecipientVerificationScreenToWaitingReceiverFragment() {
         navigateToWithBundle(R.id.action_recipientVerificationScreen_to_waitingReceiverFragment)
     }
 
-    fun navigateFromWaitingReceiverFragmentToRecipientSuccessFragment(){
+    fun navigateFromWaitingReceiverFragmentToRecipientSuccessFragment() {
         navigateToWithBundle(R.id.action_waitingReceiverFragment_to_recipientSuccessFragment)
     }
 
+    fun navigateFromWaitingSenderFragmentToUploadFilesFragment() {
+        navigateToWithBundle(R.id.action_waitingSenderFragment_to_uploadFilesFragment)
+    }
+
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
         navControllerProvider.navController.navigate(
             R.id.startNearBySharingFragment,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseActivity.kt
index c005a9afd..256c82474 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseActivity.kt
@@ -32,7 +32,8 @@ abstract class BaseActivity : AppCompatActivity() {
     var isManualOrientation = false
     private lateinit var container: ViewGroup
     private lateinit var loading: View
-    @Inject lateinit var divviupUtils : DivviupUtils
+    @Inject
+    lateinit var divviupUtils: DivviupUtils
     override fun onCreate(savedInstanceState: Bundle?) {
         // Let content draw behind system bars
         WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -146,7 +147,7 @@ abstract class BaseActivity : AppCompatActivity() {
             .commitAllowingStateLoss()
     }
 
-    fun addFragment(container : Int, fragment: Fragment, tag : String ){
+    fun addFragment(container: Int, fragment: Fragment, tag: String) {
         val existingFragment = supportFragmentManager.findFragmentByTag(tag)
         if (existingFragment == null) {
             supportFragmentManager.beginTransaction()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
index 635bb683b..1607e6f4c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/main_connexions/base/BaseReportsSendFragment.kt
@@ -82,7 +82,7 @@ abstract class BaseReportsSendFragment :
         binding.toolbar.backClickListener = {
             handleBackButton()
         }
-        binding.setRightIcon(icon = -1)
+        binding.toolbar.setRightIcon(icon = -1)
 
         if (reportInstance?.status == EntityStatus.SUBMITTED) {
             binding.nextBtn.hide()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
index cf78f1b21..9e6b6b346 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
@@ -1,9 +1,6 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer
 
-/**
- * Created by wafa on 2/6/2025.
- */
-
+//TODO CHECK IF WE SHOULD REMOVE THIS
 data class PeerConnectionInfo(
     val ip: String = "",
     val port: String = "",
@@ -11,7 +8,6 @@ data class PeerConnectionInfo(
     val sessionId: String = "",
     val hash: String = "",
     val pin: Int = 0,
-    var transmissionId: String? = null
 )
 
 object PeerSessionManager {
@@ -30,17 +26,4 @@ object PeerSessionManager {
 
     fun isSessionValid(): Boolean = connectionInfo != null
 
-    private val transmissionMap = mutableMapOf<String, String>() // fileId -> transmissionId
-
-    fun saveTransmissionId(fileId: String, transmissionId: String) {
-        transmissionMap[fileId] = transmissionId
-    }
-
-    fun getTransmissionId(fileId: String): String? {
-        return transmissionMap[fileId]
-    }
-
-    fun clearTransmissions() {
-        transmissionMap.clear()
-    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index c897f9d72..a7a4db0bb 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -16,6 +16,8 @@ import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
+import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
@@ -31,7 +33,7 @@ class SenderViewModel @Inject constructor(
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
     private val _prepareRejected = MutableLiveData<Event<Boolean>>()
     val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
-
+    var peerToPeerInstance: PeerToPeerInstance? = null
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -63,6 +65,16 @@ class SenderViewModel @Inject constructor(
         return vaultFiles
     }
 
+    fun vaultFilesToMediaFiles(files: List<VaultFile>): List<FormMediaFile> {
+        val vaultFiles = mutableListOf<FormMediaFile>()
+        files.map { vaultFile ->
+            val mediaFile = FormMediaFile.fromMediaFile(vaultFile)
+            mediaFile.status = FormMediaFileStatus.NOT_SUBMITTED
+            vaultFiles.add(FormMediaFile.fromMediaFile(vaultFile))
+        }
+        return vaultFiles
+    }
+
     fun prepareUploadsFromVaultFiles(
         files: List<VaultFile>,
         title: String = "Title of the report"
@@ -82,8 +94,19 @@ class SenderViewModel @Inject constructor(
                 sessionId = info.sessionId
             )) {
                 is PrepareUploadResult.Success -> {
-                    Timber.d("Success: transmissionId = ${result.transmissions}")
+                    peerToPeerInstance?.sessionID = info.sessionId
+                    val fileInfoMap = result.transmissions.associateBy { it.id }
+
+                    peerToPeerInstance?.widgetMediaFiles?.forEach { mediaFile ->
+                        fileInfoMap[mediaFile.id]?.let { fileInfo ->
+                            mediaFile.transmissionId = fileInfo.transmissionId
+                        }
+                    }
+
                     _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissions))
+
+                    //TODO UNIFY THE INSTANCE EITHER USE PEERTOPEERINSTANCE OR USE PEERSESSIONMANAGER
+                    //TODO UNIFY THE FORMENDVIEW TO USE THE NEW STATE MANAGER ...
                 }
 
                 is PrepareUploadResult.Forbidden -> {
@@ -111,6 +134,8 @@ class SenderViewModel @Inject constructor(
             }
         }
     }
+
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index 5fb51fbf1..aaee843b1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -6,6 +6,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
 import javax.inject.Singleton
 
 @Module
@@ -23,4 +24,10 @@ object PeerModule {
     fun providePeerToPeerManager(): PeerToPeerManager {
         return PeerToPeerManager()
     }
+
+    @Provides
+    @Singleton
+    fun provideP2PServerState(): P2PServerState {
+        return P2PServerState()
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 0ce670c43..957ab1c06 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -25,6 +25,7 @@ class ConnectHotspotFragment :
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var isCheckboxChecked = false
+    private val permissionsToRequest = mutableListOf<String>()
 
     @RequiresApi(Build.VERSION_CODES.M)
     private val requestPermissionLauncher =
@@ -46,6 +47,7 @@ class ConnectHotspotFragment :
         initObservers()
         initListeners()
         checkAndRequestPermissions()
+        updateInfoOrGetPermission()
     }
 
     private fun initObservers() {
@@ -98,7 +100,6 @@ class ConnectHotspotFragment :
 
     @RequiresApi(Build.VERSION_CODES.M)
     private fun checkAndRequestPermissions() {
-        val permissionsToRequest = mutableListOf<String>()
 
         if (ContextCompat.checkSelfPermission(
                 baseActivity,
@@ -121,9 +122,14 @@ class ConnectHotspotFragment :
         ) {
             permissionsToRequest.add(ACCESS_NETWORK_STATE)
         }
+    }
 
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun updateInfoOrGetPermission() {
         if (permissionsToRequest.isNotEmpty()) {
-            requestPermissionLauncher.launch(permissionsToRequest.toTypedArray())
+            baseActivity.maybeChangeTemporaryTimeout {
+                requestPermissionLauncher.launch(permissionsToRequest.toTypedArray())
+            }
         } else {
             viewModel.updateNetworkInfo()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 7f75ac6f6..0f0823a53 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -13,6 +13,7 @@ import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
 import org.horizontal.tella.mobile.data.peertopeer.port
 import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
@@ -34,6 +35,9 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     @Inject
     lateinit var peerToPeerManager: PeerToPeerManager
 
+    @Inject
+    lateinit var p2PServerState: P2PServerState
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -68,7 +72,14 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val pin = (100000..999999).random()
         val port = port
 
-        peerServerStarterManager.startServer(ip, keyPair, pin, certificate, config)
+        peerServerStarterManager.startServer(
+            ip,
+            keyPair,
+            pin.toString(),
+            certificate,
+            config,
+            p2PServerState
+        )
 
 
         payload = PeerConnectionPayload(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 8bfdfb42f..574c2f6d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -1,10 +1,10 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -27,7 +27,6 @@ import org.horizontal.tella.mobile.views.activity.camera.CameraActivity.Companio
 import org.horizontal.tella.mobile.views.adapters.reports.ReportsFilesRecyclerViewAdapter
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
-import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_FORM_INSTANCE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
 import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
@@ -44,7 +43,6 @@ import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesShe
 import org.hzontal.shared_ui.utils.DialogUtils
 
 var PREPARE_UPLOAD_ENTRY = "PREPARE_UPLOAD_ENTRY"
-var BUNDLE_PEER_TO_PEER_FORM_INSTANCE = "BUNDLE_PEER_TO_PEER_FORM_INSTANCE"
 
 @AndroidEntryPoint
 class PrepareUploadFragment :
@@ -52,8 +50,7 @@ class PrepareUploadFragment :
     IReportAttachmentsHandler, OnNavBckListener {
     private lateinit var gridLayoutManager: GridLayoutManager
     private var isTitleEnabled = false
-    private var peerToPeerInstance: PeerToPeerInstance? = null
-    private val viewModel: SenderViewModel by viewModels()
+    private val viewModel: SenderViewModel by activityViewModels()
     private var disposables =
         MyApplication.bus().createCompositeDisposable()
 
@@ -88,17 +85,7 @@ class PrepareUploadFragment :
             exitOrSave()
         }
 
-        arguments?.let { bundle ->
-            if (bundle.get(BUNDLE_PEER_TO_PEER_FORM_INSTANCE) != null) {
-                peerToPeerInstance = bundle.get(BUNDLE_PEER_TO_PEER_FORM_INSTANCE) as PeerToPeerInstance
-                bundle.remove(BUNDLE_PEER_TO_PEER_FORM_INSTANCE)
-            }
-        }
-
-        peerToPeerInstance?.let { instance ->
-            binding.reportTitleEt.setText(instance.title)
-            putFiles(viewModel.mediaFilesToVaultFiles(instance.widgetMediaFiles))
-        }
+        //TODO HANDLE THIS IN THE NAVMANAGER
         val navBackStackEntry = findNavController().currentBackStackEntry
         navBackStackEntry?.savedStateHandle
             ?.getLiveData<Boolean>("transferRejected")
@@ -111,17 +98,6 @@ class PrepareUploadFragment :
                 }
             }
 
-        viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
-           // val transmissionId = response.files.firstOrNull()?.transmissionId
-            DialogUtils.showBottomMessage(
-                baseActivity,
-                getString(R.string.the_receiver_accepted_the_files_transfer),
-                false,
-                3000
-            )
-            // navigate to next screen
-        }
-
         binding.toolbar.backClickListener = {
             BottomSheetUtils.showConfirmSheet(
                 baseActivity.supportFragmentManager,
@@ -132,7 +108,7 @@ class PrepareUploadFragment :
                 object : BottomSheetUtils.ActionConfirmed {
                     override fun accept(isConfirmed: Boolean) {
                         if (isConfirmed) {
-                           back()
+                            back()
                         }
                     }
                 }
@@ -156,7 +132,7 @@ class PrepareUploadFragment :
     }
 
     private fun exitOrSave() {
-         navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+        navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
     }
 
     private fun showSelectFilesSheet() {
@@ -274,26 +250,31 @@ class PrepareUploadFragment :
 
     private fun initClickListeners(isSubmitEnabled: Boolean) {
         binding.sendReportBtn.setOnClickListener {
-            binding.sendReportBtn.setOnClickListener {
-                if (isSubmitEnabled) {
-                    val selectedFiles = filesRecyclerViewAdapter.getFiles()
-                    if (selectedFiles.isNotEmpty()) {
-                        bundle.putSerializable(
-                            "selectedFiles",
-                            ArrayList(selectedFiles)
-                        ) // assuming VaultFile is Serializable
-                        // navigate to waiting view
-                        navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
-                    } else {
-                        showToast("No file selected")
-                    }
+            if (isSubmitEnabled) {
+                val selectedFiles = filesRecyclerViewAdapter.getFiles()
+                if (selectedFiles.isNotEmpty()) {
+                    // Fill the PeerToPeerInstance in the ViewModel
+                    viewModel.peerToPeerInstance = PeerToPeerInstance(
+                        updated = System.currentTimeMillis(),
+                        widgetMediaFiles = viewModel.vaultFilesToMediaFiles(selectedFiles),
+                        title = binding.reportTitleEt.text.toString()
+                    )
+
+                    // Optional: add to bundle if still needed elsewhere
+                    bundle.putSerializable("selectedFiles", ArrayList(selectedFiles))
+
+                    // Navigate
+                    navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
                 } else {
-                    showSubmitReportErrorSnackBar()
+                    showToast("No file selected")
                 }
+            } else {
+                showSubmitReportErrorSnackBar()
             }
         }
     }
 
+
     private fun showSubmitReportErrorSnackBar() {
         val errorRes = R.string.Snackbar_Submit_Files_Error
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
index c0cf40d9b..92b3bcb7e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
@@ -1,45 +1,43 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.ReportsFormEndView
+import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 
 class UploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
+    private val viewModel: SenderViewModel by activityViewModels()
+    protected lateinit var endView: PeerToPeerEndView
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        showFormEndView()
+    }
 
     private fun showFormEndView() {
-        /*   if (reportInstance == null) {
-               return
-           }
-
-           reportInstance?.let { reportFormInstance ->
-
-               endView = ReportsFormEndView(
-                   activity,
-                   reportFormInstance.title,
-                   reportFormInstance.description,
-               )
-               endView.setInstance(
-                   reportFormInstance, MyApplication.isConnectedToInternet(baseActivity), false
-               )
-               binding.endViewContainer.removeAllViews()
-               binding.endViewContainer.addView(endView)
-               endView.clearPartsProgress(reportFormInstance)
-           }*/
+        if (viewModel.peerToPeerInstance == null) {
+            return
+        }
+
+        viewModel.peerToPeerInstance?.let { peerInstance ->
+
+            endView = PeerToPeerEndView(
+                baseActivity,
+                peerInstance.title,
+            )
+            endView.setInstance(
+                peerInstance, MyApplication.isConnectedToInternet(baseActivity), false
+            )
+            binding.endViewContainer.removeAllViews()
+            binding.endViewContainer.addView(endView)
+            endView.clearPartsProgress(peerInstance)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index 6570e8100..a29057b6a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -9,24 +9,26 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
  */
 class WaitingSenderFragment :
     BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
-    private val viewModelSender: SenderViewModel by activityViewModels()
+    private val viewModel: SenderViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolbar.setStartTextTitle(getString(R.string.send_files))
         binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
-        val selectedFiles = arguments?.getSerializable("selectedFiles") as? List<VaultFile> ?: emptyList()
-        viewModelSender.prepareUploadsFromVaultFiles(selectedFiles)
+        val selectedFiles =
+            arguments?.getSerializable("selectedFiles") as? List<VaultFile> ?: emptyList()
+        viewModel.prepareUploadsFromVaultFiles(selectedFiles)
         binding.toolbar.backClickListener = {
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
 
-        viewModelSender.prepareRejected.observe(viewLifecycleOwner) { event ->
+        viewModel.prepareRejected.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let { wasRejected ->
                 if (wasRejected) {
                     findNavController().previousBackStackEntry
@@ -36,5 +38,10 @@ class WaitingSenderFragment :
                 }
             }
         }
+
+
+        viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
+            navManager().navigateFromWaitingSenderFragmentToUploadFilesFragment()
+        }
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
new file mode 100644
index 000000000..8521e7378
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -0,0 +1,246 @@
+package org.horizontal.tella.mobile.views.fragment.uwazi.widgets;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.hzontal.utils.MediaFile;
+
+import org.horizontal.tella.mobile.R;
+import org.horizontal.tella.mobile.domain.entity.EntityStatus;
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile;
+import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus;
+import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance;
+import org.horizontal.tella.mobile.util.FileUtil;
+import org.horizontal.tella.mobile.util.Util;
+import org.hzontal.shared_ui.submission.SubmittingItem;
+
+import java.util.Objects;
+
+/**
+ * Created by wafa on 9/7/2025.
+ */
+public class PeerToPeerEndView extends FrameLayout {
+    LinearLayout partsListView;
+    TextView titleView;
+    TextView formStatusTextView;
+    TextView formSizeView;
+    String title;
+    LinearProgressIndicator totalProgress;
+    long formSize = 0L;
+    private PeerToPeerInstance instance;
+    private boolean previewUploaded;
+
+    public PeerToPeerEndView(Context context, String title) {
+        super(context);
+        inflate(context, R.layout.reports_form_end_view, this);
+
+        this.title = title;
+
+        titleView = findViewById(R.id.title);
+        titleView.setText(title);
+
+        totalProgress = findViewById(R.id.totalProgress);
+        formSizeView = findViewById(R.id.formSize);
+
+        formStatusTextView = findViewById(R.id.form_status);
+    }
+
+    public void setInstance(@NonNull PeerToPeerInstance instance, boolean offline, boolean previewUploaded) {
+        this.instance = instance;
+        this.previewUploaded = previewUploaded;
+        refreshInstance(offline);
+    }
+
+    public void refreshInstance(boolean offline) {
+        if (this.instance == null) {
+            return;
+        }
+
+        TextView formNameView = findViewById(R.id.title);
+
+        formNameView.setText(Objects.requireNonNull(instance.getTitle()));
+
+        partsListView = findViewById(R.id.formPartsList);
+        partsListView.removeAllViews();
+
+        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
+            partsListView.addView(createFormMediaFileItemView(mediaFile, offline));
+            formSize += mediaFile.size;
+        }
+        setFormSizeLabel(instance, 0);
+        uploadProgressVisibity(instance, offline);
+        setUploadProgress(instance, 0);
+    }
+
+    void setFormSizeLabel(@NonNull PeerToPeerInstance instance, int percent) {
+        String title;
+        if (instance.getWidgetMediaFiles().isEmpty()) {
+            title = getStatusLabel(instance.getStatus());
+            formSizeView.setText(title);
+            return;
+        }
+        switch (instance.getStatus()) {
+            case SUBMITTED:
+                title = getStatusLabel(instance.getStatus()) + "\n" +
+                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
+                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
+                        FileUtil.getFileSizeString(formSize);
+                break;
+            case PAUSED:
+                title = getStatusLabel(instance.getStatus()) + "\n" +
+                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
+                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
+                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize);
+                break;
+            case FINALIZED:
+            case SUBMISSION_PENDING:
+            case SUBMISSION_ERROR:
+                title = getStatusLabel(instance.getStatus()) + "\n" +
+                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
+                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
+                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize) + " " +
+                        getResources().getString(R.string.File_Uploaded);
+                break;
+            default:
+                title = percent + "% " + getResources().getString(R.string.File_Uploaded) + "\n" +
+                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
+                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ",  " +
+                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize) + " " +
+                        getResources().getString(R.string.File_Uploaded);
+                break;
+        }
+
+        formSizeView.setText(title);
+    }
+
+
+    String getStatusLabel(EntityStatus status) {
+        String title = "";
+        if (status == EntityStatus.SUBMITTED) {
+            title = getResources().getString(R.string.File_Uploaded_on) + " " + Util.getDateTimeString(instance.getUpdated());
+        } else if (status == EntityStatus.PAUSED) {
+            title = getResources().getString(R.string.Paused_Report);
+        } else if (status == EntityStatus.FINALIZED || instance.getStatus() == EntityStatus.SUBMISSION_PENDING || instance.getStatus() == EntityStatus.SUBMISSION_ERROR) {
+            title = getResources().getString(R.string.Report_Waiting_For_Connection);
+        }
+        return title;
+    }
+
+    private void uploadProgressVisibity(PeerToPeerInstance instance, Boolean isOnline) {
+        if (!isOnline || instance.getWidgetMediaFiles().isEmpty()) {
+            totalProgress.setVisibility(GONE);
+            return;
+        }
+
+        if (instance.getStatus() == EntityStatus.SUBMITTED) {
+            totalProgress.setVisibility(GONE);
+        } else {
+            totalProgress.setVisibility(VISIBLE);
+        }
+    }
+
+    public void setUploadProgress(PeerToPeerInstance instance, float pct) {
+        if (pct < 0 || pct > 1) {
+            return;
+        }
+
+        int percentComplete;
+
+        if (instance.getWidgetMediaFiles().size() > 1) {
+            percentComplete = getTotalUploadedSizePercent(instance);
+        } else {
+            percentComplete = (int) (pct * 100);
+        }
+
+        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
+            if (mediaFile.status == FormMediaFileStatus.SUBMITTED) {
+                SubmittingItem item = partsListView.findViewWithTag(mediaFile.getVaultFile().id);
+                item.setPartUploaded();
+            }
+        }
+
+        //Timber.d("***Test*** PCT " + pct + "\n getTotalUploadedSize " + getTotalUploadedSize(instance) + "\n FormSize " + formSize + "\n percentComplete " + percentComplete + " \n Math.round(percentComplete) " + Math.toIntExact(percentComplete));
+        totalProgress.setProgressCompat(percentComplete, true);
+        setFormSizeLabel(instance, percentComplete);
+    }
+
+    private int getTotalUploadedSizePercent(PeerToPeerInstance instance) {
+        int totalUploadedSize = 0;
+        for (FormMediaFile formMediaFile : instance.getWidgetMediaFiles()) {
+            totalUploadedSize += formMediaFile.uploadedSize;
+        }
+        if (totalUploadedSize > 0) {
+            float percent = ((float) (totalUploadedSize * 1.0) / formSize);
+            return Math.round(percent * 100);
+
+        } else {
+            return 0;
+        }
+    }
+
+    private String getTotalUploadedSize(PeerToPeerInstance instance) {
+        long totalUploadedSize = 0;
+        for (FormMediaFile formMediaFile : instance.getWidgetMediaFiles()) {
+            totalUploadedSize += formMediaFile.uploadedSize;
+        }
+        return FileUtil.getFileSize(totalUploadedSize);
+    }
+
+    public void clearPartsProgress(PeerToPeerInstance instance) {
+        setPartsCleared(instance);
+    }
+
+
+    private View createFormMediaFileItemView(@NonNull FormMediaFile mediaFile, boolean offline) {
+
+        SubmittingItem item = new SubmittingItem(getContext(), null, 0);
+        ImageView thumbView = item.findViewById(R.id.fileThumb);
+        item.setTag(mediaFile.getPartName());
+
+        item.setPartName(mediaFile.name);
+        item.setPartSize(mediaFile.size);
+
+        if (MediaFile.INSTANCE.isImageFileType(mediaFile.mimeType) || (MediaFile.INSTANCE.isVideoFileType(mediaFile.mimeType))) {
+            Glide.with(getContext())
+                    .load(mediaFile.thumb)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(true)
+                    .into(thumbView);
+        } else if (MediaFile.INSTANCE.isAudioFileType(mediaFile.mimeType)) {
+            item.setPartIcon(R.drawable.ic_headset_white_24dp);
+        } else {
+            item.setPartIcon(R.drawable.ic_attach_file_white_24dp);
+        }
+
+        if (mediaFile.status == FormMediaFileStatus.SUBMITTED || previewUploaded) {
+            item.setPartUploaded();
+        } else {
+            item.setPartPrepared(offline);
+        }
+
+        return item;
+    }
+
+    private void setPartsCleared(PeerToPeerInstance instance) {
+        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
+            SubmittingItem item = partsListView.findViewWithTag(mediaFile.getVaultFile().id);
+
+            if (instance.getStatus() == EntityStatus.SUBMITTED) {
+                item.setPartUploaded();
+            } else {
+                item.setPartCleared();
+            }
+        }
+    }
+}
+
+
diff --git a/mobile/src/main/res/layout/fragment_send_report.xml b/mobile/src/main/res/layout/fragment_send_report.xml
index ed3455116..8ebbf7bb1 100644
--- a/mobile/src/main/res/layout/fragment_send_report.xml
+++ b/mobile/src/main/res/layout/fragment_send_report.xml
@@ -32,22 +32,19 @@
         app:startTitle="@string/Reports_Title_Screen" />
 
     <androidx.appcompat.widget.AppCompatButton
-        style="@style/Unlock_White_Text"
-        android:layout_marginBottom="18dp"
-        android:layout_width="wrap_content"
+        android:id="@+id/next_btn"
+        style="@style/Submit_Text_Button"
+        android:layout_width="0dp"
         android:layout_height="50dp"
-        android:id="@+id/cancel_btn"
-        android:text="@string/Uwazi_Submit_Later"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:layout_marginStart="@dimen/activity_horizontal_large_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
+        android:layout_marginBottom="18dp"
         android:background="@drawable/action_button_background"
-        android:backgroundTint="@color/wa_white_20"
+        android:text="@string/Reports_Pause"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_large_margin"
-        />
+        app:layout_constraintStart_toStartOf="parent" />
 
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
diff --git a/mobile/src/main/res/layout/fragment_upload_files.xml b/mobile/src/main/res/layout/fragment_upload_files.xml
index 19be7b0ff..e19255272 100644
--- a/mobile/src/main/res/layout/fragment_upload_files.xml
+++ b/mobile/src/main/res/layout/fragment_upload_files.xml
@@ -27,24 +27,30 @@
         app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
         app:layout_constraintTop_toTopOf="parent"
         app:popupTheme="@style/AppTheme.PopupOverlay"
-        app:rightIcon="@drawable/ic_delete_white_24px"
-        app:rightIconContentDescription="@string/action_delete"
-        app:startTitle="@string/receiving_and_encrypting_files" />
+        app:startTitle="@string/sending_files" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/next_btn"
-        style="@style/Submit_Text_Button"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
+
+    <Button
+        android:id="@+id/cancel"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="38dp"
+        android:layout_gravity="center"
+        android:background="@drawable/cancel_button_background"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:text="@string/action_cancel"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textColor="@color/wa_white"
+        android:textSize="17sp"
         android:layout_marginStart="@dimen/activity_horizontal_large_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
         android:layout_marginBottom="18dp"
-        android:background="@drawable/action_button_background"
-        android:text="@string/Reports_Pause"
-        android:textStyle="bold"
+
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        />
 
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index a68756270..939dae8ca 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -130,6 +130,16 @@
         android:id="@+id/waitingSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.WaitingSenderFragment"
         tools:layout="@layout/fragment_waiting"
-        android:label="WaitingSenderFragment" />
+        android:label="WaitingSenderFragment" >
+        <action
+            android:id="@+id/action_waitingSenderFragment_to_uploadFilesFragment"
+            app:destination="@id/uploadFilesFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/uploadFilesFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.UploadFilesFragment"
+        tools:layout="@layout/fragment_upload_files"
+        android:label="UploadFilesFragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index bd0a26dd8..cefc0ca6a 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1052,5 +1052,6 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
   <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
   <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
+  <string name="sending_files">Sending files</string>
   <string name="send_files_title">Send files</string>
 </resources>

From 5997358b63fe7ca0ee7beef7ab650d1cbbdf5dd8 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 10 Jul 2025 17:56:06 +0100
Subject: [PATCH 062/153] WIP unify client/server state

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  9 +--
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 21 +++---
 .../managers/PeerServerStarterManager.kt      |  6 +-
 .../data/peertopeer/model/P2PFileStatus.kt    |  8 +++
 .../data/peertopeer/model/P2PServerState.kt   | 66 -------------------
 .../data/peertopeer/model/P2PSession.kt       | 13 ++++
 .../data/peertopeer/model/P2PSharedState.kt   | 13 ++++
 .../data/peertopeer/model/ProgressFile.kt     | 11 ++++
 .../data/peertopeer/model/SessionStatus.kt    |  8 +++
 .../entity/peertopeer/PeerToPeerInstance.kt   |  3 -
 .../fragment/peertopeer/PeerSessionManager.kt | 29 --------
 .../peertopeer/PeerToPeerViewModel.kt         | 14 ++--
 .../fragment/peertopeer/SenderViewModel.kt    | 17 ++---
 .../fragment/peertopeer/di/PeerModule.kt      |  6 +-
 .../receipentflow/QRCodeFragment.kt           | 11 +++-
 .../RecipientVerificationFragment.kt          |  9 +--
 .../receipentflow/ShowDeviceInfoFragment.kt   | 19 +++---
 .../senderflow/PrepareUploadFragment.kt       | 10 +--
 .../senderflow/ScanQrCodeFragment.kt          |  4 ++
 .../SenderManualConnectionFragment.kt         | 22 +------
 .../senderflow/SenderVerificationFragment.kt  | 20 ++----
 .../uwazi/widgets/PeerToPeerEndView.java      |  3 +-
 .../hzontal/shared_ui/buttons/RoundButton.kt  |  1 +
 .../main/res/layout/layout_round_button.xml   |  1 +
 24 files changed, 125 insertions(+), 199 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 54c0dadc6..92ae3c4a9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -19,7 +19,6 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerSessionManager
 import org.json.JSONObject
 import timber.log.Timber
 import java.security.SecureRandom
@@ -27,11 +26,13 @@ import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
 import java.util.UUID
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
-class TellaPeerToPeerClient {
+class TellaPeerToPeerClient @Inject constructor(){
+
 
     private fun getClientWithFingerprintValidation(expectedFingerprint: String): OkHttpClient {
         val trustManager = object : X509TrustManager {
@@ -83,7 +84,7 @@ class TellaPeerToPeerClient {
 
         return@withContext try {
             client.newCall(request).execute().use { response ->
-                val body = response.body?.string().orEmpty()
+                val body = response.body.string().orEmpty()
 
                 if (response.isSuccessful) {
                     return@use parseSessionIdFromResponse(body)
@@ -178,7 +179,7 @@ class TellaPeerToPeerClient {
             val response = Json.decodeFromString<PeerPrepareUploadResponse>(body)
 
             response.files.forEach {
-                PeerSessionManager.saveTransmissionId(it.id, it.transmissionId)
+             //   PeerSessionManager.saveTransmissionId(it.id, it.transmissionId)
             }
 
             PrepareUploadResult.Success(response.files)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 9642664c5..60f92cf22 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -21,9 +21,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
-import org.horizontal.tella.mobile.data.peertopeer.model.ReceivingFile
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
@@ -48,7 +48,7 @@ class TellaPeerToPeerServer(
     private val certificate: X509Certificate,
     private val keyStoreConfig: KeyStoreConfig,
     private val peerToPeerManager: PeerToPeerManager,
-    private val p2PServerState: P2PServerState
+    private val p2PSharedState: P2PSharedState
 ) : TellaServer {
     private var serverSession: PeerResponse? = null
     private var engine: ApplicationEngine? = null
@@ -89,9 +89,8 @@ class TellaPeerToPeerServer(
                     }
 
                     post(PeerApiRoutes.PING) {
-                        val hash = CertificateUtils.getPublicKeyHash(certificate)
                         CoroutineScope(Dispatchers.IO).launch {
-                            peerToPeerManager.notifyClientConnected(hash)
+                            peerToPeerManager.notifyClientConnected(p2PSharedState.hash)
                         }
                         call.respondText("pong", status = HttpStatusCode.OK)
                     }
@@ -140,10 +139,6 @@ class TellaPeerToPeerServer(
                         }
 
                         launch {
-                            p2PServerState.apply {
-                                pin = this@TellaPeerToPeerServer.pin
-
-                            }
                             PeerEventManager.emitRegistrationSuccess()
                         }
 
@@ -173,13 +168,13 @@ class TellaPeerToPeerServer(
                                 call.respond(HttpStatusCode.InternalServerError, "Missing session")
                                 return@post
                             }
-
-                            val session = P2PSession(sessionId = sessionId, title = request.title)
+                            p2PSharedState.sessionId = sessionId
+                            val session = P2PSession(title = request.title)
 
 
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
-                                val receivingFile = ReceivingFile(
+                                val receivingFile = ProgressFile(
                                     file = file,
                                     transmissionId = transmissionId
                                 )
@@ -191,7 +186,7 @@ class TellaPeerToPeerServer(
                                 )
                             }
 
-                            p2PServerState.session = session
+                            p2PSharedState.session = session
 
                             call.respond(
                                 HttpStatusCode.OK,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 6449bc74f..3dc6c0b53 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerServer
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import java.security.KeyPair
 import java.security.cert.X509Certificate
@@ -23,7 +23,7 @@ class PeerServerStarterManager @Inject constructor(
         pin: String,
         cert: X509Certificate,
         config: KeyStoreConfig,
-        p2PServerState: P2PServerState,
+        p2PSharedState: P2PSharedState,
     ) {
         if (server == null) {
             server = TellaPeerToPeerServer(
@@ -33,7 +33,7 @@ class PeerServerStarterManager @Inject constructor(
                 certificate = cert,
                 keyStoreConfig = config,
                 peerToPeerManager = peerToPeerManager,
-                p2PServerState = p2PServerState
+                p2PSharedState = p2PSharedState
             )
             server?.start()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
new file mode 100644
index 000000000..1a3f7d1c2
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+enum class P2PFileStatus {
+    QUEUE,
+    SENDING,
+    FAILED,
+    FINISHED
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
deleted file mode 100644
index 2d5c0ca4a..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PServerState.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.horizontal.tella.mobile.data.peertopeer.model
-
-import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
-
-// --- ENUMS ---
-
-enum class P2PFileStatus {
-    QUEUE,
-    SENDING,
-    FAILED,
-    FINISHED
-}
-
-enum class SessionStatus {
-    WAITING,
-    SENDING,
-    FINISHED,
-    FINISHED_WITH_ERRORS
-}
-
-data class ReceivingFile(
-    var file: P2PFile,
-    var status: P2PFileStatus = P2PFileStatus.QUEUE,
-    var transmissionId: String? = null,
-    var path: String? = null,
-    var bytesReceived: Int = 0
-)
-
-class P2PSession(
-    var sessionId: String,
-    var status: SessionStatus = SessionStatus.WAITING,
-    var files: MutableMap<String, ReceivingFile> = mutableMapOf(),
-    var title: String? = null
-) {
-    val isActive: Boolean
-        get() = status == SessionStatus.WAITING || status == SessionStatus.SENDING
-
-    val hasFiles: Boolean
-        get() = files.isNotEmpty()
-}
-
-class P2PServerState(
-    var pin: String? = null,
-    var session: P2PSession? = null,
-    private var failedAttempts: Int = 0,
-    //TODO ASK DHEKRA ABOIUT THIS
-    private var isUsingManualConnection: Boolean = false
-) {
-    private val maxFailedAttempts = 3
-
-    val hasReachedMaxAttempts: Boolean
-        get() = failedAttempts >= maxFailedAttempts
-
-    fun incrementFailedAttempts() {
-        failedAttempts++
-    }
-
-    fun reset() {
-        pin = null
-        session = null
-        failedAttempts = 0
-        isUsingManualConnection = false
-    }
-
-    fun getFailedAttempts(): Int = failedAttempts
-}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
new file mode 100644
index 000000000..cbc81b86d
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
@@ -0,0 +1,13 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+class P2PSession(
+    var status: SessionStatus = SessionStatus.WAITING,
+    var files: MutableMap<String, ProgressFile> = mutableMapOf(),
+    var title: String? = null
+) {
+    val isActive: Boolean
+        get() = status == SessionStatus.WAITING || status == SessionStatus.SENDING
+
+    val hasFiles: Boolean
+        get() = files.isNotEmpty()
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
new file mode 100644
index 000000000..2374fcf46
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -0,0 +1,13 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+class P2PSharedState(
+    var ip: String = "",
+    var port: String = "",
+    var sessionId: String = "",
+    //THE HASH IS THE SAME EXPECTED FINGER PRINT
+    var hash: String = "",
+    var pin: String? = null,
+    var session: P2PSession? = null,
+    var failedAttempts: Int = 0,
+    var isUsingManualConnection: Boolean = false
+)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
new file mode 100644
index 000000000..760eff5a9
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
@@ -0,0 +1,11 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
+
+data class ProgressFile(
+    var file: P2PFile,
+    var status: P2PFileStatus = P2PFileStatus.QUEUE,
+    var transmissionId: String? = null,
+    var path: String? = null,
+    var bytesTransferred: Int = 0
+)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
new file mode 100644
index 000000000..dd048ae37
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.data.peertopeer.model
+
+enum class SessionStatus {
+    WAITING,
+    SENDING,
+    FINISHED,
+    FINISHED_WITH_ERRORS
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
index 2312e005a..18d539ed8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/PeerToPeerInstance.kt
@@ -5,12 +5,9 @@ import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
 
 class PeerToPeerInstance(
-    var id: Long = -1,
-    var updated: Long = 0,
     var status: EntityStatus = EntityStatus.UNKNOWN,
     var widgetMediaFiles: List<FormMediaFile> = mutableListOf(),
     var formPartStatus: FormMediaFileStatus = FormMediaFileStatus.UNKNOWN,
     var title: String = "",
-    var current: Long = 0,
     var sessionID: String = ""
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
deleted file mode 100644
index 9e6b6b346..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerSessionManager.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
-
-//TODO CHECK IF WE SHOULD REMOVE THIS
-data class PeerConnectionInfo(
-    val ip: String = "",
-    val port: String = "",
-    val expectedFingerprint: String = "",
-    val sessionId: String = "",
-    val hash: String = "",
-    val pin: Int = 0,
-)
-
-object PeerSessionManager {
-    private var connectionInfo: PeerConnectionInfo? = null
-
-    fun saveConnectionInfo(
-        ip: String,
-        port: String,
-        expectedFingerprint: String,
-        sessionId: String
-    ) {
-        connectionInfo = PeerConnectionInfo(ip, port, expectedFingerprint, sessionId)
-    }
-
-    fun getConnectionInfo(): PeerConnectionInfo? = connectionInfo
-
-    fun isSessionValid(): Boolean = connectionInfo != null
-
-}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 1fd34f1ce..29a63c125 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -16,6 +16,7 @@ import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
@@ -29,7 +30,8 @@ import javax.inject.Inject
 class PeerToPeerViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
     private val peerClient: TellaPeerToPeerClient,
-    peerToPeerManager: PeerToPeerManager
+    peerToPeerManager: PeerToPeerManager,
+    val p2PState: P2PSharedState
 ) : ViewModel() {
 
     var isManualConnection: Boolean = true // default is manual
@@ -41,8 +43,6 @@ class PeerToPeerViewModel @Inject constructor(
     val getHashSuccess: LiveData<String> get() = _getHashSuccess
     private val _getHashError = MutableLiveData<Throwable>()
     val getHashError: LiveData<Throwable> get() = _getHashError
-    private val _sessionInfo = MutableStateFlow<PeerConnectionInfo?>(null)
-    val sessionInfo: StateFlow<PeerConnectionInfo?> = _sessionInfo
     val clientHash = peerToPeerManager.clientConnected
     private val _registrationServerSuccess = MutableLiveData<Boolean>()
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
@@ -102,7 +102,10 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
-                    PeerSessionManager.saveConnectionInfo(ip, port, hash, result.sessionId)
+                    with(p2PState) {
+                        this.sessionId = result.sessionId
+                    }
+
                     _registrationSuccess.postValue(true)
                 }
 
@@ -178,7 +181,4 @@ class PeerToPeerViewModel @Inject constructor(
 
     }
 
-    fun setPeerSessionInfo(info: PeerConnectionInfo) {
-        _sessionInfo.value = info
-    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index a7a4db0bb..6f23a20ff 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
@@ -27,7 +28,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SenderViewModel @Inject constructor(
-    private val peerClient: TellaPeerToPeerClient
+    private val peerClient: TellaPeerToPeerClient,
+    var p2PSharedState: P2PSharedState
 ) : ViewModel() {
     private val _prepareResults = MutableLiveData<PeerPrepareUploadResponse>()
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
@@ -79,22 +81,17 @@ class SenderViewModel @Inject constructor(
         files: List<VaultFile>,
         title: String = "Title of the report"
     ) {
-        val info = PeerSessionManager.getConnectionInfo() ?: run {
-            Timber.e("Connection info missing")
-            return
-        }
 
         viewModelScope.launch {
             when (val result = peerClient.prepareUpload(
-                ip = info.ip,
-                port = info.port,
-                expectedFingerprint = info.expectedFingerprint,
+                ip = p2PSharedState.ip,
+                port = p2PSharedState.port,
                 title = title,
                 files = files,
-                sessionId = info.sessionId
+                sessionId = p2PSharedState.sessionId
             )) {
                 is PrepareUploadResult.Success -> {
-                    peerToPeerInstance?.sessionID = info.sessionId
+                    peerToPeerInstance?.sessionID = p2PSharedState.sessionId
                     val fileInfoMap = result.transmissions.associateBy { it.id }
 
                     peerToPeerInstance?.widgetMediaFiles?.forEach { mediaFile ->
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index aaee843b1..b2c19475e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -6,7 +6,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import javax.inject.Singleton
 
 @Module
@@ -27,7 +27,7 @@ object PeerModule {
 
     @Provides
     @Singleton
-    fun provideP2PServerState(): P2PServerState {
-        return P2PServerState()
+    fun provideP2PServerState(): P2PSharedState {
+        return P2PSharedState()
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 0f0823a53..2cc88d231 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -13,7 +13,7 @@ import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PServerState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.port
 import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
@@ -36,7 +36,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     lateinit var peerToPeerManager: PeerToPeerManager
 
     @Inject
-    lateinit var p2PServerState: P2PServerState
+    lateinit var p2PSharedState: P2PSharedState
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -72,13 +72,18 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         val pin = (100000..999999).random()
         val port = port
 
+        p2PSharedState.pin = pin.toString()
+        p2PSharedState.port = port.toString()
+        p2PSharedState.hash = certHash
+        p2PSharedState.ip = ip
+
         peerServerStarterManager.startServer(
             ip,
             keyPair,
             pin.toString(),
             certificate,
             config,
-            p2PServerState
+            p2PSharedState
         )
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 9234e6a34..07b61e60b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -50,12 +50,9 @@ class RecipientVerificationFragment :
     }
 
     private fun initObservers() {
-        lifecycleScope.launchWhenStarted {
-            viewModel.sessionInfo.collect { session ->
-                binding.hashContentTextView.text = session?.hash?.formatHash()
-            }
-        }
-        viewModel.isManualConnection = true
+        binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
+
+        viewModel.p2PState.isUsingManualConnection = true
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 559e8872e..2efe8c854 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -9,7 +9,6 @@ import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.databinding.ShowDeviceInfoLayoutBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 
 class ShowDeviceInfoFragment :
@@ -42,15 +41,13 @@ class ShowDeviceInfoFragment :
 
     private fun initObservers() {
         lifecycleScope.launch {
-            viewModel.clientHash.collect { hash ->
-                viewModel.setPeerSessionInfo(
-                    PeerConnectionInfo(
-                        ip = payload?.ipAddress.toString(),
-                        port = payload?.port.toString(),
-                        pin = payload?.pin?.toInt()!!,
-                        hash = hash
-                    )
-                )
+            viewModel.clientHash.collect { clientHash ->
+                with(viewModel.p2PState) {
+                    ip = payload?.ipAddress.toString()
+                    port = payload?.port.toString()
+                    pin = payload?.pin
+                    hash = clientHash
+                }
                 navManager().navigateFromDeviceInfoScreenTRecipientVerificationScreen()
             }
         }
@@ -58,7 +55,7 @@ class ShowDeviceInfoFragment :
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-            //    bundle.putBoolean("isSender", false)
+                //    bundle.putBoolean("isSender", false)
                 navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 574c2f6d9..279b28307 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -254,11 +254,11 @@ class PrepareUploadFragment :
                 val selectedFiles = filesRecyclerViewAdapter.getFiles()
                 if (selectedFiles.isNotEmpty()) {
                     // Fill the PeerToPeerInstance in the ViewModel
-                    viewModel.peerToPeerInstance = PeerToPeerInstance(
-                        updated = System.currentTimeMillis(),
-                        widgetMediaFiles = viewModel.vaultFilesToMediaFiles(selectedFiles),
-                        title = binding.reportTitleEt.text.toString()
-                    )
+                    /*  viewModel.peerToPeerInstance = PeerToPeerInstance(
+                          updated = System.currentTimeMillis(),
+                          widgetMediaFiles = viewModel.vaultFilesToMediaFiles(selectedFiles),
+                          title = binding.reportTitleEt.text.toString()
+                      )*/
 
                     // Optional: add to bundle if still needed elsewhere
                     bundle.putSerializable("selectedFiles", ArrayList(selectedFiles))
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 6691a6461..7626a6864 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -60,6 +60,10 @@ class ScanQrCodeFragment :
                     try {
                         val payload = Gson().fromJson(qrContent, PeerConnectionPayload::class.java)
 
+                        viewModel.p2PState.pin = payload.pin
+                        viewModel.p2PState.port = payload.port.toString()
+                        viewModel.p2PState.hash = payload.certificateHash
+                        viewModel.p2PState.ip = payload.ipAddress
                         viewModel.startRegistration(
                             ip = payload.ipAddress,
                             port = payload.port.toString(),
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index e16e51cce..e9bbbe3a5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -7,10 +7,10 @@ import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 
+//TODO SHOW ERRORS IN THE BOTTOM
 class SenderManualConnectionFragment :
     BaseBindingFragment<SenderManualConnectionBinding>(SenderManualConnectionBinding::inflate) {
 
@@ -70,17 +70,6 @@ class SenderManualConnectionFragment :
         binding.toolbar.backClickListener = { nav().popBackStack() }
         binding.backBtn.setOnClickListener { nav().popBackStack() }
         binding.nextBtn.setOnClickListener {
-            val ip = binding.ipAddress.text.toString()
-            val pin = binding.pin.text.toString()
-            val port = binding.port.text.toString()
-            viewModel.setPeerSessionInfo(
-                PeerConnectionInfo(
-                    ip = ip,
-                    port = port,
-                    pin = pin.toInt()
-                )
-            ) // Store values
-
             viewModel.handleCertificate(
                 ip = binding.ipAddress.text.toString(),
                 port = binding.port.text.toString(),
@@ -92,15 +81,6 @@ class SenderManualConnectionFragment :
     private fun initObservers() {
         viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
             bundle.putString("payload", hash)
-            viewModel.setPeerSessionInfo(
-                PeerConnectionInfo(
-                    ip = binding.ipAddress.text.toString(),
-                    port = binding.port.text.toString(),
-                    pin = binding.pin.text.toString().toInt(),
-                    hash = hash
-                )
-            )
-
             navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index f5b2b9dc0..47cf3f36b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -9,14 +9,12 @@ import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterMan
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerConnectionInfo
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import javax.inject.Inject
 
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
-    private lateinit var peerConnectionInfo: PeerConnectionInfo
 
     @Inject
     lateinit var peerServerStarterManager: PeerServerStarterManager
@@ -36,21 +34,15 @@ class SenderVerificationFragment :
     }
 
     private fun initListeners() {
-        lifecycleScope.launchWhenStarted {
-            viewModel.sessionInfo.collect { session ->
-                if (session != null) {
-                    peerConnectionInfo = session
-                }
-                binding.hashContentTextView.text = session?.hash?.formatHash()
-            }
-        }
+
+        binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
 
         binding.confirmAndConnectBtn.setOnClickListener {
             viewModel.startRegistration(
-                ip = peerConnectionInfo.ip,
-                port = peerConnectionInfo.port,
-                hash = peerConnectionInfo.hash,
-                pin = peerConnectionInfo.pin.toString()
+                ip = viewModel.p2PState.ip,
+                port = viewModel.p2PState.port,
+                hash = viewModel.p2PState.hash,
+                pin = viewModel.p2PState.pin.toString()
             )
         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index 8521e7378..4a5205929 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -126,7 +126,8 @@ void setFormSizeLabel(@NonNull PeerToPeerInstance instance, int percent) {
     String getStatusLabel(EntityStatus status) {
         String title = "";
         if (status == EntityStatus.SUBMITTED) {
-            title = getResources().getString(R.string.File_Uploaded_on) + " " + Util.getDateTimeString(instance.getUpdated());
+            title = "";
+            //getResources().getString(R.string.File_Uploaded_on) + " " + Util.getDateTimeString(instance.getUpdated());
         } else if (status == EntityStatus.PAUSED) {
             title = getResources().getString(R.string.Paused_Report);
         } else if (status == EntityStatus.FINALIZED || instance.getStatus() == EntityStatus.SUBMISSION_PENDING || instance.getStatus() == EntityStatus.SUBMISSION_ERROR) {
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
index 075bc0200..a7c654873 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
@@ -128,6 +128,7 @@ class RoundButton @JvmOverloads constructor(
         else ContextCompat.getDrawable(context, R.drawable.bg_information_button)
     }
 
+    //TODO FIX TEXT ALLCAPS EVERY WHERE
     private fun setTextCaps(isTextAllCaps: Boolean) {
         binding.sheetTextView.isAllCaps = isTextAllCaps
     }
diff --git a/shared-ui/src/main/res/layout/layout_round_button.xml b/shared-ui/src/main/res/layout/layout_round_button.xml
index 78b3fe12b..d1adb1530 100644
--- a/shared-ui/src/main/res/layout/layout_round_button.xml
+++ b/shared-ui/src/main/res/layout/layout_round_button.xml
@@ -20,6 +20,7 @@
         android:textColor="@color/wa_white"
         android:fontFamily="@font/open_sans"
         android:textSize="18sp"
+        android:textAllCaps="true"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 0ab3c7c92a7d6381b30525ecabf9ae596f8a7195 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 11 Jul 2025 14:41:12 +0100
Subject: [PATCH 063/153] wip fix state

---
 .../mobile/data/peertopeer/model/P2PSharedState.kt | 14 +++++++++++++-
 .../fragment/peertopeer/PeerToPeerViewModel.kt     |  5 +++++
 .../views/fragment/peertopeer/SenderViewModel.kt   |  5 +++++
 .../receipentflow/ShowDeviceInfoFragment.kt        |  6 +++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index 2374fcf46..dca849d6b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -10,4 +10,16 @@ class P2PSharedState(
     var session: P2PSession? = null,
     var failedAttempts: Int = 0,
     var isUsingManualConnection: Boolean = false
-)
+) {
+
+    fun clear() {
+        ip = ""
+        port = ""
+        sessionId = ""
+        hash = ""
+        pin = null
+        session = null
+        failedAttempts = 0
+        isUsingManualConnection = false
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 29a63c125..92e8f8712 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -181,4 +181,9 @@ class PeerToPeerViewModel @Inject constructor(
 
     }
 
+    override fun onCleared() {
+        super.onCleared()
+        p2PState.clear()
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 6f23a20ff..197f4ff86 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -86,6 +86,7 @@ class SenderViewModel @Inject constructor(
             when (val result = peerClient.prepareUpload(
                 ip = p2PSharedState.ip,
                 port = p2PSharedState.port,
+                expectedFingerprint = p2PSharedState.hash,
                 title = title,
                 files = files,
                 sessionId = p2PSharedState.sessionId
@@ -132,6 +133,10 @@ class SenderViewModel @Inject constructor(
         }
     }
 
+    override fun onCleared() {
+        super.onCleared()
+        p2PSharedState.clear()
+    }
 
 }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 2efe8c854..152537624 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -29,9 +29,9 @@ class ShowDeviceInfoFragment :
     }
 
     private fun initView() {
-        binding.connectCode.setRightText(payload?.ipAddress)
-        binding.pin.setRightText(payload?.pin)
-        binding.port.setRightText(payload?.port.toString())
+        binding.connectCode.setRightText(viewModel.p2PState.ip)
+        binding.pin.setRightText(viewModel.p2PState.pin)
+        binding.port.setRightText(viewModel.p2PState.port)
     }
 
     private fun initListeners() {

From 74e1a661d01ab593b762e55f15076e3e4e16888f Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 11 Jul 2025 17:57:56 +0100
Subject: [PATCH 064/153] Fix logic with the new state

---
 .../peertopeer/PeerToPeerViewModel.kt         |  3 +-
 .../RecipientVerificationFragment.kt          | 52 ++++++-----
 .../senderflow/ScanQrCodeFragment.kt          |  1 +
 .../SenderManualConnectionFragment.kt         | 86 ++++++++-----------
 4 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 92e8f8712..fad8d7e65 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -70,7 +70,7 @@ class PeerToPeerViewModel @Inject constructor(
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
 
-                if (!isManualConnection) {
+                if (!p2PState.isUsingManualConnection) {
                     // QR-mode: auto-accept immediately
                     PeerEventManager.confirmRegistration(registrationId, true)
                     _registrationSuccess.postValue(true)
@@ -147,6 +147,7 @@ class PeerToPeerViewModel @Inject constructor(
             val result = FingerprintFetcher.fetch(ip, port.toInt())
             result.onSuccess { hash ->
                 Timber.d("hash ***** $hash")
+                p2PState.hash = hash
                 _getHashSuccess.postValue(hash)
 
                 // Notify the server after fetching the hash
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 07b61e60b..c13de8e9e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -19,6 +19,7 @@ import javax.inject.Inject
 
 class RecipientVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
+
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var payload: PeerConnectionPayload? = null
 
@@ -27,58 +28,49 @@ class RecipientVerificationFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         arguments?.getString("payload")?.let { payloadJson ->
             payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
         }
+
         initListeners()
         initObservers()
     }
 
-    private fun initListeners() {
-
-        binding.toolbar.backClickListener = {
-            peerServerStarterManager.stopServer()
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
-
-        binding.discardBtn.setOnClickListener {
-            peerServerStarterManager.stopServer()
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
+    private fun initListeners() = with(binding) {
+        toolbar.backClickListener = { navigateBackAndStopServer() }
+        discardBtn.setOnClickListener { navigateBackAndStopServer() }
 
-        binding.confirmAndConnectBtn.setOnClickListener(null)
+        // Button is disabled until a request is received.
+        confirmAndConnectBtn.setOnClickListener(null)
     }
 
-    private fun initObservers() {
-        binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
-
+    private fun initObservers() = with(binding) {
+        hashContentTextView.text = viewModel.p2PState.hash.formatHash()
         viewModel.p2PState.isUsingManualConnection = true
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
                 viewModel.incomingRequest.collect { request ->
                     if (request != null) {
-                        binding.confirmAndConnectBtn.isEnabled = true
-                        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
-
-                        // Set the click listener when the request is available
-                        binding.confirmAndConnectBtn.setOnClickListener {
+                        confirmAndConnectBtn.isEnabled = true
+                        confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+                        confirmAndConnectBtn.setOnClickListener {
                             viewModel.onUserConfirmedRegistration(request.registrationId)
                         }
-
-                        binding.discardBtn.setOnClickListener {
-                            peerServerStarterManager.stopServer()
-                            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+                        discardBtn.setOnClickListener {
                             viewModel.onUserRejectedRegistration(request.registrationId)
+                            navigateBackAndStopServer()
                         }
                     } else {
-                        binding.confirmAndConnectBtn.isEnabled = false
-                        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange16_btn)
-                        binding.confirmAndConnectBtn.setOnClickListener(null) // Optional: clear listener
+                        confirmAndConnectBtn.isEnabled = false
+                        confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange16_btn)
+                        confirmAndConnectBtn.setOnClickListener(null)
                     }
                 }
             }
         }
+
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
@@ -86,4 +78,8 @@ class RecipientVerificationFragment :
         }
     }
 
-}
\ No newline at end of file
+    private fun navigateBackAndStopServer() {
+        peerServerStarterManager.stopServer()
+        navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 7626a6864..ec29dd40d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -64,6 +64,7 @@ class ScanQrCodeFragment :
                         viewModel.p2PState.port = payload.port.toString()
                         viewModel.p2PState.hash = payload.certificateHash
                         viewModel.p2PState.ip = payload.ipAddress
+
                         viewModel.startRegistration(
                             ip = payload.ipAddress,
                             port = payload.port.toString(),
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index e9bbbe3a5..f7663304d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -10,7 +10,7 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 
-//TODO SHOW ERRORS IN THE BOTTOM
+// TODO: Show errors in the bottom sheet
 class SenderManualConnectionFragment :
     BaseBindingFragment<SenderManualConnectionBinding>(SenderManualConnectionBinding::inflate) {
 
@@ -18,63 +18,36 @@ class SenderManualConnectionFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        initListeners()
         initView()
+        initListeners()
+        initObservers()
     }
 
-    private fun initView() {
-        binding.ipAddress.onChange {
-            updateNextButtonState()
-        }
-        binding.pin.onChange {
-            updateNextButtonState()
-        }
-
-        binding.port.onChange {
-            updateNextButtonState()
-        }
-
-        initObservers()
+    private fun initView() = with(binding) {
+        ipAddress.onChange { updateNextButtonState() }
+        pin.onChange { updateNextButtonState() }
+        port.onChange { updateNextButtonState() }
 
         updateNextButtonState()
-
-        KeyboardUtil(binding.root)
-
+        KeyboardUtil(root)
     }
 
-    private fun initListeners() {
-        binding.backBtn.setOnClickListener {
-            nav().popBackStack()
-        }
-
-        binding.nextBtn.setOnClickListener {
+    private fun initListeners() = with(binding) {
+        backBtn.setOnClickListener { nav().popBackStack() }
+        toolbar.backClickListener = { nav().popBackStack() }
 
-        }
-    }
+        nextBtn.setOnClickListener {
+            val ip = ipAddress.text.toString()
+            val port = port.text.toString()
+            val pin = this.pin.text.toString()
 
-    private fun isInputValid(): Boolean {
-        return binding.ipAddress.text?.isNotBlank() == true &&
-                binding.pin.text?.isNotBlank() == true
-    }
+            viewModel.p2PState.apply {
+                this.ip = ip
+                this.port = port
+                this.pin = pin
+            }
 
-    private fun updateNextButtonState() {
-        val enabled = isInputValid()
-        binding.nextBtn.isEnabled = enabled
-        binding.nextBtn.setTextColor(
-            ContextCompat.getColor(
-                baseActivity,
-                if (enabled) android.R.color.white else android.R.color.darker_gray
-            )
-        )
-        binding.toolbar.backClickListener = { nav().popBackStack() }
-        binding.backBtn.setOnClickListener { nav().popBackStack() }
-        binding.nextBtn.setOnClickListener {
-            viewModel.handleCertificate(
-                ip = binding.ipAddress.text.toString(),
-                port = binding.port.text.toString(),
-                pin = binding.pin.text.toString()
-            )
+            viewModel.handleCertificate(ip, port, pin)
         }
     }
 
@@ -89,4 +62,19 @@ class SenderManualConnectionFragment :
         }
     }
 
-}
\ No newline at end of file
+    private fun isInputValid(): Boolean = with(binding) {
+        ipAddress.text?.isNotBlank() == true &&
+                pin.text?.isNotBlank() == true
+    }
+
+    private fun updateNextButtonState() = with(binding) {
+        val enabled = isInputValid()
+        nextBtn.isEnabled = enabled
+        nextBtn.setTextColor(
+            ContextCompat.getColor(
+                baseActivity,
+                if (enabled) android.R.color.white else android.R.color.darker_gray
+            )
+        )
+    }
+}

From 3d96b7b9d08cdb0c6d8201805043c0ec776412af Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 11 Jul 2025 20:30:10 +0100
Subject: [PATCH 065/153] WIP send files flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  3 +-
 .../data/peertopeer/model/P2PSession.kt       | 10 ++----
 .../data/peertopeer/model/P2PSharedState.kt   |  2 +-
 .../data/peertopeer/model/ProgressFile.kt     |  2 ++
 .../fragment/peertopeer/di/PeerModule.kt      | 13 +++++--
 .../senderflow/PrepareUploadFragment.kt       | 34 ++++++++++++++-----
 .../senderflow/WaitingSenderFragment.kt       | 11 ++++--
 7 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 60f92cf22..ef2b4b67e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -21,8 +21,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
@@ -171,7 +171,6 @@ class TellaPeerToPeerServer(
                             p2PSharedState.sessionId = sessionId
                             val session = P2PSession(title = request.title)
 
-
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
                                 val receivingFile = ProgressFile(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
index cbc81b86d..3208c63df 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
@@ -1,13 +1,7 @@
 package org.horizontal.tella.mobile.data.peertopeer.model
 
-class P2PSession(
+data class P2PSession(
     var status: SessionStatus = SessionStatus.WAITING,
     var files: MutableMap<String, ProgressFile> = mutableMapOf(),
     var title: String? = null
-) {
-    val isActive: Boolean
-        get() = status == SessionStatus.WAITING || status == SessionStatus.SENDING
-
-    val hasFiles: Boolean
-        get() = files.isNotEmpty()
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index dca849d6b..05d3a318a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -9,7 +9,7 @@ class P2PSharedState(
     var pin: String? = null,
     var session: P2PSession? = null,
     var failedAttempts: Int = 0,
-    var isUsingManualConnection: Boolean = false
+    var isUsingManualConnection: Boolean = false,
 ) {
 
     fun clear() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
index 760eff5a9..6c6a83f67 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/ProgressFile.kt
@@ -1,9 +1,11 @@
 package org.horizontal.tella.mobile.data.peertopeer.model
 
+import com.hzontal.tella_vault.VaultFile
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 
 data class ProgressFile(
     var file: P2PFile,
+    var vaultFile : VaultFile? = null,
     var status: P2PFileStatus = P2PFileStatus.QUEUE,
     var transmissionId: String? = null,
     var path: String? = null,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index b2c19475e..8e78991c6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -6,6 +6,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import javax.inject.Singleton
 
@@ -27,7 +28,15 @@ object PeerModule {
 
     @Provides
     @Singleton
-    fun provideP2PServerState(): P2PSharedState {
-        return P2PSharedState()
+    fun provideSession(): P2PSession {
+        return P2PSession()
+    }
+
+    @Provides
+    @Singleton
+    fun provideP2PServerState(p2PSession: P2PSession): P2PSharedState {
+        val p2PSharedState = P2PSharedState()
+        p2PSharedState.session = p2PSession
+        return p2PSharedState
     }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 279b28307..78c07fd9d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -18,8 +18,12 @@ import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.bus.EventObserver
 import org.horizontal.tella.mobile.bus.event.AudioRecordEvent
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
 import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
+import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.activity.camera.CameraActivity
@@ -252,16 +256,29 @@ class PrepareUploadFragment :
         binding.sendReportBtn.setOnClickListener {
             if (isSubmitEnabled) {
                 val selectedFiles = filesRecyclerViewAdapter.getFiles()
+
                 if (selectedFiles.isNotEmpty()) {
-                    // Fill the PeerToPeerInstance in the ViewModel
-                    /*  viewModel.peerToPeerInstance = PeerToPeerInstance(
-                          updated = System.currentTimeMillis(),
-                          widgetMediaFiles = viewModel.vaultFilesToMediaFiles(selectedFiles),
-                          title = binding.reportTitleEt.text.toString()
-                      )*/
+                    val session = viewModel.p2PSharedState.session ?: P2PSession().also {
+                        viewModel.p2PSharedState.session = it
+                    }
 
-                    // Optional: add to bundle if still needed elsewhere
-                    bundle.putSerializable("selectedFiles", ArrayList(selectedFiles))
+                    selectedFiles.forEach { vaultFile ->
+                        val p2pFile = P2PFile(
+                            id = vaultFile.id,
+                            fileName = vaultFile.name,
+                            size = vaultFile.size,
+                            fileType = vaultFile.mimeType ?: "application/octet-stream",
+                            sha256 = vaultFile.hash
+                        )
+
+                        val progressFile = ProgressFile(
+                            file = p2pFile,
+                            vaultFile = vaultFile,
+                            status = P2PFileStatus.QUEUE
+                        )
+
+                        session.files[vaultFile.id] = progressFile
+                    }
 
                     // Navigate
                     navManager().navigateFromPrepareUploadFragmentToWaitingSenderFragment()
@@ -275,6 +292,7 @@ class PrepareUploadFragment :
     }
 
 
+
     private fun showSubmitReportErrorSnackBar() {
         val errorRes = R.string.Snackbar_Submit_Files_Error
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index a29057b6a..0aeddb0cd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.hzontal.tella_vault.VaultFile
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
@@ -39,9 +40,15 @@ class WaitingSenderFragment :
             }
         }
 
-
         viewModel.prepareResults.observe(viewLifecycleOwner) { response ->
-            navManager().navigateFromWaitingSenderFragmentToUploadFilesFragment()
+            val fileInfos = response.files
+            fileInfos.forEach { fileInfo ->
+                viewModel.p2PSharedState.session?.files?.let { filesMap ->
+                    filesMap[fileInfo.id]?.transmissionId = fileInfo.transmissionId
+                }
+                navManager().navigateFromWaitingSenderFragmentToUploadFilesFragment()
+            }
         }
+
     }
 }
\ No newline at end of file

From 0c76a8c1ff9b9f27cdccf4cb5cffaee82ac2effb Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Sun, 13 Jul 2025 10:30:43 +0100
Subject: [PATCH 066/153] Fix prepare upload flow and response

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  4 ++--
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 12 ++++++----
 .../data/peertopeer/model/P2PSharedState.kt   |  2 +-
 .../peertopeer/PeerPrepareUploadResponse.kt   |  2 +-
 .../fragment/peertopeer/SenderViewModel.kt    | 23 +++++++++++--------
 .../senderflow/PrepareUploadFragment.kt       |  2 +-
 .../senderflow/WaitingSenderFragment.kt       |  5 ++--
 7 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 92ae3c4a9..aba259002 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -84,7 +84,7 @@ class TellaPeerToPeerClient @Inject constructor(){
 
         return@withContext try {
             client.newCall(request).execute().use { response ->
-                val body = response.body.string().orEmpty()
+                val body = response.body.string()
 
                 if (response.isSuccessful) {
                     return@use parseSessionIdFromResponse(body)
@@ -159,7 +159,7 @@ class TellaPeerToPeerClient @Inject constructor(){
                 .build()
 
             client.newCall(request).execute().use { response ->
-                val responseBody = response.body?.string().orEmpty()
+                val responseBody = response.body.string()
 
                 return@withContext if (response.isSuccessful) {
                     parseTransmissionId(responseBody)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index ef2b4b67e..603e2a86e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -19,6 +19,8 @@ import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
@@ -92,7 +94,7 @@ class TellaPeerToPeerServer(
                         CoroutineScope(Dispatchers.IO).launch {
                             peerToPeerManager.notifyClientConnected(p2PSharedState.hash)
                         }
-                        call.respondText("pong", status = HttpStatusCode.OK)
+                        call.respondText("ping", status = HttpStatusCode.OK)
                     }
 
                     post(PeerApiRoutes.REGISTER) {
@@ -187,10 +189,10 @@ class TellaPeerToPeerServer(
 
                             p2PSharedState.session = session
 
-                            call.respond(
-                                HttpStatusCode.OK,
-                                PeerPrepareUploadResponse(files = responseFiles)
-                            )
+                            val responsePayload = PeerPrepareUploadResponse(files = responseFiles)
+                            val json = Json.encodeToString(value = responsePayload)
+                            println("✅ JSON to send: $json") // or Timber.d
+                            call.respond(HttpStatusCode.OK, responsePayload)
                         } else {
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index 05d3a318a..d634c90ad 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -8,7 +8,7 @@ class P2PSharedState(
     var hash: String = "",
     var pin: String? = null,
     var session: P2PSession? = null,
-    var failedAttempts: Int = 0,
+    private var failedAttempts: Int = 0,
     var isUsingManualConnection: Boolean = false,
 ) {
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
index 6ebf9d860..549628dd8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerPrepareUploadResponse.kt
@@ -7,7 +7,7 @@ data class FileInfo(
     val id: String,
     val transmissionId: String
 )
-
+@Serializable
 data class PeerPrepareUploadResponse(
     val files: List<FileInfo>
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
index 197f4ff86..9fe1cf73b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
@@ -77,18 +77,15 @@ class SenderViewModel @Inject constructor(
         return vaultFiles
     }
 
-    fun prepareUploadsFromVaultFiles(
-        files: List<VaultFile>,
-        title: String = "Title of the report"
-    ) {
+    fun prepareUploadsFromVaultFiles() {
 
         viewModelScope.launch {
             when (val result = peerClient.prepareUpload(
                 ip = p2PSharedState.ip,
                 port = p2PSharedState.port,
                 expectedFingerprint = p2PSharedState.hash,
-                title = title,
-                files = files,
+                title = getTitleFromState(),
+                files = getVaultFilesFromState(),
                 sessionId = p2PSharedState.sessionId
             )) {
                 is PrepareUploadResult.Success -> {
@@ -102,9 +99,6 @@ class SenderViewModel @Inject constructor(
                     }
 
                     _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissions))
-
-                    //TODO UNIFY THE INSTANCE EITHER USE PEERTOPEERINSTANCE OR USE PEERSESSIONMANAGER
-                    //TODO UNIFY THE FORMENDVIEW TO USE THE NEW STATE MANAGER ...
                 }
 
                 is PrepareUploadResult.Forbidden -> {
@@ -133,6 +127,17 @@ class SenderViewModel @Inject constructor(
         }
     }
 
+    private fun getVaultFilesFromState(): List<VaultFile> {
+        return p2PSharedState.session?.files
+            ?.values
+            ?.mapNotNull { it.vaultFile }
+            .orEmpty()
+    }
+
+    private fun getTitleFromState(): String {
+        return p2PSharedState.session?.title ?: ""
+    }
+
     override fun onCleared() {
         super.onCleared()
         p2PSharedState.clear()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 78c07fd9d..5deed43ad 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -256,6 +256,7 @@ class PrepareUploadFragment :
         binding.sendReportBtn.setOnClickListener {
             if (isSubmitEnabled) {
                 val selectedFiles = filesRecyclerViewAdapter.getFiles()
+                viewModel.p2PSharedState.session?.title = binding.reportTitleEt.text.toString()
 
                 if (selectedFiles.isNotEmpty()) {
                     val session = viewModel.p2PSharedState.session ?: P2PSession().also {
@@ -292,7 +293,6 @@ class PrepareUploadFragment :
     }
 
 
-
     private fun showSubmitReportErrorSnackBar() {
         val errorRes = R.string.Snackbar_Submit_Files_Error
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index 0aeddb0cd..db6e1a9b5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -22,9 +22,8 @@ class WaitingSenderFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolbar.setStartTextTitle(getString(R.string.send_files))
         binding.waitingText.text = getString(R.string.waiting_for_the_recipient_to_accept_files)
-        val selectedFiles =
-            arguments?.getSerializable("selectedFiles") as? List<VaultFile> ?: emptyList()
-        viewModel.prepareUploadsFromVaultFiles(selectedFiles)
+
+        viewModel.prepareUploadsFromVaultFiles()
         binding.toolbar.backClickListener = {
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }

From 1bc76e2e555dcc3eaa1243e3bbfb46522f4a9c26 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Sun, 13 Jul 2025 13:24:57 +0100
Subject: [PATCH 067/153] prepare files for sender/receiver ui from the state

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 40 +++++++++--------
 .../data/peertopeer/model/P2PSession.kt       |  1 +
 .../data/peertopeer/model/P2PSharedState.kt   |  3 --
 .../domain/peertopeer/PeerEventManager.kt     |  4 --
 .../tella/mobile/util/NavigationManager.kt    |  4 ++
 ...rViewModel.kt => FileTransferViewModel.kt} | 13 +++++-
 .../peertopeer/PeerToPeerViewModel.kt         | 30 ++++++++++++-
 .../receipentflow/RecipientSuccessFragment.kt | 26 ++++-------
 .../RecipientUploadFilesFragment.kt           | 43 +++++++++++++++++++
 .../receipentflow/WaitingReceiverFragment.kt  |  5 ---
 ...agment.kt => SenderUploadFilesFragment.kt} |  4 +-
 .../res/navigation/peer_to_peer_graph.xml     | 38 ++++++++++------
 12 files changed, 142 insertions(+), 69 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{SenderViewModel.kt => FileTransferViewModel.kt} (92%)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/{UploadFilesFragment.kt => SenderUploadFilesFragment.kt} (94%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 603e2a86e..a283a8191 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -165,39 +165,41 @@ class TellaPeerToPeerServer(
                         }
 
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
+
                         if (accepted) {
-                            val sessionId = serverSession?.sessionId ?: run {
+                            val session = p2PSharedState.session ?: run {
                                 call.respond(HttpStatusCode.InternalServerError, "Missing session")
                                 return@post
                             }
-                            p2PSharedState.sessionId = sessionId
-                            val session = P2PSession(title = request.title)
 
+                            // Assign a transmissionId to each matching file
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
-                                val receivingFile = ProgressFile(
-                                    file = file,
-                                    transmissionId = transmissionId
-                                )
-                                session.files[transmissionId] = receivingFile
-
-                                FileInfo(
-                                    id = file.id,
-                                    transmissionId = transmissionId
-                                )
-                            }
 
-                            p2PSharedState.session = session
+                                val progressFile =
+                                    session.files.values.find { it.file.id == file.id }
+
+                                if (progressFile != null) {
+                                    progressFile.transmissionId = transmissionId
+                                } else {
+                                    // Fallback, in case something went wrong with pre-population
+                                    session.files[transmissionId] =
+                                        ProgressFile(file = file, transmissionId = transmissionId)
+                                }
+
+                                FileInfo(id = file.id, transmissionId = transmissionId)
+                            }
 
-                            val responsePayload = PeerPrepareUploadResponse(files = responseFiles)
-                            val json = Json.encodeToString(value = responsePayload)
-                            println("✅ JSON to send: $json") // or Timber.d
-                            call.respond(HttpStatusCode.OK, responsePayload)
+                            call.respond(
+                                HttpStatusCode.OK,
+                                PeerPrepareUploadResponse(files = responseFiles)
+                            )
                         } else {
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
                     }
 
+
                 }
 
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
index 3208c63df..c14abecd6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSession.kt
@@ -1,6 +1,7 @@
 package org.horizontal.tella.mobile.data.peertopeer.model
 
 data class P2PSession(
+    var sessionId: String = "",
     var status: SessionStatus = SessionStatus.WAITING,
     var files: MutableMap<String, ProgressFile> = mutableMapOf(),
     var title: String? = null
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index d634c90ad..8a5052127 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -3,8 +3,6 @@ package org.horizontal.tella.mobile.data.peertopeer.model
 class P2PSharedState(
     var ip: String = "",
     var port: String = "",
-    var sessionId: String = "",
-    //THE HASH IS THE SAME EXPECTED FINGER PRINT
     var hash: String = "",
     var pin: String? = null,
     var session: P2PSession? = null,
@@ -15,7 +13,6 @@ class P2PSharedState(
     fun clear() {
         ip = ""
         port = ""
-        sessionId = ""
         hash = ""
         pin = null
         session = null
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 4f24426a5..632a21f3c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -17,16 +17,12 @@ object PeerEventManager {
 
     private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
 
-
-
     // Call this when registration succeeds
     suspend fun emitRegistrationSuccess() {
         registrationEvents.emit(true)
     }
 
     // we can add emitRegistrationFailure or other event types if needed
-
-
     private val _prepareUploadEvents = MutableSharedFlow<PrepareUploadRequest>(replay = 1)
     val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index dc5d9cd3f..ddb249c4e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -224,6 +224,10 @@ class NavigationManager(
 
     fun navigateFromWaitingSenderFragmentToUploadFilesFragment() {
         navigateToWithBundle(R.id.action_waitingSenderFragment_to_uploadFilesFragment)
+    } 
+
+    fun navigateFromRecipientSuccessFragmentToRecipientUploadFilesFragment() {
+        navigateToWithBundle(R.id.action_recipientSuccessFragment_to_recipientUploadFilesFragment)
     }
 
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
similarity index 92%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
index 9fe1cf73b..b6e27c278 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/SenderViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
@@ -19,6 +19,7 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
 import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
@@ -86,10 +87,10 @@ class SenderViewModel @Inject constructor(
                 expectedFingerprint = p2PSharedState.hash,
                 title = getTitleFromState(),
                 files = getVaultFilesFromState(),
-                sessionId = p2PSharedState.sessionId
+                sessionId = getSessionId()
             )) {
                 is PrepareUploadResult.Success -> {
-                    peerToPeerInstance?.sessionID = p2PSharedState.sessionId
+                    peerToPeerInstance?.sessionID = getSessionId()
                     val fileInfoMap = result.transmissions.associateBy { it.id }
 
                     peerToPeerInstance?.widgetMediaFiles?.forEach { mediaFile ->
@@ -138,11 +139,19 @@ class SenderViewModel @Inject constructor(
         return p2PSharedState.session?.title ?: ""
     }
 
+    private fun getSessionId(): String {
+        return p2PSharedState.session?.sessionId ?: ""
+    }
+
     override fun onCleared() {
         super.onCleared()
         p2PSharedState.clear()
     }
 
+    fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
+        PeerEventManager.resolveUserDecision(sessionId, accepted)
+    }
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index fad8d7e65..3d805e6a4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -17,6 +17,7 @@ import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
@@ -24,6 +25,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import timber.log.Timber
+import java.util.UUID
 import javax.inject.Inject
 
 @HiltViewModel
@@ -56,6 +58,9 @@ class PeerToPeerViewModel @Inject constructor(
     init {
         viewModelScope.launch {
             PeerEventManager.prepareUploadEvents.collect { request ->
+                p2PState.session?.sessionId = request.sessionId
+                p2PState.session?.title = request.title
+                populateFilesFromRequest(request, p2PState)
                 _incomingPrepareRequest.postValue(request)
             }
         }
@@ -103,7 +108,7 @@ class PeerToPeerViewModel @Inject constructor(
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
                     with(p2PState) {
-                        this.sessionId = result.sessionId
+                        this.session?.sessionId = result.sessionId
                     }
 
                     _registrationSuccess.postValue(true)
@@ -172,7 +177,6 @@ class PeerToPeerViewModel @Inject constructor(
     }
 
     fun onUserRejectedRegistration(registrationId: String) {
-        //TODO when the user reject i THINK the client should go back to the
         PeerEventManager.confirmRegistration(registrationId, accepted = false)
     }
 
@@ -182,6 +186,28 @@ class PeerToPeerViewModel @Inject constructor(
 
     }
 
+    fun getSessionId(): String {
+        return p2PState.session?.sessionId ?: ""
+    }
+
+    fun populateFilesFromRequest(request: PrepareUploadRequest, sharedState: P2PSharedState) {
+        val session = sharedState.session ?: return
+
+        session.sessionId = request.sessionId
+        session.title = request.title
+
+        request.files.forEach { p2pFile ->
+            val transmissionId = UUID.randomUUID().toString()
+
+            val progressFile = ProgressFile(
+                file = p2pFile,
+                transmissionId = transmissionId
+            )
+
+            session.files[transmissionId] = progressFile
+        }
+    }
+
     override fun onCleared() {
         super.onCleared()
         p2PState.clear()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 540b268f4..009a86e7d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -8,44 +8,34 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
-import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
  */
-class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate){
+class RecipientSuccessFragment :
+    BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate) {
     private val viewModel: PeerToPeerViewModel by activityViewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         initView()
     }
+
     private fun initView() {
-        val fileCount = arguments?.getInt("fileCount") ?: 0
-        val sessionId = arguments?.getString("sessionId").orEmpty()
 
         with(binding) {
             // Set the dynamic message
-            waitingText.text = getString(R.string.prepare_upload_message, fileCount)
+            waitingText.text =
+                getString(R.string.prepare_upload_message, viewModel.p2PState.session?.files?.size)
 
             // Handle Accept/Reject buttons
             acceptBtn.setOnClickListener {
-             //   onAcceptFilesSelected()
-                viewModel.confirmPrepareUpload(sessionId, true)
-                DialogUtils.showBottomMessage(
-                    baseActivity,
-                    "The receiver accepted the files transfer ",
-                    false,
-                    3000
-                )
+                viewModel.confirmPrepareUpload(viewModel.getSessionId(), true)
+                navManager().navigateFromRecipientSuccessFragmentToRecipientUploadFilesFragment()
             }
 
             rejectBtn.setOnClickListener {
                 //TODO WE MOVE THIS TO THE NAV MANAGER
-                viewModel.confirmPrepareUpload(sessionId, false)
+                viewModel.confirmPrepareUpload(viewModel.getSessionId(), false)
                 // Set result safely via SavedStateHandle
                 findNavController().previousBackStackEntry
                     ?.savedStateHandle
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
new file mode 100644
index 000000000..1c1e8b02a
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -0,0 +1,43 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+
+class RecipientUploadFilesFragment:
+    BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
+
+    private val viewModel: SenderViewModel by activityViewModels()
+    private lateinit var endView: PeerToPeerEndView
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        showFormEndView()
+    }
+
+    private fun showFormEndView() {
+        if (viewModel.peerToPeerInstance == null) {
+            return
+        }
+
+        viewModel.peerToPeerInstance?.let { peerInstance ->
+
+            endView = PeerToPeerEndView(
+                baseActivity,
+                peerInstance.title,
+            )
+            endView.setInstance(
+                peerInstance, MyApplication.isConnectedToInternet(baseActivity), false
+            )
+            binding.endViewContainer.removeAllViews()
+            binding.endViewContainer.addView(endView)
+            endView.clearPartsProgress(peerInstance)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index 990714528..f56629d49 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -40,11 +40,6 @@ class WaitingReceiverFragment :
         viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
             if (request != null && !viewModel.hasNavigatedToSuccessFragment) {
                 viewModel.hasNavigatedToSuccessFragment = true
-
-                val fileCount = request.files.size
-                bundle.putInt("fileCount", fileCount)
-                bundle.putString("sessionId", request.sessionId)
-
                 navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
similarity index 94%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 92b3bcb7e..4fffd1847 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/UploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -9,11 +9,11 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 
-class UploadFilesFragment :
+class SenderUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
     private val viewModel: SenderViewModel by activityViewModels()
-    protected lateinit var endView: PeerToPeerEndView
+    private lateinit var endView: PeerToPeerEndView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 939dae8ca..435a7c09c 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -35,7 +35,7 @@
         android:id="@+id/connectManuallyVerificationFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderVerificationFragment"
         android:label="ConnectManuallyVerificationScreen"
-        tools:layout="@layout/connect_manually_verification" >
+        tools:layout="@layout/connect_manually_verification">
         <action
             android:id="@+id/action_connectManuallyVerificationFragment_to_prepareUploadFragment"
             app:destination="@id/prepareUploadFragment" />
@@ -71,7 +71,7 @@
         android:id="@+id/deviceInfoScreen"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.ShowDeviceInfoFragment"
         android:label="DeviceInfoScreen"
-        tools:layout="@layout/show_device_info_layout" >
+        tools:layout="@layout/show_device_info_layout">
         <action
             android:id="@+id/action_deviceInfoScreen_to_recipientVerificationScreen"
             app:destination="@id/recipientVerificationScreen" />
@@ -88,11 +88,17 @@
             app:destination="@id/waitingReceiverFragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/recipientUploadFilesFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientUploadFilesFragment"
+        android:label="recipientUploadFilesFragment"
+        tools:layout="@layout/fragment_upload_files" />
+
     <fragment
         android:id="@+id/prepareUploadFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PrepareUploadFragment"
         android:label="PrepareUploadFragment"
-        tools:layout="@layout/fragment_prepare_upload" >
+        tools:layout="@layout/fragment_prepare_upload">
         <action
             android:id="@+id/action_prepareUploadFragment_to_waitingSenderFragment"
             app:destination="@id/waitingSenderFragment" />
@@ -110,8 +116,8 @@
     <fragment
         android:id="@+id/waitingReceiverFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.WaitingReceiverFragment"
-        tools:layout="@layout/fragment_waiting"
-        android:label="WaitingReceiverFragment" >
+        android:label="WaitingReceiverFragment"
+        tools:layout="@layout/fragment_waiting">
         <action
             android:id="@+id/action_waitingReceiverFragment_to_recipientSuccessFragment"
             app:destination="@id/recipientSuccessFragment" />
@@ -119,18 +125,22 @@
     <fragment
         android:id="@+id/successConnectFragment"
         android:name="org.horizontal.tella.mobile.views.dialog.uwazi.step6.SuccessConnectFragment"
-        tools:layout="@layout/fragment_success_connect_flow"
-        android:label="SuccessConnectFragment" />
+        android:label="SuccessConnectFragment"
+        tools:layout="@layout/fragment_success_connect_flow" />
     <fragment
         android:id="@+id/recipientSuccessFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientSuccessFragment"
-        tools:layout="@layout/fragment_recipient_success"
-        android:label="RecipientSuccessFragment" />
+        android:label="RecipientSuccessFragment"
+        tools:layout="@layout/fragment_recipient_success">
+        <action
+            android:id="@+id/action_recipientSuccessFragment_to_recipientUploadFilesFragment"
+            app:destination="@id/recipientUploadFilesFragment" />
+    </fragment>
     <fragment
         android:id="@+id/waitingSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.WaitingSenderFragment"
-        tools:layout="@layout/fragment_waiting"
-        android:label="WaitingSenderFragment" >
+        android:label="WaitingSenderFragment"
+        tools:layout="@layout/fragment_waiting">
         <action
             android:id="@+id/action_waitingSenderFragment_to_uploadFilesFragment"
             app:destination="@id/uploadFilesFragment" />
@@ -138,8 +148,8 @@
 
     <fragment
         android:id="@+id/uploadFilesFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.UploadFilesFragment"
-        tools:layout="@layout/fragment_upload_files"
-        android:label="UploadFilesFragment" />
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderVerificationFragment"
+        android:label="UploadFilesFragment"
+        tools:layout="@layout/fragment_upload_files" />
 
 </navigation>
\ No newline at end of file

From 2d84572ebd08a1b909f5d06a7d37bb06dc4a057c Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Sun, 13 Jul 2025 15:45:58 +0100
Subject: [PATCH 068/153] Prepare data to send files

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 39 ++++++++-----------
 .../peertopeer/FileTransferViewModel.kt       |  3 +-
 .../peertopeer/PeerToPeerViewModel.kt         | 16 ++++----
 .../receipentflow/RecipientSuccessFragment.kt | 20 ++++++----
 .../RecipientUploadFilesFragment.kt           |  4 +-
 .../receipentflow/WaitingReceiverFragment.kt  |  5 +++
 .../senderflow/PrepareUploadFragment.kt       |  6 +--
 .../senderflow/SenderUploadFilesFragment.kt   |  4 +-
 .../senderflow/WaitingSenderFragment.kt       |  7 +---
 .../res/navigation/peer_to_peer_graph.xml     |  2 +-
 10 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index a283a8191..4d9fd7002 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -165,41 +165,36 @@ class TellaPeerToPeerServer(
                         }
 
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
-
                         if (accepted) {
-                            val session = p2PSharedState.session ?: run {
+                            val sessionId = serverSession?.sessionId ?: run {
                                 call.respond(HttpStatusCode.InternalServerError, "Missing session")
                                 return@post
                             }
+                            p2PSharedState.session?.sessionId = sessionId
+                            val session = P2PSession(title = request.title)
 
-                            // Assign a transmissionId to each matching file
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
-
-                                val progressFile =
-                                    session.files.values.find { it.file.id == file.id }
-
-                                if (progressFile != null) {
-                                    progressFile.transmissionId = transmissionId
-                                } else {
-                                    // Fallback, in case something went wrong with pre-population
-                                    session.files[transmissionId] =
-                                        ProgressFile(file = file, transmissionId = transmissionId)
-                                }
-
-                                FileInfo(id = file.id, transmissionId = transmissionId)
+                                val receivingFile = ProgressFile(
+                                    file = file,
+                                    transmissionId = transmissionId
+                                )
+                                session.files[transmissionId] = receivingFile
+
+                                FileInfo(
+                                    id = file.id,
+                                    transmissionId = transmissionId
+                                )
                             }
 
-                            call.respond(
-                                HttpStatusCode.OK,
-                                PeerPrepareUploadResponse(files = responseFiles)
-                            )
+                            p2PSharedState.session = session
+
+                            val responsePayload = PeerPrepareUploadResponse(files = responseFiles)
+                            call.respond(HttpStatusCode.OK, responsePayload)
                         } else {
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
                     }
-
-
                 }
 
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
index b6e27c278..fd855f5fc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
@@ -28,7 +28,7 @@ import javax.inject.Inject
 
 
 @HiltViewModel
-class SenderViewModel @Inject constructor(
+class FileTransferViewModel @Inject constructor(
     private val peerClient: TellaPeerToPeerClient,
     var p2PSharedState: P2PSharedState
 ) : ViewModel() {
@@ -90,7 +90,6 @@ class SenderViewModel @Inject constructor(
                 sessionId = getSessionId()
             )) {
                 is PrepareUploadResult.Success -> {
-                    peerToPeerInstance?.sessionID = getSessionId()
                     val fileInfoMap = result.transmissions.associateBy { it.id }
 
                     peerToPeerInstance?.widgetMediaFiles?.forEach { mediaFile ->
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 3d805e6a4..7394d0cd0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -12,6 +12,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
@@ -39,17 +40,17 @@ class PeerToPeerViewModel @Inject constructor(
     var isManualConnection: Boolean = true // default is manual
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
-    private val _registrationSuccess = MutableLiveData<Boolean>()
+    private val _registrationSuccess = SingleLiveEvent<Boolean>()
     val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
-    private val _getHashSuccess = MutableLiveData<String>()
+    private val _getHashSuccess = SingleLiveEvent<String>()
     val getHashSuccess: LiveData<String> get() = _getHashSuccess
-    private val _getHashError = MutableLiveData<Throwable>()
+    private val _getHashError = SingleLiveEvent<Throwable>()
     val getHashError: LiveData<Throwable> get() = _getHashError
     val clientHash = peerToPeerManager.clientConnected
-    private val _registrationServerSuccess = MutableLiveData<Boolean>()
+    private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
-    private val _incomingPrepareRequest = MutableLiveData<PrepareUploadRequest?>()
-    val incomingPrepareRequest: MutableLiveData<PrepareUploadRequest?> = _incomingPrepareRequest
+    private val _incomingPrepareRequest = SingleLiveEvent<PrepareUploadRequest?>()
+    val incomingPrepareRequest: SingleLiveEvent<PrepareUploadRequest?> = _incomingPrepareRequest
     private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
     val incomingRequest: StateFlow<IncomingRegistration?> = _incomingRequest
     private val networkInfoManager = NetworkInfoManager(context)
@@ -58,9 +59,6 @@ class PeerToPeerViewModel @Inject constructor(
     init {
         viewModelScope.launch {
             PeerEventManager.prepareUploadEvents.collect { request ->
-                p2PState.session?.sessionId = request.sessionId
-                p2PState.session?.title = request.title
-                populateFilesFromRequest(request, p2PState)
                 _incomingPrepareRequest.postValue(request)
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 009a86e7d..935e2215b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -8,34 +8,40 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
  * Created by wafa on 3/6/2025.
  */
-class RecipientSuccessFragment :
-    BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate) {
+class RecipientSuccessFragment : BaseBindingFragment<FragmentRecipientSuccessBinding>(FragmentRecipientSuccessBinding::inflate){
     private val viewModel: PeerToPeerViewModel by activityViewModels()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         initView()
     }
-
     private fun initView() {
+        val fileCount = arguments?.getInt("fileCount") ?: 0
+        val sessionId = arguments?.getString("sessionId").orEmpty()
 
         with(binding) {
             // Set the dynamic message
-            waitingText.text =
-                getString(R.string.prepare_upload_message, viewModel.p2PState.session?.files?.size)
+            waitingText.text = getString(R.string.prepare_upload_message, fileCount)
 
             // Handle Accept/Reject buttons
             acceptBtn.setOnClickListener {
-                viewModel.confirmPrepareUpload(viewModel.getSessionId(), true)
+
+                viewModel.confirmPrepareUpload(sessionId, true)
+
                 navManager().navigateFromRecipientSuccessFragmentToRecipientUploadFilesFragment()
             }
 
             rejectBtn.setOnClickListener {
                 //TODO WE MOVE THIS TO THE NAV MANAGER
-                viewModel.confirmPrepareUpload(viewModel.getSessionId(), false)
+                viewModel.confirmPrepareUpload(sessionId, false)
                 // Set result safely via SavedStateHandle
                 findNavController().previousBackStackEntry
                     ?.savedStateHandle
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 1c1e8b02a..c34356e72 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -6,13 +6,13 @@ import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 
 class RecipientUploadFilesFragment:
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
-    private val viewModel: SenderViewModel by activityViewModels()
+    private val viewModel: FileTransferViewModel by activityViewModels()
     private lateinit var endView: PeerToPeerEndView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index f56629d49..990714528 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -40,6 +40,11 @@ class WaitingReceiverFragment :
         viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
             if (request != null && !viewModel.hasNavigatedToSuccessFragment) {
                 viewModel.hasNavigatedToSuccessFragment = true
+
+                val fileCount = request.files.size
+                bundle.putInt("fileCount", fileCount)
+                bundle.putString("sessionId", request.sessionId)
+
                 navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 5deed43ad..0ce5648b7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
-import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -22,7 +21,6 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.databinding.FragmentPrepareUploadBinding
-import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
 import org.horizontal.tella.mobile.domain.peertopeer.P2PFile
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.C
@@ -33,7 +31,7 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
-import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.recorder.MicActivity
 import org.horizontal.tella.mobile.views.fragment.recorder.REPORT_ENTRY
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.AttachmentsActivitySelector
@@ -54,7 +52,7 @@ class PrepareUploadFragment :
     IReportAttachmentsHandler, OnNavBckListener {
     private lateinit var gridLayoutManager: GridLayoutManager
     private var isTitleEnabled = false
-    private val viewModel: SenderViewModel by activityViewModels()
+    private val viewModel: FileTransferViewModel by activityViewModels()
     private var disposables =
         MyApplication.bus().createCompositeDisposable()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 4fffd1847..0e9ab95a6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -6,13 +6,13 @@ import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 
 class SenderUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
-    private val viewModel: SenderViewModel by activityViewModels()
+    private val viewModel: FileTransferViewModel by activityViewModels()
     private lateinit var endView: PeerToPeerEndView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index db6e1a9b5..a4b801f05 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -4,20 +4,17 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.hzontal.tella_vault.VaultFile
 import org.horizontal.tella.mobile.R
-import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.SenderViewModel
-import org.hzontal.shared_ui.utils.DialogUtils
+import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
 
 /**
  * Created by wafa on 3/6/2025.
  */
 class WaitingSenderFragment :
     BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
-    private val viewModel: SenderViewModel by activityViewModels()
+    private val viewModel: FileTransferViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolbar.setStartTextTitle(getString(R.string.send_files))
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 435a7c09c..75c5e882e 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -148,7 +148,7 @@
 
     <fragment
         android:id="@+id/uploadFilesFragment"
-        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderVerificationFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderUploadFilesFragment"
         android:label="UploadFilesFragment"
         tools:layout="@layout/fragment_upload_files" />
 

From f00b04470bfcc8f88db9a58eb62e7865aa15f1e1 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Sun, 13 Jul 2025 17:54:41 +0100
Subject: [PATCH 069/153] WIP client upload

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  43 +++
 .../peertopeer/network/ProgressRequestBody.kt |  30 +++
 .../data/peertopeer/remote/PeerApiRoutes.kt   |   7 +
 .../peertopeer/FileTransferViewModel.kt       |  61 ++++-
 .../peertopeer/PeerToPeerViewModel.kt         |  23 --
 .../senderflow/SenderUploadFilesFragment.kt   |  35 +--
 .../senderflow/SenderVerificationFragment.kt  |   1 -
 .../uwazi/widgets/PeerToPeerEndView.java      | 250 ++++++------------
 8 files changed, 240 insertions(+), 210 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/network/ProgressRequestBody.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index aba259002..57accb6b7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -12,6 +12,7 @@ import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_JSON
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_OCTET
+import org.horizontal.tella.mobile.data.peertopeer.network.ProgressRequestBody
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
@@ -21,6 +22,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.json.JSONObject
 import timber.log.Timber
+import java.io.InputStream
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
@@ -199,4 +201,45 @@ class TellaPeerToPeerClient @Inject constructor(){
     }
 
 
+    suspend fun uploadFileWithProgress(
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        sessionId: String,
+        fileId: String,
+        transmissionId: String,
+        inputStream: InputStream,
+        fileSize: Long,
+        onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
+    ): Boolean = withContext(Dispatchers.IO) {
+        val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
+
+        val client = getClientWithFingerprintValidation(expectedFingerprint)
+
+        val requestBody = ProgressRequestBody(inputStream, fileSize, onProgress)
+
+        val request = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
+            .build()
+
+        return@withContext try {
+            client.newCall(request).execute().use { response ->
+                if (response.isSuccessful) {
+                    Timber.d("Upload successful for $fileId")
+                    true
+                } else {
+                    Timber.e("Upload failed for $fileId with code ${response.code}")
+                    false
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Exception while uploading $fileId")
+            false
+        }
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/network/ProgressRequestBody.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/network/ProgressRequestBody.kt
new file mode 100644
index 000000000..f2e53d5e0
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/network/ProgressRequestBody.kt
@@ -0,0 +1,30 @@
+package org.horizontal.tella.mobile.data.peertopeer.network
+
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+import okio.BufferedSink
+import java.io.InputStream
+
+class ProgressRequestBody(
+    private val inputStream: InputStream,
+    private val contentLength: Long,
+    private val onProgress: (Long, Long) -> Unit
+) : RequestBody() {
+
+    override fun contentType(): MediaType? = "application/octet-stream".toMediaTypeOrNull()
+
+    override fun contentLength(): Long = contentLength
+
+    override fun writeTo(sink: BufferedSink) {
+        val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
+        var uploaded = 0L
+        var read: Int
+
+        while (inputStream.read(buffer).also { read = it } != -1) {
+            sink.write(buffer, 0, read)
+            uploaded += read
+            onProgress(uploaded, contentLength)
+        }
+    }
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
index 5f8ae716b..8af395c92 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
@@ -3,9 +3,16 @@ package org.horizontal.tella.mobile.data.peertopeer.remote
 object PeerApiRoutes {
     const val REGISTER = "/api/v1/register"
     const val PREPARE_UPLOAD = "/api/v1/prepare-upload"
+    const val UPLOAD = "/api/v1/upload"
     const val PING = "/api/v1/ping"
 
     fun buildUrl(ip: String, port: String, endpoint: String): String {
         return "https://$ip:$port$endpoint"
     }
+
+    fun buildUploadUrl(ip: String, port: String, sessionId: String, fileId: String, transmissionId: String): String {
+        val baseUrl = buildUrl(ip, port, UPLOAD)
+        return "$baseUrl?sessionId=$sessionId&fileId=$fileId&transmissionId=$transmissionId"
+    }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
index fd855f5fc..88ac3b764 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
@@ -14,13 +14,15 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
 import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
 import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
-import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
+import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
 import timber.log.Timber
@@ -37,6 +39,8 @@ class FileTransferViewModel @Inject constructor(
     private val _prepareRejected = MutableLiveData<Event<Boolean>>()
     val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
     var peerToPeerInstance: PeerToPeerInstance? = null
+    private val _uploadProgress = MutableLiveData<Int>() // value from 0 to 100
+    val uploadProgress: LiveData<Int> get() = _uploadProgress
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -127,6 +131,57 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
+
+    fun uploadAllFiles(onFileUploaded: () -> Unit) {
+        viewModelScope.launch {
+            val session = p2PSharedState.session ?: return@launch
+            val ip = p2PSharedState.ip
+            val port = p2PSharedState.port
+            val fingerprint = p2PSharedState.hash
+
+            val totalSize = session.files.values.sumOf { it.vaultFile?.size ?: 0L }
+
+            session.files.values.forEach { progressFile ->
+                val vaultFile = progressFile.vaultFile ?: return@forEach
+                val inputStream =MediaFileHandler.getStream(vaultFile) // Use your actual method here to get InputStream
+
+                progressFile.status = P2PFileStatus.SENDING
+
+                try {
+                    if (inputStream != null) {
+                        peerClient.uploadFileWithProgress(
+                            ip = ip,
+                            port = port,
+                            expectedFingerprint = fingerprint,
+                            sessionId = session.sessionId,
+                            fileId = progressFile.file.id,
+                            transmissionId = progressFile.transmissionId.orEmpty(),
+                            inputStream = inputStream,
+                            fileSize = vaultFile.size
+                        ) { written, _ ->
+                            progressFile.bytesTransferred = written.toInt()
+
+                            val uploaded = session.files.values.sumOf { it.bytesTransferred }
+                            val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                            _uploadProgress.postValue(percent)
+                        }
+                    }
+
+                    progressFile.status = P2PFileStatus.FINISHED
+                    onFileUploaded()
+                } catch (e: Exception) {
+                    progressFile.status = P2PFileStatus.FAILED
+                    Timber.e(e, "Upload failed for file ${progressFile.file.fileName}")
+                } finally {
+                    inputStream?.close()
+                }
+            }
+
+            session.status = SessionStatus.FINISHED
+        }
+    }
+
+
     private fun getVaultFilesFromState(): List<VaultFile> {
         return p2PSharedState.session?.files
             ?.values
@@ -147,10 +202,6 @@ class FileTransferViewModel @Inject constructor(
         p2PSharedState.clear()
     }
 
-    fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
-        PeerEventManager.resolveUserDecision(sessionId, accepted)
-    }
-
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
index 7394d0cd0..0779e73a8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
@@ -181,29 +181,6 @@ class PeerToPeerViewModel @Inject constructor(
     fun clearPrepareRequest() {
         _incomingPrepareRequest.value = null
         hasNavigatedToSuccessFragment = false
-
-    }
-
-    fun getSessionId(): String {
-        return p2PState.session?.sessionId ?: ""
-    }
-
-    fun populateFilesFromRequest(request: PrepareUploadRequest, sharedState: P2PSharedState) {
-        val session = sharedState.session ?: return
-
-        session.sessionId = request.sessionId
-        session.title = request.title
-
-        request.files.forEach { p2pFile ->
-            val transmissionId = UUID.randomUUID().toString()
-
-            val progressFile = ProgressFile(
-                file = p2pFile,
-                transmissionId = transmissionId
-            )
-
-            session.files[transmissionId] = progressFile
-        }
     }
 
     override fun onCleared() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 0e9ab95a6..585a088e2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -18,26 +18,27 @@ class SenderUploadFilesFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
+        observeUploadProgress()
     }
 
     private fun showFormEndView() {
-        if (viewModel.peerToPeerInstance == null) {
-            return
-        }
-
-        viewModel.peerToPeerInstance?.let { peerInstance ->
+        val session = viewModel.p2PSharedState.session ?: return
+        val files = session.files.values.toList()
+
+        endView = PeerToPeerEndView(
+            baseActivity, session.title ?: "Transfer"
+        )
+        endView.setFiles(files, MyApplication.isConnectedToInternet(baseActivity), false)
+        binding.endViewContainer.removeAllViews()
+        binding.endViewContainer.addView(endView)
+        endView.clearPartsProgress(files, session.status)
+    }
 
-            endView = PeerToPeerEndView(
-                baseActivity,
-                peerInstance.title,
-            )
-            endView.setInstance(
-                peerInstance, MyApplication.isConnectedToInternet(baseActivity), false
-            )
-            binding.endViewContainer.removeAllViews()
-            binding.endViewContainer.addView(endView)
-            endView.clearPartsProgress(peerInstance)
+    private fun observeUploadProgress() {
+        viewModel.uploadProgress.observe(viewLifecycleOwner) { percent ->
+            viewModel.p2PSharedState.session?.let { session ->
+                endView.setUploadProgress(session.files.values.toList(), percent.toFloat())
+            }
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 47cf3f36b..aac22899a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -3,7 +3,6 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index 4a5205929..573af2234 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -12,31 +12,23 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.hzontal.utils.MediaFile;
 
 import org.horizontal.tella.mobile.R;
-import org.horizontal.tella.mobile.domain.entity.EntityStatus;
-import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile;
-import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus;
-import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance;
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus;
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile;
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus;
 import org.horizontal.tella.mobile.util.FileUtil;
-import org.horizontal.tella.mobile.util.Util;
 import org.hzontal.shared_ui.submission.SubmittingItem;
 
-import java.util.Objects;
+import java.util.List;
 
-/**
- * Created by wafa on 9/7/2025.
- */
 public class PeerToPeerEndView extends FrameLayout {
-    LinearLayout partsListView;
-    TextView titleView;
-    TextView formStatusTextView;
-    TextView formSizeView;
-    String title;
-    LinearProgressIndicator totalProgress;
-    long formSize = 0L;
-    private PeerToPeerInstance instance;
+    private final LinearProgressIndicator totalProgress;
+    private final TextView titleView;
+    private final TextView formSizeView;
+    private LinearLayout partsListView;
+
+    private final String title;
     private boolean previewUploaded;
 
     public PeerToPeerEndView(Context context, String title) {
@@ -50,198 +42,128 @@ public PeerToPeerEndView(Context context, String title) {
 
         totalProgress = findViewById(R.id.totalProgress);
         formSizeView = findViewById(R.id.formSize);
-
-        formStatusTextView = findViewById(R.id.form_status);
     }
 
-    public void setInstance(@NonNull PeerToPeerInstance instance, boolean offline, boolean previewUploaded) {
-        this.instance = instance;
+    public void setFiles(List<ProgressFile> progressFiles, boolean offline, boolean previewUploaded) {
         this.previewUploaded = previewUploaded;
-        refreshInstance(offline);
-    }
-
-    public void refreshInstance(boolean offline) {
-        if (this.instance == null) {
-            return;
-        }
-
-        TextView formNameView = findViewById(R.id.title);
 
-        formNameView.setText(Objects.requireNonNull(instance.getTitle()));
+        titleView.setText(title);
 
         partsListView = findViewById(R.id.formPartsList);
         partsListView.removeAllViews();
 
-        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
-            partsListView.addView(createFormMediaFileItemView(mediaFile, offline));
-            formSize += mediaFile.size;
-        }
-        setFormSizeLabel(instance, 0);
-        uploadProgressVisibity(instance, offline);
-        setUploadProgress(instance, 0);
-    }
-
-    void setFormSizeLabel(@NonNull PeerToPeerInstance instance, int percent) {
-        String title;
-        if (instance.getWidgetMediaFiles().isEmpty()) {
-            title = getStatusLabel(instance.getStatus());
-            formSizeView.setText(title);
-            return;
-        }
-        switch (instance.getStatus()) {
-            case SUBMITTED:
-                title = getStatusLabel(instance.getStatus()) + "\n" +
-                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
-                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
-                        FileUtil.getFileSizeString(formSize);
-                break;
-            case PAUSED:
-                title = getStatusLabel(instance.getStatus()) + "\n" +
-                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
-                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
-                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize);
-                break;
-            case FINALIZED:
-            case SUBMISSION_PENDING:
-            case SUBMISSION_ERROR:
-                title = getStatusLabel(instance.getStatus()) + "\n" +
-                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
-                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ", " +
-                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize) + " " +
-                        getResources().getString(R.string.File_Uploaded);
-                break;
-            default:
-                title = percent + "% " + getResources().getString(R.string.File_Uploaded) + "\n" +
-                        getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files,
-                                instance.getWidgetMediaFiles().size(), instance.getWidgetMediaFiles().size()) + ",  " +
-                        getTotalUploadedSize(instance) + "/" + FileUtil.getFileSizeString(formSize) + " " +
-                        getResources().getString(R.string.File_Uploaded);
-                break;
+        for (ProgressFile file : progressFiles) {
+            partsListView.addView(createProgressFileItemView(file, offline));
         }
 
-        formSizeView.setText(title);
+        uploadProgressVisibility(progressFiles, true);
+        setUploadProgress(progressFiles, 0f);
     }
 
+    public void setUploadProgress(List<ProgressFile> progressFiles, float pct) {
+        if (pct < 0 || pct > 1) return;
 
-    String getStatusLabel(EntityStatus status) {
-        String title = "";
-        if (status == EntityStatus.SUBMITTED) {
-            title = "";
-            //getResources().getString(R.string.File_Uploaded_on) + " " + Util.getDateTimeString(instance.getUpdated());
-        } else if (status == EntityStatus.PAUSED) {
-            title = getResources().getString(R.string.Paused_Report);
-        } else if (status == EntityStatus.FINALIZED || instance.getStatus() == EntityStatus.SUBMISSION_PENDING || instance.getStatus() == EntityStatus.SUBMISSION_ERROR) {
-            title = getResources().getString(R.string.Report_Waiting_For_Connection);
-        }
-        return title;
-    }
+        int percentComplete = getTotalUploadedSizePercent(progressFiles);
 
-    private void uploadProgressVisibity(PeerToPeerInstance instance, Boolean isOnline) {
-        if (!isOnline || instance.getWidgetMediaFiles().isEmpty()) {
-            totalProgress.setVisibility(GONE);
-            return;
+        for (ProgressFile file : progressFiles) {
+            if (file.getStatus() == P2PFileStatus.FINISHED && file.getVaultFile() != null) {
+                SubmittingItem item = partsListView.findViewWithTag(file.getVaultFile().id);
+                if (item != null) item.setPartUploaded();
+            }
         }
 
-        if (instance.getStatus() == EntityStatus.SUBMITTED) {
-            totalProgress.setVisibility(GONE);
-        } else {
-            totalProgress.setVisibility(VISIBLE);
-        }
+        totalProgress.setProgressCompat(percentComplete, true);
+        setFormSizeLabel(progressFiles, percentComplete);
     }
 
-    public void setUploadProgress(PeerToPeerInstance instance, float pct) {
-        if (pct < 0 || pct > 1) {
-            return;
-        }
 
-        int percentComplete;
+    public void clearPartsProgress(List<ProgressFile> progressFiles, SessionStatus sessionStatus) {
+        for (ProgressFile file : progressFiles) {
+            if (file.getVaultFile() == null) continue;
 
-        if (instance.getWidgetMediaFiles().size() > 1) {
-            percentComplete = getTotalUploadedSizePercent(instance);
-        } else {
-            percentComplete = (int) (pct * 100);
+            SubmittingItem item = partsListView.findViewWithTag(file.getVaultFile().id);
+            if (item != null) {
+                if (sessionStatus == SessionStatus.FINISHED || file.getStatus() == P2PFileStatus.FINISHED) {
+                    item.setPartUploaded();
+                } else {
+                    item.setPartCleared();
+                }
+            }
         }
+    }
 
-        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
-            if (mediaFile.status == FormMediaFileStatus.SUBMITTED) {
-                SubmittingItem item = partsListView.findViewWithTag(mediaFile.getVaultFile().id);
-                item.setPartUploaded();
+    private int getTotalUploadedSizePercent(List<ProgressFile> progressFiles) {
+        long totalUploadedSize = 0;
+        long totalSize = 0;
+
+        for (ProgressFile file : progressFiles) {
+            totalUploadedSize += file.getBytesTransferred();
+            if (file.getVaultFile() != null) {
+                totalSize += file.getVaultFile().size;
             }
         }
 
-        //Timber.d("***Test*** PCT " + pct + "\n getTotalUploadedSize " + getTotalUploadedSize(instance) + "\n FormSize " + formSize + "\n percentComplete " + percentComplete + " \n Math.round(percentComplete) " + Math.toIntExact(percentComplete));
-        totalProgress.setProgressCompat(percentComplete, true);
-        setFormSizeLabel(instance, percentComplete);
+        return totalSize > 0 ? Math.round((totalUploadedSize * 1f / totalSize) * 100) : 0;
     }
 
-    private int getTotalUploadedSizePercent(PeerToPeerInstance instance) {
-        int totalUploadedSize = 0;
-        for (FormMediaFile formMediaFile : instance.getWidgetMediaFiles()) {
-            totalUploadedSize += formMediaFile.uploadedSize;
-        }
-        if (totalUploadedSize > 0) {
-            float percent = ((float) (totalUploadedSize * 1.0) / formSize);
-            return Math.round(percent * 100);
+    private void setFormSizeLabel(List<ProgressFile> files, int percent) {
+        int count = files.size();
+        long totalSize = 0;
+        long totalUploaded = 0;
 
-        } else {
-            return 0;
+        for (ProgressFile file : files) {
+            if (file.getVaultFile() != null) {
+                totalSize += file.getVaultFile().size;
+            }
+            totalUploaded += file.getBytesTransferred();
         }
-    }
 
-    private String getTotalUploadedSize(PeerToPeerInstance instance) {
-        long totalUploadedSize = 0;
-        for (FormMediaFile formMediaFile : instance.getWidgetMediaFiles()) {
-            totalUploadedSize += formMediaFile.uploadedSize;
-        }
-        return FileUtil.getFileSize(totalUploadedSize);
-    }
+        String label = percent + "% " + getContext().getString(R.string.File_Uploaded) + "\n" +
+                getResources().getQuantityString(R.plurals.upload_main_meta_number_of_files, count, count) + ", " +
+                FileUtil.getFileSize(totalUploaded) + "/" + FileUtil.getFileSize(totalSize);
 
-    public void clearPartsProgress(PeerToPeerInstance instance) {
-        setPartsCleared(instance);
+        formSizeView.setText(label);
     }
 
+    private void uploadProgressVisibility(List<ProgressFile> files, boolean isOnline) {
+        if (!isOnline || files.isEmpty()) {
+            totalProgress.setVisibility(GONE);
+        } else {
+            totalProgress.setVisibility(VISIBLE);
+        }
+    }
 
-    private View createFormMediaFileItemView(@NonNull FormMediaFile mediaFile, boolean offline) {
-
+    private View createProgressFileItemView(@NonNull ProgressFile file, boolean offline) {
         SubmittingItem item = new SubmittingItem(getContext(), null, 0);
         ImageView thumbView = item.findViewById(R.id.fileThumb);
-        item.setTag(mediaFile.getPartName());
+        item.setTag(file.getVaultFile() != null ? file.getVaultFile().id : file.getFile().getId());
 
-        item.setPartName(mediaFile.name);
-        item.setPartSize(mediaFile.size);
+        item.setPartName(file.getFile().getFileName());
+        item.setPartSize(file.getFile().getSize());
 
-        if (MediaFile.INSTANCE.isImageFileType(mediaFile.mimeType) || (MediaFile.INSTANCE.isVideoFileType(mediaFile.mimeType))) {
+        if (file.getVaultFile() != null && file.getVaultFile().thumb != null) {
             Glide.with(getContext())
-                    .load(mediaFile.thumb)
+                    .load(file.getVaultFile().thumb)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .skipMemoryCache(true)
                     .into(thumbView);
-        } else if (MediaFile.INSTANCE.isAudioFileType(mediaFile.mimeType)) {
-            item.setPartIcon(R.drawable.ic_headset_white_24dp);
-        } else {
-            item.setPartIcon(R.drawable.ic_attach_file_white_24dp);
         }
 
-        if (mediaFile.status == FormMediaFileStatus.SUBMITTED || previewUploaded) {
-            item.setPartUploaded();
-        } else {
-            item.setPartPrepared(offline);
+        switch (file.getStatus()) {
+            case FINISHED:
+                item.setPartUploaded();
+                break;
+            case FAILED:
+            case QUEUE:
+            case SENDING:
+                if (previewUploaded) {
+                    item.setPartUploaded();
+                } else {
+                    item.setPartPrepared(offline);
+                }
+                break;
         }
 
         return item;
     }
-
-    private void setPartsCleared(PeerToPeerInstance instance) {
-        for (FormMediaFile mediaFile : instance.getWidgetMediaFiles()) {
-            SubmittingItem item = partsListView.findViewWithTag(mediaFile.getVaultFile().id);
-
-            if (instance.getStatus() == EntityStatus.SUBMITTED) {
-                item.setPartUploaded();
-            } else {
-                item.setPartCleared();
-            }
-        }
-    }
 }
-
-

From 041f4f3ddb92b6e008a533c2fd2fdf187365be8a Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Sun, 13 Jul 2025 18:02:29 +0100
Subject: [PATCH 070/153] Fix reciepient fragment

---
 .../RecipientUploadFilesFragment.kt           | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index c34356e72..57727d1d2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -3,41 +3,48 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+import javax.inject.Inject
 
-class RecipientUploadFilesFragment:
+@AndroidEntryPoint
+class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
     private val viewModel: FileTransferViewModel by activityViewModels()
+
+    @Inject
+    lateinit var p2PSharedState: P2PSharedState
+
     private lateinit var endView: PeerToPeerEndView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
+        observeUploadProgress()
     }
 
     private fun showFormEndView() {
-        if (viewModel.peerToPeerInstance == null) {
-            return
-        }
-
-        viewModel.peerToPeerInstance?.let { peerInstance ->
-
-            endView = PeerToPeerEndView(
-                baseActivity,
-                peerInstance.title,
-            )
-            endView.setInstance(
-                peerInstance, MyApplication.isConnectedToInternet(baseActivity), false
-            )
-            binding.endViewContainer.removeAllViews()
-            binding.endViewContainer.addView(endView)
-            endView.clearPartsProgress(peerInstance)
-        }
+        val session = p2PSharedState.session ?: return
+        val files = session.files.values.toList()
+
+        endView = PeerToPeerEndView(
+            baseActivity,
+            session.title
+        )
+
+        endView.setFiles(files, MyApplication.isConnectedToInternet(baseActivity), false)
+
+        binding.endViewContainer.removeAllViews()
+        binding.endViewContainer.addView(endView)
     }
 
-}
\ No newline at end of file
+    private fun observeUploadProgress() {
+
+    }
+}

From 7952e5c5d215f3d1993b1eefd6715097cf11b238 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Mon, 14 Jul 2025 10:52:58 +0100
Subject: [PATCH 071/153] change viewmodel package

---
 .../receipentflow/ConnectHotspotFragment.kt   |  2 +-
 .../receipentflow/QRCodeFragment.kt           |  2 +-
 .../receipentflow/RecipientSuccessFragment.kt |  3 +-
 .../RecipientUploadFilesFragment.kt           |  2 +-
 .../RecipientVerificationFragment.kt          |  2 +-
 .../receipentflow/ShowDeviceInfoFragment.kt   |  2 +-
 .../receipentflow/WaitingReceiverFragment.kt  |  2 +-
 .../senderflow/PrepareUploadFragment.kt       |  2 +-
 .../senderflow/ScanQrCodeFragment.kt          |  2 +-
 .../SenderManualConnectionFragment.kt         |  2 +-
 .../senderflow/SenderUploadFilesFragment.kt   |  5 ++-
 .../senderflow/SenderVerificationFragment.kt  |  2 +-
 .../senderflow/WaitingSenderFragment.kt       |  2 +-
 .../{ => viewmodel}/FileTransferViewModel.kt  | 41 +++----------------
 .../{ => viewmodel}/PeerToPeerViewModel.kt    |  5 +--
 15 files changed, 23 insertions(+), 53 deletions(-)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{ => viewmodel}/FileTransferViewModel.kt (79%)
 rename mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/{ => viewmodel}/PeerToPeerViewModel.kt (97%)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 957ab1c06..effbcbb2b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -17,7 +17,7 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
 import org.horizontal.tella.mobile.util.ConnectionType
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 @AndroidEntryPoint
 class ConnectHotspotFragment :
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 2cc88d231..641ee4be0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -19,7 +19,7 @@ import org.horizontal.tella.mobile.databinding.FragmentQrCodeBinding
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
index 935e2215b..19285a140 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientSuccessFragment.kt
@@ -7,8 +7,7 @@ import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentRecipientSuccessBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
-import org.hzontal.shared_ui.utils.DialogUtils
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 /**
  * Created by wafa on 3/6/2025.
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 57727d1d2..b71cc5d94 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -8,7 +8,7 @@ import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import javax.inject.Inject
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index c13de8e9e..3f8911e89 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -14,7 +14,7 @@ import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBindin
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import javax.inject.Inject
 
 class RecipientVerificationFragment :
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 152537624..1ae6175b0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.databinding.ShowDeviceInfoLayoutBinding
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 class ShowDeviceInfoFragment :
     BaseBindingFragment<ShowDeviceInfoLayoutBinding>(ShowDeviceInfoLayoutBinding::inflate) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index 990714528..e9d396242 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -7,7 +7,7 @@ import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.hzontal.shared_ui.utils.DialogUtils
 
 /**
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 0ce5648b7..5c086f855 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -31,7 +31,7 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_AUDIO
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BUNDLE_REPORT_VAULT_FILE
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.OnNavBckListener
-import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.recorder.MicActivity
 import org.horizontal.tella.mobile.views.fragment.recorder.REPORT_ENTRY
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.AttachmentsActivitySelector
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index ec29dd40d..19b98806f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -15,7 +15,7 @@ import com.journeyapps.barcodescanner.CompoundBarcodeView
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.databinding.ScanQrcodeFragmentBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 class ScanQrCodeFragment :
     BaseBindingFragment<ScanQrcodeFragmentBinding>(ScanQrcodeFragmentBinding::inflate) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index f7663304d..3e70b8168 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -7,7 +7,7 @@ import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 
 // TODO: Show errors in the bottom sheet
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 585a088e2..306cb43bf 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -6,7 +6,7 @@ import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 
 class SenderUploadFilesFragment :
@@ -19,6 +19,9 @@ class SenderUploadFilesFragment :
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
         observeUploadProgress()
+        viewModel.uploadAllFiles {
+
+        }
     }
 
     private fun showFormEndView() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index aac22899a..e5468e659 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -8,7 +8,7 @@ import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterMan
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.PeerToPeerViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import javax.inject.Inject
 
 class SenderVerificationFragment :
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index a4b801f05..b0c6bc408 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -7,7 +7,7 @@ import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.FileTransferViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 
 /**
  * Created by wafa on 3/6/2025.
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
similarity index 79%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 88ac3b764..b4fe0b659 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -1,4 +1,4 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -18,9 +18,6 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
-import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFile
-import org.horizontal.tella.mobile.domain.entity.collect.FormMediaFileStatus
-import org.horizontal.tella.mobile.domain.entity.peertopeer.PeerToPeerInstance
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
@@ -38,7 +35,6 @@ class FileTransferViewModel @Inject constructor(
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
     private val _prepareRejected = MutableLiveData<Event<Boolean>>()
     val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
-    var peerToPeerInstance: PeerToPeerInstance? = null
     private val _uploadProgress = MutableLiveData<Int>() // value from 0 to 100
     val uploadProgress: LiveData<Int> get() = _uploadProgress
 
@@ -64,24 +60,6 @@ class FileTransferViewModel @Inject constructor(
             .subscribeOn(Schedulers.io())
     }
 
-    fun mediaFilesToVaultFiles(files: List<FormMediaFile>?): List<VaultFile> {
-        val vaultFiles = ArrayList<VaultFile>()
-        files?.map { mediaFile ->
-            vaultFiles.add(mediaFile.vaultFile)
-        }
-        return vaultFiles
-    }
-
-    fun vaultFilesToMediaFiles(files: List<VaultFile>): List<FormMediaFile> {
-        val vaultFiles = mutableListOf<FormMediaFile>()
-        files.map { vaultFile ->
-            val mediaFile = FormMediaFile.fromMediaFile(vaultFile)
-            mediaFile.status = FormMediaFileStatus.NOT_SUBMITTED
-            vaultFiles.add(FormMediaFile.fromMediaFile(vaultFile))
-        }
-        return vaultFiles
-    }
-
     fun prepareUploadsFromVaultFiles() {
 
         viewModelScope.launch {
@@ -94,14 +72,6 @@ class FileTransferViewModel @Inject constructor(
                 sessionId = getSessionId()
             )) {
                 is PrepareUploadResult.Success -> {
-                    val fileInfoMap = result.transmissions.associateBy { it.id }
-
-                    peerToPeerInstance?.widgetMediaFiles?.forEach { mediaFile ->
-                        fileInfoMap[mediaFile.id]?.let { fileInfo ->
-                            mediaFile.transmissionId = fileInfo.transmissionId
-                        }
-                    }
-
                     _prepareResults.postValue(PeerPrepareUploadResponse(result.transmissions))
                 }
 
@@ -132,7 +102,7 @@ class FileTransferViewModel @Inject constructor(
     }
 
 
-    fun uploadAllFiles(onFileUploaded: () -> Unit) {
+    fun uploadAllFiles() {
         viewModelScope.launch {
             val session = p2PSharedState.session ?: return@launch
             val ip = p2PSharedState.ip
@@ -143,7 +113,8 @@ class FileTransferViewModel @Inject constructor(
 
             session.files.values.forEach { progressFile ->
                 val vaultFile = progressFile.vaultFile ?: return@forEach
-                val inputStream =MediaFileHandler.getStream(vaultFile) // Use your actual method here to get InputStream
+                val inputStream =
+                    MediaFileHandler.getStream(vaultFile)
 
                 progressFile.status = P2PFileStatus.SENDING
 
@@ -162,13 +133,13 @@ class FileTransferViewModel @Inject constructor(
                             progressFile.bytesTransferred = written.toInt()
 
                             val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                            val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                            val percent =
+                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
                             _uploadProgress.postValue(percent)
                         }
                     }
 
                     progressFile.status = P2PFileStatus.FINISHED
-                    onFileUploaded()
                 } catch (e: Exception) {
                     progressFile.status = P2PFileStatus.FAILED
                     Timber.e(e, "Upload failed for file ${progressFile.file.fileName}")
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
similarity index 97%
rename from mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
rename to mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 0779e73a8..f12860d55 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -1,10 +1,9 @@
-package org.horizontal.tella.mobile.views.fragment.peertopeer
+package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -18,7 +17,6 @@ import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
-import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
@@ -26,7 +24,6 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import timber.log.Timber
-import java.util.UUID
 import javax.inject.Inject
 
 @HiltViewModel

From 5a746577c8d4fbec3fa5b9b5286b13f3d03f63b3 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 14 Jul 2025 19:00:05 +0100
Subject: [PATCH 072/153] fix location display for wifi display

---
 .../receipentflow/ConnectHotspotFragment.kt   | 88 +++++++++++--------
 .../senderflow/SenderUploadFilesFragment.kt   |  4 +-
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index effbcbb2b..13e243ec4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -3,19 +3,31 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.Manifest.permission.ACCESS_NETWORK_STATE
 import android.Manifest.permission.ACCESS_WIFI_STATE
+import android.app.AlertDialog
+import android.content.Context
+import android.content.Intent
+import android.content.IntentSender
 import android.content.pm.PackageManager
+import android.location.LocationManager
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
+import com.google.android.datatransport.Priority
+import com.google.android.gms.common.api.ResolvableApiException
+import com.google.android.gms.location.LocationRequest
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.LocationSettingsRequest
 import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
 import org.horizontal.tella.mobile.util.ConnectionType
+import org.horizontal.tella.mobile.util.LocationProvider.isLocationEnabled
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
@@ -25,19 +37,14 @@ class ConnectHotspotFragment :
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var isCheckboxChecked = false
-    private val permissionsToRequest = mutableListOf<String>()
 
     @RequiresApi(Build.VERSION_CODES.M)
     private val requestPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
-            val fineLocationGranted = permissions[ACCESS_FINE_LOCATION] ?: false
-            val wifiStateGranted = permissions[ACCESS_WIFI_STATE] ?: false
-            val networkStateGranted = permissions[ACCESS_NETWORK_STATE] ?: false
-
-            if (fineLocationGranted && wifiStateGranted && networkStateGranted) {
-                viewModel.updateNetworkInfo()
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+            if (granted) {
+                checkLocationSettings()
             } else {
-                baseActivity.showToast("Location and network permissions are required to get WiFi SSID.")
+                baseActivity.showToast("Location permission is required to get WiFi SSID.")
             }
         }
 
@@ -47,7 +54,6 @@ class ConnectHotspotFragment :
         initObservers()
         initListeners()
         checkAndRequestPermissions()
-        updateInfoOrGetPermission()
     }
 
     private fun initObservers() {
@@ -88,6 +94,7 @@ class ConnectHotspotFragment :
         } else {
             { }
         })
+
         binding.nextBtn.setTextColor(
             getColor(baseActivity, if (shouldEnable) R.color.wa_white else R.color.wa_white_40)
         )
@@ -100,38 +107,43 @@ class ConnectHotspotFragment :
 
     @RequiresApi(Build.VERSION_CODES.M)
     private fun checkAndRequestPermissions() {
-
-        if (ContextCompat.checkSelfPermission(
-                baseActivity,
-                ACCESS_FINE_LOCATION
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            permissionsToRequest.add(ACCESS_FINE_LOCATION)
-        }
-        if (ContextCompat.checkSelfPermission(
-                baseActivity,
-                ACCESS_WIFI_STATE
-            ) != PackageManager.PERMISSION_GRANTED
+        if (ContextCompat.checkSelfPermission(baseActivity, ACCESS_FINE_LOCATION)
+            != PackageManager.PERMISSION_GRANTED
         ) {
-            permissionsToRequest.add(ACCESS_WIFI_STATE)
-        }
-        if (ContextCompat.checkSelfPermission(
-                baseActivity,
-                ACCESS_NETWORK_STATE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            permissionsToRequest.add(ACCESS_NETWORK_STATE)
+            baseActivity.maybeChangeTemporaryTimeout{
+                requestPermissionLauncher.launch(ACCESS_FINE_LOCATION)
+            }
+        } else {
+            checkLocationSettings()
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun updateInfoOrGetPermission() {
-        if (permissionsToRequest.isNotEmpty()) {
-            baseActivity.maybeChangeTemporaryTimeout {
-                requestPermissionLauncher.launch(permissionsToRequest.toTypedArray())
+    private fun checkLocationSettings() {
+        val locationRequest = LocationRequest.create()
+            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+
+        val builder = LocationSettingsRequest.Builder()
+            .addLocationRequest(locationRequest)
+            .setAlwaysShow(true)
+
+        val settingsClient = LocationServices.getSettingsClient(requireActivity())
+        settingsClient.checkLocationSettings(builder.build())
+            .addOnSuccessListener {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    viewModel.updateNetworkInfo()
+                }
+            }
+            .addOnFailureListener { exception ->
+                if (exception is ResolvableApiException) {
+                    try {
+                        exception.startResolutionForResult(requireActivity(), 1001)
+                    } catch (sendEx: IntentSender.SendIntentException) {
+                        baseActivity.showToast("Failed to open location settings.")
+                    }
+                } else {
+                    baseActivity.showToast("Location services are required to get WiFi SSID.")
+                }
             }
-        } else {
-            viewModel.updateNetworkInfo()
-        }
     }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 306cb43bf..d6740ff10 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -19,9 +19,7 @@ class SenderUploadFilesFragment :
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
         observeUploadProgress()
-        viewModel.uploadAllFiles {
-
-        }
+        viewModel.uploadAllFiles()
     }
 
     private fun showFormEndView() {

From c060dc42c4f27961eb91a25da1ebb47129da1d4a Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 15 Jul 2025 11:55:43 +0100
Subject: [PATCH 073/153] add error handling in registration flow

---
 .../receipentflow/ConnectHotspotFragment.kt   |  6 ++--
 .../receipentflow/QRCodeFragment.kt           |  2 --
 .../receipentflow/ShowDeviceInfoFragment.kt   |  1 -
 .../SenderManualConnectionFragment.kt         | 20 +++++++++++--
 .../viewmodel/PeerToPeerViewModel.kt          | 28 +++++++++++--------
 mobile/src/main/res/values-ar/strings.xml     |  2 ++
 mobile/src/main/res/values-be/strings.xml     |  2 ++
 mobile/src/main/res/values-blk/strings.xml    |  2 ++
 mobile/src/main/res/values-bn/strings.xml     |  2 ++
 mobile/src/main/res/values-es-rCU/strings.xml |  2 ++
 mobile/src/main/res/values-es/strings.xml     |  2 ++
 mobile/src/main/res/values-fa-rIR/strings.xml |  2 ++
 mobile/src/main/res/values-fr/strings.xml     |  2 ++
 mobile/src/main/res/values-hdpi/strings.xml   |  2 ++
 mobile/src/main/res/values-in/strings.xml     |  2 ++
 mobile/src/main/res/values-kac/strings.xml    |  2 ++
 mobile/src/main/res/values-kn/strings.xml     |  2 ++
 mobile/src/main/res/values-ksw/strings.xml    |  2 ++
 mobile/src/main/res/values-ku/strings.xml     |  2 ++
 mobile/src/main/res/values-mdpi/strings.xml   |  2 ++
 mobile/src/main/res/values-ml/strings.xml     |  2 ++
 mobile/src/main/res/values-my/strings.xml     |  2 ++
 mobile/src/main/res/values-ndc/strings.xml    |  2 ++
 mobile/src/main/res/values-pt-rMZ/strings.xml |  2 ++
 mobile/src/main/res/values-pt/strings.xml     |  2 ++
 mobile/src/main/res/values-ru/strings.xml     |  2 ++
 mobile/src/main/res/values-sn-rZW/strings.xml |  2 ++
 .../src/main/res/values-sw600dp/strings.xml   |  2 ++
 mobile/src/main/res/values-ta/strings.xml     |  2 ++
 mobile/src/main/res/values-tr/strings.xml     |  2 ++
 mobile/src/main/res/values-ts/strings.xml     |  2 ++
 mobile/src/main/res/values-v21/strings.xml    |  2 ++
 mobile/src/main/res/values-v26/strings.xml    |  2 ++
 mobile/src/main/res/values-vi/strings.xml     |  2 ++
 mobile/src/main/res/values-w820dp/strings.xml |  2 ++
 mobile/src/main/res/values-xhdpi/strings.xml  |  2 ++
 mobile/src/main/res/values-xxhdpi/strings.xml |  2 ++
 mobile/src/main/res/values/strings.xml        |  3 ++
 38 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 13e243ec4..c14b50ef8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -44,7 +44,7 @@ class ConnectHotspotFragment :
             if (granted) {
                 checkLocationSettings()
             } else {
-                baseActivity.showToast("Location permission is required to get WiFi SSID.")
+                baseActivity.showToast(getString(R.string.location_permission_is_required_to_get_wifi_ssid))
             }
         }
 
@@ -138,10 +138,10 @@ class ConnectHotspotFragment :
                     try {
                         exception.startResolutionForResult(requireActivity(), 1001)
                     } catch (sendEx: IntentSender.SendIntentException) {
-                        baseActivity.showToast("Failed to open location settings.")
+                        baseActivity.showToast(getString(R.string.failed_to_open_location_settings))
                     }
                 } else {
-                    baseActivity.showToast("Location services are required to get WiFi SSID.")
+                    baseActivity.showToast(getString(R.string.location_permission_is_required_to_get_wifi_ssid))
                 }
             }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 641ee4be0..019ce6928 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -53,7 +53,6 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-                //  bundle.putBoolean("isSender", false)
                 navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
@@ -134,7 +133,6 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     private fun initObservers() {
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                bundle.putBoolean("isSender", false)
                 navManager().navigateFromQrCodeScreenToWaitingReceiverFragment()
             } else {
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 1ae6175b0..831264498 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -55,7 +55,6 @@ class ShowDeviceInfoFragment :
         viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 // Navigate to the next screen
-                //    bundle.putBoolean("isSender", false)
                 navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
                 //  reset the LiveData state if we want to consume event once
                 viewModel.resetRegistrationState()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 3e70b8168..b779be8f9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -5,10 +5,14 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
+import org.hzontal.shared_ui.utils.DialogUtils
 
 // TODO: Show errors in the bottom sheet
 class SenderManualConnectionFragment :
@@ -56,9 +60,21 @@ class SenderManualConnectionFragment :
             bundle.putString("payload", hash)
             navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
         }
+        viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
+            DialogUtils.showBottomMessage(baseActivity, message, true)
+        }
 
-        viewModel.getHashError.observe(viewLifecycleOwner) { error ->
-            error.localizedMessage?.let { showToast(it) }
+        viewModel.bottomSheetError.observe(viewLifecycleOwner) { (title, description) ->
+            showStandardSheet(
+                baseActivity.supportFragmentManager,
+                title,
+                description,
+                null,
+                getString(R.string.try_again),
+                null
+            ) {
+                activity?.onBackPressed()
+            }
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index f12860d55..3c9fe6dff 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -41,8 +41,8 @@ class PeerToPeerViewModel @Inject constructor(
     val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
     private val _getHashSuccess = SingleLiveEvent<String>()
     val getHashSuccess: LiveData<String> get() = _getHashSuccess
-    private val _getHashError = SingleLiveEvent<Throwable>()
-    val getHashError: LiveData<Throwable> get() = _getHashError
+    val bottomMessageError = SingleLiveEvent<String>()
+    val bottomSheetError = SingleLiveEvent<Pair<String, String>>()
     val clientHash = peerToPeerManager.clientConnected
     private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
     val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
@@ -110,32 +110,35 @@ class PeerToPeerViewModel @Inject constructor(
                 }
 
                 RegisterPeerResult.InvalidPin -> {
-                    _getHashError.postValue(Exception("Invalid PIN"))
+                    bottomMessageError.postValue("Invalid PIN")
                 }
 
                 RegisterPeerResult.InvalidFormat -> {
-                    _getHashError.postValue(Exception("Invalid request format"))
+                    bottomMessageError.postValue("Invalid request format")
                 }
 
                 RegisterPeerResult.Conflict -> {
-                    _getHashError.postValue(Exception("Active session already exists"))
+                    bottomMessageError.postValue("Active session already exists")
                 }
 
                 RegisterPeerResult.TooManyRequests -> {
-                    _getHashError.postValue(Exception("Too many requests, try again later"))
+                    bottomMessageError.postValue("Too many requests, try again later")
                 }
 
                 RegisterPeerResult.ServerError -> {
-                    _getHashError.postValue(Exception("Server error, try again later"))
+                    bottomMessageError.postValue("Server error, try again later")
                 }
 
                 RegisterPeerResult.RejectedByReceiver -> {
-                    _getHashError.postValue(Exception("Receiver rejected the registration"))
+                    bottomMessageError.postValue("Receiver rejected the registration")
                 }
 
                 is RegisterPeerResult.Failure -> {
-                    Timber.e(result.exception, "Registration failed")
-                    _getHashError.postValue(result.exception)
+                    Timber.e(result.exception, "Connection failure")
+                    bottomSheetError.postValue(
+                        "Connection failed" to
+                                "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+                    )
                 }
             }
         }
@@ -159,7 +162,10 @@ class PeerToPeerViewModel @Inject constructor(
 
             }.onFailure { error ->
                 Timber.d("error ***** $error")
-                _getHashError.postValue(error)
+                bottomSheetError.postValue(
+                    "Connection failed" to
+                            "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+                )
             }
         }
     }
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index 47293ef16..26aba9d01 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -1003,4 +1003,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
   <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-be/strings.xml b/mobile/src/main/res/values-be/strings.xml
index cd0b91ffc..02908261b 100644
--- a/mobile/src/main/res/values-be/strings.xml
+++ b/mobile/src/main/res/values-be/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-blk/strings.xml b/mobile/src/main/res/values-blk/strings.xml
index 2a313d4cb..5ea8e3ff1 100644
--- a/mobile/src/main/res/values-blk/strings.xml
+++ b/mobile/src/main/res/values-blk/strings.xml
@@ -142,4 +142,6 @@
     <string name="feedback_sent_msg">Your feedback has been sent</string>
     <string name="share_feedback_action">share feedback</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-bn/strings.xml b/mobile/src/main/res/values-bn/strings.xml
index 0dbe34939..25ee1f8f2 100644
--- a/mobile/src/main/res/values-bn/strings.xml
+++ b/mobile/src/main/res/values-bn/strings.xml
@@ -984,4 +984,6 @@
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+ <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-es-rCU/strings.xml b/mobile/src/main/res/values-es-rCU/strings.xml
index 4a0dae9f7..77c3e374f 100644
--- a/mobile/src/main/res/values-es-rCU/strings.xml
+++ b/mobile/src/main/res/values-es-rCU/strings.xml
@@ -1005,4 +1005,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index 3386c00f5..7fe505fa4 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -988,4 +988,6 @@ Este feedback es anónimo, así que asegúrate de incluir tu información de con
   <string name="Collect_MediaWidget_Attach_File">Adjuntar archivo</string>
   <string name="form_successfully_submitted">%1$s eviado correctamente</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-fa-rIR/strings.xml b/mobile/src/main/res/values-fa-rIR/strings.xml
index a35c05c72..68d5d66b6 100644
--- a/mobile/src/main/res/values-fa-rIR/strings.xml
+++ b/mobile/src/main/res/values-fa-rIR/strings.xml
@@ -1001,4 +1001,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index 92a94193d..7dbf91262 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -998,4 +998,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-hdpi/strings.xml b/mobile/src/main/res/values-hdpi/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-hdpi/strings.xml
+++ b/mobile/src/main/res/values-hdpi/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index 5eb7d714a..e64827853 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -986,4 +986,6 @@ Apakah Anda ingin membagikan analitik kepada tim Tella?</string>
   <string name="Collect_MediaWidget_Attach_File">Lampirkan berkas</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-kac/strings.xml b/mobile/src/main/res/values-kac/strings.xml
index ca83e630b..6e755dcd0 100644
--- a/mobile/src/main/res/values-kac/strings.xml
+++ b/mobile/src/main/res/values-kac/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-kn/strings.xml b/mobile/src/main/res/values-kn/strings.xml
index 68cb63707..6681f7b22 100644
--- a/mobile/src/main/res/values-kn/strings.xml
+++ b/mobile/src/main/res/values-kn/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-ksw/strings.xml b/mobile/src/main/res/values-ksw/strings.xml
index e2d812a15..ef08d50d1 100644
--- a/mobile/src/main/res/values-ksw/strings.xml
+++ b/mobile/src/main/res/values-ksw/strings.xml
@@ -987,4 +987,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-ku/strings.xml b/mobile/src/main/res/values-ku/strings.xml
index 88200b941..911593d8d 100644
--- a/mobile/src/main/res/values-ku/strings.xml
+++ b/mobile/src/main/res/values-ku/strings.xml
@@ -999,4 +999,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-mdpi/strings.xml b/mobile/src/main/res/values-mdpi/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-mdpi/strings.xml
+++ b/mobile/src/main/res/values-mdpi/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ml/strings.xml b/mobile/src/main/res/values-ml/strings.xml
index 8be73fa59..66403f6c3 100644
--- a/mobile/src/main/res/values-ml/strings.xml
+++ b/mobile/src/main/res/values-ml/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-my/strings.xml b/mobile/src/main/res/values-my/strings.xml
index 0a23a7884..e23266056 100644
--- a/mobile/src/main/res/values-my/strings.xml
+++ b/mobile/src/main/res/values-my/strings.xml
@@ -987,4 +987,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-ndc/strings.xml b/mobile/src/main/res/values-ndc/strings.xml
index e10faa1c3..826c63970 100644
--- a/mobile/src/main/res/values-ndc/strings.xml
+++ b/mobile/src/main/res/values-ndc/strings.xml
@@ -978,4 +978,6 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="Collect_MediaWidget_Attach_File">Kuisa gwaro mapwepo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt-rMZ/strings.xml b/mobile/src/main/res/values-pt-rMZ/strings.xml
index a18e9217f..4e8d3e6f3 100644
--- a/mobile/src/main/res/values-pt-rMZ/strings.xml
+++ b/mobile/src/main/res/values-pt-rMZ/strings.xml
@@ -990,4 +990,6 @@ Gostaria de partilhar dados com a equipa do Tella?</string>
   <string name="Collect_MediaWidget_Attach_File">Anexar arquivo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index c0bd0c369..cca390370 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index 31a6be0bc..6dbfa6f3e 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1014,4 +1014,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-sn-rZW/strings.xml b/mobile/src/main/res/values-sn-rZW/strings.xml
index e10faa1c3..826c63970 100644
--- a/mobile/src/main/res/values-sn-rZW/strings.xml
+++ b/mobile/src/main/res/values-sn-rZW/strings.xml
@@ -978,4 +978,6 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="Collect_MediaWidget_Attach_File">Kuisa gwaro mapwepo</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-sw600dp/strings.xml b/mobile/src/main/res/values-sw600dp/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-sw600dp/strings.xml
+++ b/mobile/src/main/res/values-sw600dp/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ta/strings.xml b/mobile/src/main/res/values-ta/strings.xml
index 9c5087049..5e59a8067 100644
--- a/mobile/src/main/res/values-ta/strings.xml
+++ b/mobile/src/main/res/values-ta/strings.xml
@@ -1004,4 +1004,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 9dd131245..5a70fe746 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -984,4 +984,6 @@ Tella ekibiyle analizleri paylaşmak ister misiniz?</string>
   <string name="Collect_MediaWidget_Attach_File">Dosya ekle</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-ts/strings.xml b/mobile/src/main/res/values-ts/strings.xml
index 3f77cd650..357000ae3 100644
--- a/mobile/src/main/res/values-ts/strings.xml
+++ b/mobile/src/main/res/values-ts/strings.xml
@@ -974,4 +974,6 @@ yi fanele ku ku nyika vutshokotshoko bya servhidor.</string>
   <string name="Collect_MediaWidget_Attach_File">Nghenisa arkivho</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-v21/strings.xml
+++ b/mobile/src/main/res/values-v21/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-v26/strings.xml b/mobile/src/main/res/values-v26/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-v26/strings.xml
+++ b/mobile/src/main/res/values-v26/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-vi/strings.xml b/mobile/src/main/res/values-vi/strings.xml
index 1285723ee..6bcd0bb37 100644
--- a/mobile/src/main/res/values-vi/strings.xml
+++ b/mobile/src/main/res/values-vi/strings.xml
@@ -994,4 +994,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
diff --git a/mobile/src/main/res/values-w820dp/strings.xml b/mobile/src/main/res/values-w820dp/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-w820dp/strings.xml
+++ b/mobile/src/main/res/values-w820dp/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xhdpi/strings.xml b/mobile/src/main/res/values-xhdpi/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-xhdpi/strings.xml
+++ b/mobile/src/main/res/values-xhdpi/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xxhdpi/strings.xml b/mobile/src/main/res/values-xxhdpi/strings.xml
index 67ac84b3d..8f72f3128 100644
--- a/mobile/src/main/res/values-xxhdpi/strings.xml
+++ b/mobile/src/main/res/values-xxhdpi/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index cefc0ca6a..55e34ebe5 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1054,4 +1054,7 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
   <string name="sending_files">Sending files</string>
   <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+  <string name="try_again">Try again</string>
 </resources>

From 549583518948b5c749d29e7e7094090da23f9e44 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 15 Jul 2025 12:00:41 +0100
Subject: [PATCH 074/153] wip recipient flow in upload

---
 .../mobile/data/database/DataSource.java      |  1 -
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 15 ----
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 76 +++++++++++++++++--
 .../managers/PeerServerStarterManager.kt      |  1 -
 .../domain/peertopeer/PeerEventManager.kt     | 49 +++++++++---
 .../domain/peertopeer/PeerRegisterPayload.kt  |  1 -
 .../tella/mobile/media/MediaFileHandler.java  |  1 +
 .../activity/camera/SharedCameraViewModel.kt  | 16 ++--
 .../RecipientUploadFilesFragment.kt           |  8 +-
 .../RecipientVerificationFragment.kt          |  1 -
 .../viewmodel/FileTransferViewModel.kt        |  1 -
 .../viewmodel/PeerToPeerViewModel.kt          | 10 ++-
 .../attachements/AttachmentsViewModel.kt      |  4 +-
 13 files changed, 131 insertions(+), 53 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/database/DataSource.java b/mobile/src/main/java/org/horizontal/tella/mobile/data/database/DataSource.java
index f671bb596..c53a996e8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/database/DataSource.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/database/DataSource.java
@@ -5,7 +5,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.text.TextUtils;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 57accb6b7..6077e7a8e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -35,7 +35,6 @@ import javax.net.ssl.X509TrustManager
 
 class TellaPeerToPeerClient @Inject constructor(){
 
-
     private fun getClientWithFingerprintValidation(expectedFingerprint: String): OkHttpClient {
         val trustManager = object : X509TrustManager {
             override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
@@ -92,13 +91,6 @@ class TellaPeerToPeerClient @Inject constructor(){
                     return@use parseSessionIdFromResponse(body)
                 }
 
-                Timber.w(
-                    """registerPeerDevice failed
-                   Status: ${response.code}
-                   URL: $url
-                   Body: $body""".trimIndent()
-                )
-
                 return@use when (response.code) {
                     400 -> RegisterPeerResult.InvalidFormat
                     401 -> RegisterPeerResult.InvalidPin
@@ -179,11 +171,6 @@ class TellaPeerToPeerClient @Inject constructor(){
     private fun parseTransmissionId(body: String): PrepareUploadResult {
         return try {
             val response = Json.decodeFromString<PeerPrepareUploadResponse>(body)
-
-            response.files.forEach {
-             //   PeerSessionManager.saveTransmissionId(it.id, it.transmissionId)
-            }
-
             PrepareUploadResult.Success(response.files)
         } catch (e: Exception) {
             Timber.e(e, "Invalid JSON response: %s", body)
@@ -240,6 +227,4 @@ class TellaPeerToPeerClient @Inject constructor(){
         }
     }
 
-
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 4d9fd7002..4c7f089d6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -11,6 +11,7 @@ import io.ktor.server.engine.sslConnector
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
+import io.ktor.server.request.receiveStream
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
@@ -19,10 +20,9 @@ import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
@@ -42,6 +42,7 @@ import java.util.UUID
 
 const val port = 53317
 
+//TODO THIS CLASS MUST BE INJECTED
 class TellaPeerToPeerServer(
     private val ip: String,
     private val serverPort: Int = port,
@@ -105,7 +106,6 @@ class TellaPeerToPeerServer(
                             return@post
                         }
 
-                        //TODO CHECK IF THE PIN IS CORRECT
                         if (!isValidPin(request.pin) || pin != request.pin) {
                             call.respond(HttpStatusCode.Unauthorized, "Invalid PIN")
                             return@post
@@ -116,11 +116,6 @@ class TellaPeerToPeerServer(
                             return@post
                         }
 
-                        // if (isRateLimited(...)) {
-                        //     call.respond(HttpStatusCode.TooManyRequests, "Too many requests")
-                        //     return@post
-                        // }
-
                         val sessionId = UUID.randomUUID().toString()
                         val session = PeerResponse(sessionId)
                         serverSession = session
@@ -195,12 +190,77 @@ class TellaPeerToPeerServer(
                             call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
                         }
                     }
+
+                    post(PeerApiRoutes.UPLOAD) {
+                        val sessionId = call.parameters["sessionId"]
+                        val fileId = call.parameters["fileId"]
+                        val transmissionId = call.parameters["transmissionId"]
+
+                        if (sessionId == null || fileId == null || transmissionId == null) {
+                            call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
+                            return@post
+                        }
+
+                        if (sessionId != serverSession?.sessionId || sessionId != p2PSharedState.session?.sessionId) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                            return@post
+                        }
+
+                        val session = p2PSharedState.session
+                        val progressFile = session?.files?.get(transmissionId)
+
+                        if (progressFile == null || progressFile.file.id != fileId) {
+                            call.respond(HttpStatusCode.NotFound, "File not found in session")
+                            return@post
+                        }
+
+                        val tmpFile = createTempFile(prefix = "p2p_", suffix = "_$fileId")
+                        val output = tmpFile.outputStream().buffered()
+
+                        try {
+                            val input = call.receiveStream().buffered()
+                            val totalBytesExpected = progressFile.file.size
+                            var bytesRead = 0L
+                            val buffer = ByteArray(8192)
+
+                            while (true) {
+                                val read = input.read(buffer)
+                                if (read == -1) break
+                                output.write(buffer, 0, read)
+                                bytesRead += read
+
+                                progressFile.bytesTransferred = bytesRead.toInt()
+                                PeerEventManager.onUploadProgressState(
+                                  p2PSharedState
+                                )
+                            }
+
+                            progressFile.status = P2PFileStatus.FINISHED
+                            progressFile.path = tmpFile.absolutePath
+
+
+                            call.respond(HttpStatusCode.OK, "Upload complete")
+                        } catch (e: Exception) {
+                            progressFile.status = P2PFileStatus.FAILED
+                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
+                        } finally {
+                            output.close()
+                        }
+                    }
+
+
                 }
 
             }
         }).start(wait = false)
     }
 
+    private fun calculatePercent(files: Collection<ProgressFile>): Int {
+        val uploaded = files.sumOf { it.bytesTransferred.toLong() }
+        val total = files.sumOf { it.file.size }
+        return if (total > 0) ((uploaded * 100) / total).toInt() else 0
+    }
+
     override fun stop() {
         engine?.stop(1000, 5000)
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 3dc6c0b53..89794d12c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -39,7 +39,6 @@ class PeerServerStarterManager @Inject constructor(
         }
     }
 
-    //TODO: AHLEM CHECK WHERE WE WANT TO STOP THE SERVER
     fun stopServer() {
         CoroutineScope(Dispatchers.IO).launch {
             server?.stop()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 632a21f3c..dbdbc292a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -3,43 +3,67 @@ package org.horizontal.tella.mobile.domain.peertopeer
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 
 /**
  * Created by wafa on 3/6/2025.
  */
 object PeerEventManager {
 
-    // MutableSharedFlow to emit registration events, replay 1 to send last event to new collectors
     val registrationEvents = MutableSharedFlow<Boolean>(replay = 1)
-    private val _registrationRequests = MutableSharedFlow<Pair<String, PeerRegisterPayload>>(replay = 1)
+    private val _registrationRequests =
+        MutableSharedFlow<Pair<String, PeerRegisterPayload>>(replay = 1)
     val registrationRequests = _registrationRequests.asSharedFlow()
-
     private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+    private val _prepareUploadEvents = MutableSharedFlow<PrepareUploadRequest>(replay = 1)
+    val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
+    private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+    private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 1)
+    val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
+
+
+    suspend fun onUploadProgressState(p2PSharedState : P2PSharedState) {
+        val session = p2PSharedState.session
+        val files = session?.files?.values?.toList() ?: emptyList()
+
+        val totalSize = files.sumOf { it.file.size }
+        val uploaded = files.sumOf { it.bytesTransferred }
+        val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+
+        val state = session?.status?.let {
+            UploadProgressState(
+                percent = percent,
+                sessionStatus = it,
+                files = files
+            )
+        }
+
+        if (state != null) {
+            _uploadProgressStateFlow.emit(state)
+        }
+    }
 
-    // Call this when registration succeeds
     suspend fun emitRegistrationSuccess() {
         registrationEvents.emit(true)
     }
 
-    // we can add emitRegistrationFailure or other event types if needed
-    private val _prepareUploadEvents = MutableSharedFlow<PrepareUploadRequest>(replay = 1)
-    val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
-
-    private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
-
     suspend fun emitPrepareUploadRequest(request: PrepareUploadRequest): Boolean {
         val deferred = CompletableDeferred<Boolean>()
         decisionMap[request.sessionId] = deferred
         _prepareUploadEvents.emit(request)
-        return deferred.await() // Wait for UI decision
+        return deferred.await()
     }
 
     fun resolveUserDecision(sessionId: String, accepted: Boolean) {
         decisionMap.remove(sessionId)?.complete(accepted)
     }
 
-    suspend fun emitIncomingRegistrationRequest(registrationId: String, payload: PeerRegisterPayload): Boolean {
+    suspend fun emitIncomingRegistrationRequest(
+        registrationId: String,
+        payload: PeerRegisterPayload
+    ): Boolean {
         val deferred = CompletableDeferred<Boolean>()
         registrationDecisionMap[registrationId] = deferred
         _registrationRequests.emit(registrationId to payload)
@@ -49,4 +73,5 @@ object PeerEventManager {
     fun confirmRegistration(registrationId: String, accepted: Boolean) {
         registrationDecisionMap.remove(registrationId)?.complete(accepted)
     }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
index 9ae20e47e..4386df941 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
@@ -7,5 +7,4 @@ import java.util.UUID
 data class PeerRegisterPayload(
     val pin: String,
     val nonce: String = UUID.randomUUID().toString(),
-   // val autoAccept: Boolean = false,
 )
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/media/MediaFileHandler.java b/mobile/src/main/java/org/horizontal/tella/mobile/media/MediaFileHandler.java
index d9bc46057..e2752f61d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/media/MediaFileHandler.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/media/MediaFileHandler.java
@@ -423,6 +423,7 @@ public static Single<VaultFile> importOthersUri(Context context, Uri uri, String
             assert DocumentFile.fromSingleUri(context, uri) != null;
             RxVault rxVault = MyApplication.keyRxVault.getRxVault().blockingFirst();
 
+            assert DocumentFile.fromSingleUri(context, uri) != null;
             return rxVault
                     .builder(is)
                     .setMimeType(mimeType)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/camera/SharedCameraViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/camera/SharedCameraViewModel.kt
index df9749e1d..65cb9f849 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/camera/SharedCameraViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/camera/SharedCameraViewModel.kt
@@ -62,7 +62,8 @@ class SharedCameraViewModel @Inject constructor() : ViewModel() {
                     thumb = null
                 )
                 _addingInProgress.postValue(true)
-                MyApplication.bus().post(RecentBackgroundActivitiesEvent(mutableListOf(backgroundVideoFile)))
+                MyApplication.bus()
+                    .post(RecentBackgroundActivitiesEvent(mutableListOf(backgroundVideoFile)))
             }
             .observeOn(AndroidSchedulers.mainThread())
             .doFinally { _addingInProgress.postValue(false) }
@@ -75,7 +76,6 @@ class SharedCameraViewModel @Inject constructor() : ViewModel() {
         )
     }
 
-
     fun addMp4Video(file: File, parent: String?) {
         disposables.add(Observable.fromCallable { MediaFileHandler.saveMp4Video(file, parent) }
             .subscribeOn(Schedulers.io()).doOnSubscribe {
@@ -124,11 +124,13 @@ class SharedCameraViewModel @Inject constructor() : ViewModel() {
         disposables.add(
             MediaFileHandler.getLastVaultFileFromDb().subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ vaultFiles ->   if (!vaultFiles.isNullOrEmpty()) {
-                    _lastMediaFileSuccess.postValue(vaultFiles[0])
-                } else {
-                    _lastMediaFileError.postValue(Throwable("No media files found"))
-                } },
+                .subscribe({ vaultFiles ->
+                    if (!vaultFiles.isNullOrEmpty()) {
+                        _lastMediaFileSuccess.postValue(vaultFiles[0])
+                    } else {
+                        _lastMediaFileError.postValue(Throwable("No media files found"))
+                    }
+                },
                     { throwable -> _lastMediaFileError.postValue(throwable) })
         )
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index b71cc5d94..c0bcdeec8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -8,15 +8,16 @@ import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
-import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
-    private val viewModel: FileTransferViewModel by activityViewModels()
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     @Inject
     lateinit var p2PSharedState: P2PSharedState
@@ -45,6 +46,9 @@ class RecipientUploadFilesFragment :
     }
 
     private fun observeUploadProgress() {
+        viewModel.uploadProgress.observe(viewLifecycleOwner) { state ->
+            Timber.d("State "+ state?.percent + " Status: "+state?.sessionStatus?.name)
+        }
 
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 3f8911e89..efa933f27 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -41,7 +41,6 @@ class RecipientVerificationFragment :
         toolbar.backClickListener = { navigateBackAndStopServer() }
         discardBtn.setOnClickListener { navigateBackAndStopServer() }
 
-        // Button is disabled until a request is received.
         confirmAndConnectBtn.setOnClickListener(null)
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index b4fe0b659..51fc7c808 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -101,7 +101,6 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
-
     fun uploadAllFiles() {
         viewModelScope.launch {
             val session = p2PSharedState.session ?: return@launch
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 3c9fe6dff..6dd974176 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -23,6 +23,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -52,6 +53,8 @@ class PeerToPeerViewModel @Inject constructor(
     val incomingRequest: StateFlow<IncomingRegistration?> = _incomingRequest
     private val networkInfoManager = NetworkInfoManager(context)
     val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
+    private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
+    val uploadProgress: SingleLiveEvent<UploadProgressState?> = _uploadProgress
 
     init {
         viewModelScope.launch {
@@ -71,12 +74,17 @@ class PeerToPeerViewModel @Inject constructor(
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
 
                 if (!p2PState.isUsingManualConnection) {
-                    // QR-mode: auto-accept immediately
                     PeerEventManager.confirmRegistration(registrationId, true)
                     _registrationSuccess.postValue(true)
                 }
             }
         }
+
+        viewModelScope.launch {
+            PeerEventManager.uploadProgressStateFlow.collect { state ->
+
+            }
+        }
     }
 
     fun resetRegistrationState() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
index 6616a8439..b2f3c2517 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
@@ -57,7 +57,6 @@ class AttachmentsViewModel @Inject constructor(
     val duplicateNameError: LiveData<Boolean> = _duplicateNameError
     val counterData = MutableLiveData<Int>()
 
-    //TODO AHLEM FIX THIS val counterData: LiveData<Int> = _counterData
     private val _progressPercent = MutableLiveData<Pair<Double, Int>>()
     val progressPercent: LiveData<Pair<Double, Int>> = _progressPercent
     private val _mediaImportedWithDelete = MutableLiveData<Uri>()
@@ -222,8 +221,7 @@ class AttachmentsViewModel @Inject constructor(
 
     fun importVaultFiles(uris: List<Uri>, parentId: String?, deleteOriginal: Boolean) {
         if (uris.isEmpty()) return
-        // counterData.value = 0
-        //  var counter = 1
+
         var currentUri: Uri? = null
         disposables.add(Flowable.fromIterable(uris).flatMap { uri ->
             MediaFileHandler.importVaultFileUri(getApplication(), uri, parentId).toFlowable()

From 49891c92087069985fd7a4108b0d0430fcd08bc0 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 15 Jul 2025 17:49:10 +0100
Subject: [PATCH 075/153] WIP sending problem

---
 .../mobile/data/peertopeer/TellaPeerToPeerClient.kt |  3 ++-
 .../mobile/data/peertopeer/TellaPeerToPeerServer.kt | 13 +++++++------
 .../mobile/domain/peertopeer/UploadProgressEvent.kt |  7 +++++++
 .../peertopeer/viewmodel/FileTransferViewModel.kt   |  7 ++++++-
 .../peertopeer/viewmodel/PeerToPeerViewModel.kt     |  1 +
 .../viewmodel/state/UploadProgressState.kt          | 10 ++++++++++
 6 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/UploadProgressEvent.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 6077e7a8e..f37890552 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -187,7 +187,6 @@ class TellaPeerToPeerClient @Inject constructor(){
         }
     }
 
-
     suspend fun uploadFileWithProgress(
         ip: String,
         port: String,
@@ -199,6 +198,8 @@ class TellaPeerToPeerClient @Inject constructor(){
         fileSize: Long,
         onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
+
+        Timber.d("session id from the client+$sessionId")
         val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
 
         val client = getClientWithFingerprintValidation(expectedFingerprint)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 4c7f089d6..e6c19779e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -35,6 +35,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
+import timber.log.Timber
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
@@ -118,6 +119,7 @@ class TellaPeerToPeerServer(
 
                         val sessionId = UUID.randomUUID().toString()
                         val session = PeerResponse(sessionId)
+                        p2PSharedState.session?.sessionId = sessionId
                         serverSession = session
 
                         val accepted = try {
@@ -161,11 +163,7 @@ class TellaPeerToPeerServer(
 
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
                         if (accepted) {
-                            val sessionId = serverSession?.sessionId ?: run {
-                                call.respond(HttpStatusCode.InternalServerError, "Missing session")
-                                return@post
-                            }
-                            p2PSharedState.session?.sessionId = sessionId
+
                             val session = P2PSession(title = request.title)
 
                             val responseFiles = request.files.map { file ->
@@ -196,12 +194,15 @@ class TellaPeerToPeerServer(
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
 
+                        Timber.d("session id from the server +$sessionId")
+
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
                             return@post
                         }
 
-                        if (sessionId != serverSession?.sessionId || sessionId != p2PSharedState.session?.sessionId) {
+                        if (sessionId != p2PSharedState.session?.sessionId) {
+                            Timber.d("session Id")
                             call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
                             return@post
                         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/UploadProgressEvent.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/UploadProgressEvent.kt
new file mode 100644
index 000000000..15d888c50
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/UploadProgressEvent.kt
@@ -0,0 +1,7 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+data class UploadProgressEvent(
+    val fileId: String,
+    val bytesWritten: Long,
+    val totalBytes: Long
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 51fc7c808..d5a99101e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -1,5 +1,6 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
+import android.annotation.SuppressLint
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -61,6 +62,7 @@ class FileTransferViewModel @Inject constructor(
     }
 
     fun prepareUploadsFromVaultFiles() {
+        Timber.d("session id ***prepareUploadsFromVaultFiles ${p2PSharedState.session?.sessionId}")
 
         viewModelScope.launch {
             when (val result = peerClient.prepareUpload(
@@ -97,6 +99,8 @@ class FileTransferViewModel @Inject constructor(
                 is PrepareUploadResult.Failure -> {
                     Timber.e(result.exception, "Unhandled error during upload")
                 }
+
+                else -> {}
             }
         }
     }
@@ -119,11 +123,12 @@ class FileTransferViewModel @Inject constructor(
 
                 try {
                     if (inputStream != null) {
+                        Timber.d("session id ***uploadAllFiles ${getSessionId()}")
                         peerClient.uploadFileWithProgress(
                             ip = ip,
                             port = port,
                             expectedFingerprint = fingerprint,
-                            sessionId = session.sessionId,
+                            sessionId = getSessionId(),
                             fileId = progressFile.file.id,
                             transmissionId = progressFile.transmissionId.orEmpty(),
                             inputStream = inputStream,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 6dd974176..c572fe5d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -113,6 +113,7 @@ class PeerToPeerViewModel @Inject constructor(
                     with(p2PState) {
                         this.session?.sessionId = result.sessionId
                     }
+                    Timber.d("session id ***startRegistration ${p2PState.session?.sessionId}")
 
                     _registrationSuccess.postValue(true)
                 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt
new file mode 100644
index 000000000..e8ca736e4
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt
@@ -0,0 +1,10 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state
+
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
+
+data class UploadProgressState(
+    val percent: Int,
+    val sessionStatus: SessionStatus,
+    val files: List<ProgressFile>
+)
\ No newline at end of file

From 3c352531351b8a6b3f6887bdd9c79c1a5d41ae1e Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 15 Jul 2025 18:57:13 +0100
Subject: [PATCH 076/153] change post to put

---
 .../data/peertopeer/TellaPeerToPeerClient.kt    |  2 +-
 .../data/peertopeer/TellaPeerToPeerServer.kt    | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index f37890552..f67f64e67 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -208,7 +208,7 @@ class TellaPeerToPeerClient @Inject constructor(){
 
         val request = Request.Builder()
             .url(url)
-            .post(requestBody)
+            .put(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
             .build()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index e6c19779e..580a651d3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -16,6 +16,7 @@ import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
+import io.ktor.server.routing.put
 import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -189,7 +190,7 @@ class TellaPeerToPeerServer(
                         }
                     }
 
-                    post(PeerApiRoutes.UPLOAD) {
+                    put(PeerApiRoutes.UPLOAD) {
                         val sessionId = call.parameters["sessionId"]
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
@@ -198,13 +199,13 @@ class TellaPeerToPeerServer(
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
-                            return@post
+                            return@put
                         }
 
                         if (sessionId != p2PSharedState.session?.sessionId) {
                             Timber.d("session Id")
                             call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
-                            return@post
+                            return@put
                         }
 
                         val session = p2PSharedState.session
@@ -212,7 +213,7 @@ class TellaPeerToPeerServer(
 
                         if (progressFile == null || progressFile.file.id != fileId) {
                             call.respond(HttpStatusCode.NotFound, "File not found in session")
-                            return@post
+                            return@put
                         }
 
                         val tmpFile = createTempFile(prefix = "p2p_", suffix = "_$fileId")
@@ -220,7 +221,6 @@ class TellaPeerToPeerServer(
 
                         try {
                             val input = call.receiveStream().buffered()
-                            val totalBytesExpected = progressFile.file.size
                             var bytesRead = 0L
                             val buffer = ByteArray(8192)
 
@@ -232,7 +232,7 @@ class TellaPeerToPeerServer(
 
                                 progressFile.bytesTransferred = bytesRead.toInt()
                                 PeerEventManager.onUploadProgressState(
-                                  p2PSharedState
+                                    p2PSharedState
                                 )
                             }
 
@@ -243,7 +243,10 @@ class TellaPeerToPeerServer(
                             call.respond(HttpStatusCode.OK, "Upload complete")
                         } catch (e: Exception) {
                             progressFile.status = P2PFileStatus.FAILED
-                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
+                            call.respond(
+                                HttpStatusCode.InternalServerError,
+                                "Upload failed: ${e.message}"
+                            )
                         } finally {
                             output.close()
                         }

From ae84efc85255592d7fc72c52447161069169f6a4 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 15 Jul 2025 19:59:26 +0100
Subject: [PATCH 077/153] Fix client upload code

---
 .../mobile/data/peertopeer/TellaPeerToPeerClient.kt   |  2 +-
 .../mobile/data/peertopeer/TellaPeerToPeerServer.kt   | 11 ++++++-----
 .../peertopeer/viewmodel/FileTransferViewModel.kt     |  9 +++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index f67f64e67..f37890552 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -208,7 +208,7 @@ class TellaPeerToPeerClient @Inject constructor(){
 
         val request = Request.Builder()
             .url(url)
-            .put(requestBody)
+            .post(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
             .build()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 580a651d3..caaaccbb5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -165,7 +165,8 @@ class TellaPeerToPeerServer(
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
                         if (accepted) {
 
-                            val session = P2PSession(title = request.title)
+                            val session =
+                                P2PSession(title = request.title, sessionId = request.sessionId)
 
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
@@ -190,7 +191,7 @@ class TellaPeerToPeerServer(
                         }
                     }
 
-                    put(PeerApiRoutes.UPLOAD) {
+                    post(PeerApiRoutes.UPLOAD) {
                         val sessionId = call.parameters["sessionId"]
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
@@ -199,13 +200,13 @@ class TellaPeerToPeerServer(
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
-                            return@put
+                            return@post
                         }
 
                         if (sessionId != p2PSharedState.session?.sessionId) {
                             Timber.d("session Id")
                             call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
-                            return@put
+                            return@post
                         }
 
                         val session = p2PSharedState.session
@@ -213,7 +214,7 @@ class TellaPeerToPeerServer(
 
                         if (progressFile == null || progressFile.file.id != fileId) {
                             call.respond(HttpStatusCode.NotFound, "File not found in session")
-                            return@put
+                            return@post
                         }
 
                         val tmpFile = createTempFile(prefix = "p2p_", suffix = "_$fileId")
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index d5a99101e..4c04183b9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -26,7 +26,6 @@ import org.horizontal.tella.mobile.util.fromJsonToObjectList
 import timber.log.Timber
 import javax.inject.Inject
 
-
 @HiltViewModel
 class FileTransferViewModel @Inject constructor(
     private val peerClient: TellaPeerToPeerClient,
@@ -100,7 +99,6 @@ class FileTransferViewModel @Inject constructor(
                     Timber.e(result.exception, "Unhandled error during upload")
                 }
 
-                else -> {}
             }
         }
     }
@@ -120,7 +118,7 @@ class FileTransferViewModel @Inject constructor(
                     MediaFileHandler.getStream(vaultFile)
 
                 progressFile.status = P2PFileStatus.SENDING
-
+                var percent = 0
                 try {
                     if (inputStream != null) {
                         Timber.d("session id ***uploadAllFiles ${getSessionId()}")
@@ -137,12 +135,11 @@ class FileTransferViewModel @Inject constructor(
                             progressFile.bytesTransferred = written.toInt()
 
                             val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                            val percent =
+                             percent =
                                 if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
-                            _uploadProgress.postValue(percent)
                         }
                     }
-
+                    _uploadProgress.postValue(percent)
                     progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
                     progressFile.status = P2PFileStatus.FAILED

From 1a94fab0dbbab8f32a3642d3d964c842c7789e8c Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 16 Jul 2025 09:58:26 +0100
Subject: [PATCH 078/153] wip errors in registration

---
 .../senderflow/ScanQrCodeFragment.kt          | 26 +++++++++++++++++++
 .../SenderManualConnectionFragment.kt         | 13 +++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 19b98806f..81972b300 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -12,10 +12,13 @@ import com.google.gson.Gson
 import com.journeyapps.barcodescanner.BarcodeCallback
 import com.journeyapps.barcodescanner.BarcodeResult
 import com.journeyapps.barcodescanner.CompoundBarcodeView
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.domain.peertopeer.PeerConnectionPayload
 import org.horizontal.tella.mobile.databinding.ScanQrcodeFragmentBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import org.hzontal.shared_ui.utils.DialogUtils
 
 class ScanQrCodeFragment :
     BaseBindingFragment<ScanQrcodeFragmentBinding>(ScanQrcodeFragmentBinding::inflate) {
@@ -74,6 +77,7 @@ class ScanQrCodeFragment :
 
                     } catch (e: Exception) {
                         e.printStackTrace()
+                        DialogUtils.showBottomMessage(baseActivity, "Invalid QR Code", true)
                         // Show a message: Invalid QR Code
                     }
                 }
@@ -128,6 +132,28 @@ class ScanQrCodeFragment :
             } else {
                 //  handle error UI
             }
+
+            viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
+                DialogUtils.showBottomMessage(baseActivity, message, true)
+            }
+
+            viewModel.bottomSheetError.observe(viewLifecycleOwner) { (title, description) ->
+                showStandardSheet(
+                    baseActivity.supportFragmentManager,
+                    title,
+                    description,
+                    null,
+                    getString(R.string.try_again),
+                    null,
+                 {
+                    viewModel.startRegistration(
+                        ip = viewModel.p2PState.ip,
+                        port = viewModel.p2PState.port,
+                        hash = viewModel.p2PState.hash,
+                        pin = viewModel.p2PState.pin.toString()
+                    )
+                })
+            }
         }
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index b779be8f9..dc9b5d9c1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -71,10 +71,15 @@ class SenderManualConnectionFragment :
                 description,
                 null,
                 getString(R.string.try_again),
-                null
-            ) {
-                activity?.onBackPressed()
-            }
+                null,
+             {
+                viewModel.startRegistration(
+                    ip = viewModel.p2PState.ip,
+                    port = viewModel.p2PState.port,
+                    hash = viewModel.p2PState.hash,
+                    pin = viewModel.p2PState.pin.toString()
+                )
+            })
         }
     }
 

From abee08ea4a1d185d2e067b2313a18ee1d9b99a60 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 16 Jul 2025 10:42:30 +0100
Subject: [PATCH 079/153] Fix regression

---
 .../fragment/peertopeer/senderflow/WaitingSenderFragment.kt  | 2 +-
 mobile/src/main/res/navigation/peer_to_peer_graph.xml        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
index b0c6bc408..6c1d87d5b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/WaitingSenderFragment.kt
@@ -42,8 +42,8 @@ class WaitingSenderFragment :
                 viewModel.p2PSharedState.session?.files?.let { filesMap ->
                     filesMap[fileInfo.id]?.transmissionId = fileInfo.transmissionId
                 }
-                navManager().navigateFromWaitingSenderFragmentToUploadFilesFragment()
             }
+            navManager().navigateFromWaitingSenderFragmentToUploadFilesFragment()
         }
 
     }
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 75c5e882e..c16a8bc82 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -136,6 +136,7 @@
             android:id="@+id/action_recipientSuccessFragment_to_recipientUploadFilesFragment"
             app:destination="@id/recipientUploadFilesFragment" />
     </fragment>
+
     <fragment
         android:id="@+id/waitingSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.WaitingSenderFragment"
@@ -143,11 +144,11 @@
         tools:layout="@layout/fragment_waiting">
         <action
             android:id="@+id/action_waitingSenderFragment_to_uploadFilesFragment"
-            app:destination="@id/uploadFilesFragment" />
+            app:destination="@id/uploadSenderFragment" />
     </fragment>
 
     <fragment
-        android:id="@+id/uploadFilesFragment"
+        android:id="@+id/uploadSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderUploadFilesFragment"
         android:label="UploadFilesFragment"
         tools:layout="@layout/fragment_upload_files" />

From 812ec135fa6cfde0efc70f4c3ff745f7d47e6fe0 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 16 Jul 2025 11:41:40 +0100
Subject: [PATCH 080/153] sender progress flow

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  1 -
 .../senderflow/SenderUploadFilesFragment.kt   | 10 ++---
 .../viewmodel/FileTransferViewModel.kt        | 43 +++++++++++++++----
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index caaaccbb5..9b8548b38 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -16,7 +16,6 @@ import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
-import io.ktor.server.routing.put
 import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index d6740ff10..2dce9107d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -17,9 +17,9 @@ class SenderUploadFilesFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        viewModel.uploadAllFiles()
         showFormEndView()
         observeUploadProgress()
-        viewModel.uploadAllFiles()
     }
 
     private fun showFormEndView() {
@@ -36,10 +36,10 @@ class SenderUploadFilesFragment :
     }
 
     private fun observeUploadProgress() {
-        viewModel.uploadProgress.observe(viewLifecycleOwner) { percent ->
-            viewModel.p2PSharedState.session?.let { session ->
-                endView.setUploadProgress(session.files.values.toList(), percent.toFloat())
-            }
+        viewModel.uploadProgress.observe(viewLifecycleOwner) { state ->
+            val files = state.files
+            val percentFloat = state.percent / 100f
+            endView.setUploadProgress(files, percentFloat)
         }
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 4c04183b9..b3b4b9059 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -23,6 +23,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -35,8 +36,8 @@ class FileTransferViewModel @Inject constructor(
     val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
     private val _prepareRejected = MutableLiveData<Event<Boolean>>()
     val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
-    private val _uploadProgress = MutableLiveData<Int>() // value from 0 to 100
-    val uploadProgress: LiveData<Int> get() = _uploadProgress
+    private val _uploadProgress = MutableLiveData<UploadProgressState>()
+    val uploadProgress: LiveData<UploadProgressState> get() = _uploadProgress
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
@@ -114,11 +115,10 @@ class FileTransferViewModel @Inject constructor(
 
             session.files.values.forEach { progressFile ->
                 val vaultFile = progressFile.vaultFile ?: return@forEach
-                val inputStream =
-                    MediaFileHandler.getStream(vaultFile)
+                val inputStream = MediaFileHandler.getStream(vaultFile)
 
                 progressFile.status = P2PFileStatus.SENDING
-                var percent = 0
+
                 try {
                     if (inputStream != null) {
                         Timber.d("session id ***uploadAllFiles ${getSessionId()}")
@@ -135,11 +135,18 @@ class FileTransferViewModel @Inject constructor(
                             progressFile.bytesTransferred = written.toInt()
 
                             val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                             percent =
-                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                            val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+
+                            _uploadProgress.postValue(
+                                UploadProgressState(
+                                    percent = percent,
+                                    sessionStatus = session.status,
+                                    files = session.files.values.toList()
+                                )
+                            )
                         }
                     }
-                    _uploadProgress.postValue(percent)
+
                     progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
                     progressFile.status = P2PFileStatus.FAILED
@@ -147,9 +154,29 @@ class FileTransferViewModel @Inject constructor(
                 } finally {
                     inputStream?.close()
                 }
+
+                // Post state after each file is done
+                _uploadProgress.postValue(
+                    UploadProgressState(
+                        percent = session.files.values.sumOf { it.bytesTransferred }.let {
+                            if (totalSize > 0) ((it * 100) / totalSize).toInt() else 0
+                        },
+                        sessionStatus = session.status,
+                        files = session.files.values.toList()
+                    )
+                )
             }
 
             session.status = SessionStatus.FINISHED
+
+            // Final update after all uploads complete
+            _uploadProgress.postValue(
+                UploadProgressState(
+                    percent = 100,
+                    sessionStatus = session.status,
+                    files = session.files.values.toList()
+                )
+            )
         }
     }
 

From 1dff4f3756d56ae02ddf071614ca7b5d89253fa1 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 16 Jul 2025 12:48:28 +0100
Subject: [PATCH 081/153] wip cancel button

---
 .../mobile/views/activity/MainActivity.kt      |  7 +++++++
 .../receipentflow/PeerToPeerFlags.kt           |  8 ++++++++
 .../RecipientUploadFilesFragment.kt            | 18 ++++++++++++++++++
 .../senderflow/SenderUploadFilesFragment.kt    | 14 ++++++++++++++
 .../main/res/layout/fragment_upload_files.xml  |  1 -
 mobile/src/main/res/values-ar/strings.xml      |  2 ++
 mobile/src/main/res/values-be/strings.xml      |  2 ++
 mobile/src/main/res/values-blk/strings.xml     |  2 ++
 mobile/src/main/res/values-bn/strings.xml      |  2 ++
 mobile/src/main/res/values-es-rCU/strings.xml  |  2 ++
 mobile/src/main/res/values-es/strings.xml      |  2 ++
 mobile/src/main/res/values-fa-rIR/strings.xml  |  2 ++
 mobile/src/main/res/values-fr/strings.xml      |  2 ++
 mobile/src/main/res/values-hdpi/strings.xml    |  2 ++
 mobile/src/main/res/values-in/strings.xml      |  2 ++
 mobile/src/main/res/values-kac/strings.xml     |  2 ++
 mobile/src/main/res/values-kn/strings.xml      |  2 ++
 mobile/src/main/res/values-ksw/strings.xml     |  2 ++
 mobile/src/main/res/values-ku/strings.xml      |  2 ++
 mobile/src/main/res/values-mdpi/strings.xml    |  2 ++
 mobile/src/main/res/values-ml/strings.xml      |  2 ++
 mobile/src/main/res/values-my/strings.xml      |  2 ++
 mobile/src/main/res/values-ndc/strings.xml     |  2 ++
 mobile/src/main/res/values-pt-rMZ/strings.xml  |  2 ++
 mobile/src/main/res/values-pt/strings.xml      |  2 ++
 mobile/src/main/res/values-ru/strings.xml      |  2 ++
 mobile/src/main/res/values-sn-rZW/strings.xml  |  2 ++
 mobile/src/main/res/values-sw600dp/strings.xml |  2 ++
 mobile/src/main/res/values-ta/strings.xml      |  2 ++
 mobile/src/main/res/values-tr/strings.xml      |  2 ++
 mobile/src/main/res/values-ts/strings.xml      |  2 ++
 mobile/src/main/res/values-v21/strings.xml     |  2 ++
 mobile/src/main/res/values-v26/strings.xml     |  2 ++
 mobile/src/main/res/values-vi/strings.xml      |  2 ++
 mobile/src/main/res/values-w820dp/strings.xml  |  2 ++
 mobile/src/main/res/values-xhdpi/strings.xml   |  2 ++
 mobile/src/main/res/values-xxhdpi/strings.xml  |  2 ++
 mobile/src/main/res/values/strings.xml         |  3 +++
 38 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/PeerToPeerFlags.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
index 9e2bb2281..ec05290ac 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
@@ -40,6 +40,7 @@ import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseRepor
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseReportsEntryFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.BaseReportsSendFragment
 import org.horizontal.tella.mobile.views.fragment.main_connexions.base.MainReportFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.PeerToPeerFlags
 import org.horizontal.tella.mobile.views.fragment.recorder.MicFragment
 import org.horizontal.tella.mobile.views.fragment.reports.send.ReportsSendFragment
 import org.horizontal.tella.mobile.views.fragment.uwazi.SubmittedPreviewFragment
@@ -54,6 +55,7 @@ import org.horizontal.tella.mobile.views.fragment.vault.home.VAULT_FILTER
 import org.horizontal.tella.mobile.views.interfaces.IMainNavigationInterface
 import org.horizontal.tella.mobile.views.interfaces.VerificationWorkStatusCallback
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils
+import org.hzontal.shared_ui.utils.DialogUtils
 import permissions.dispatcher.NeedsPermission
 import timber.log.Timber
 
@@ -239,6 +241,7 @@ class MainActivity : MetadataActivity(), IMetadataAttachPresenterContract.IView,
         supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
             it.onActivityResult(requestCode, resultCode, data)
         }
+
     }
 
     private fun isLocationSettingsRequestCode(requestCode: Int): Boolean {
@@ -354,6 +357,10 @@ class MainActivity : MetadataActivity(), IMetadataAttachPresenterContract.IView,
         super.onResume()
         startLocationMetadataListening()
         mOrientationEventListener!!.enable()
+        if (PeerToPeerFlags.cancelled) {
+            PeerToPeerFlags.cancelled = false
+            DialogUtils.showBottomMessage(this, "Nearby sharing was cancelled.", false)
+        }
     }
 
     override fun onPause() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/PeerToPeerFlags.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/PeerToPeerFlags.kt
new file mode 100644
index 000000000..3f95c004b
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/PeerToPeerFlags.kt
@@ -0,0 +1,8 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
+
+/**
+ * Created by wafa on 16/7/2025.
+ */
+object PeerToPeerFlags {
+    var cancelled = false
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index c0bcdeec8..061f15690 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -1,15 +1,20 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import org.hzontal.shared_ui.utils.DialogUtils
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -28,6 +33,19 @@ class RecipientUploadFilesFragment :
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
         observeUploadProgress()
+        binding.cancel.setOnClickListener {
+            showStandardSheet(
+                baseActivity.supportFragmentManager,
+                getString(R.string.stop_sharing_files),
+                getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
+                getString(R.string.action_continue).uppercase(),
+                getString(R.string.stop).uppercase(),
+                {},
+                {
+                    PeerToPeerFlags.cancelled = true
+                    baseActivity.finish()
+                 })
+        }
     }
 
     private fun showFormEndView() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 2dce9107d..37a30da26 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -4,10 +4,12 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 
 class SenderUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
@@ -20,6 +22,17 @@ class SenderUploadFilesFragment :
         viewModel.uploadAllFiles()
         showFormEndView()
         observeUploadProgress()
+        viewModel.uploadAllFiles()
+        binding.cancel.setOnClickListener {
+            showStandardSheet(
+                baseActivity.supportFragmentManager,
+                getString(R.string.stop_sharing_files),
+                getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
+                getString(R.string.action_continue).uppercase(),
+                getString(R.string.stop).uppercase(),
+                {},
+                {})
+        }
     }
 
     private fun showFormEndView() {
@@ -29,6 +42,7 @@ class SenderUploadFilesFragment :
         endView = PeerToPeerEndView(
             baseActivity, session.title ?: "Transfer"
         )
+
         endView.setFiles(files, MyApplication.isConnectedToInternet(baseActivity), false)
         binding.endViewContainer.removeAllViews()
         binding.endViewContainer.addView(endView)
diff --git a/mobile/src/main/res/layout/fragment_upload_files.xml b/mobile/src/main/res/layout/fragment_upload_files.xml
index e19255272..b56564957 100644
--- a/mobile/src/main/res/layout/fragment_upload_files.xml
+++ b/mobile/src/main/res/layout/fragment_upload_files.xml
@@ -47,7 +47,6 @@
         android:layout_marginStart="@dimen/activity_horizontal_large_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_large_margin"
         android:layout_marginBottom="18dp"
-
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         />
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index 26aba9d01..51d078583 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -1005,4 +1005,6 @@ Would you like to share analytics with the Tella team?</string>
   <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-be/strings.xml b/mobile/src/main/res/values-be/strings.xml
index 02908261b..a29016ccf 100644
--- a/mobile/src/main/res/values-be/strings.xml
+++ b/mobile/src/main/res/values-be/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+  <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-blk/strings.xml b/mobile/src/main/res/values-blk/strings.xml
index 5ea8e3ff1..543cc4958 100644
--- a/mobile/src/main/res/values-blk/strings.xml
+++ b/mobile/src/main/res/values-blk/strings.xml
@@ -144,4 +144,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-bn/strings.xml b/mobile/src/main/res/values-bn/strings.xml
index 25ee1f8f2..082fe71cb 100644
--- a/mobile/src/main/res/values-bn/strings.xml
+++ b/mobile/src/main/res/values-bn/strings.xml
@@ -986,4 +986,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+ <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-es-rCU/strings.xml b/mobile/src/main/res/values-es-rCU/strings.xml
index 77c3e374f..8b9be4278 100644
--- a/mobile/src/main/res/values-es-rCU/strings.xml
+++ b/mobile/src/main/res/values-es-rCU/strings.xml
@@ -1007,4 +1007,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+  <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index 7fe505fa4..a36797464 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -990,4 +990,6 @@ Este feedback es anónimo, así que asegúrate de incluir tu información de con
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-fa-rIR/strings.xml b/mobile/src/main/res/values-fa-rIR/strings.xml
index 68d5d66b6..2b216405c 100644
--- a/mobile/src/main/res/values-fa-rIR/strings.xml
+++ b/mobile/src/main/res/values-fa-rIR/strings.xml
@@ -1003,4 +1003,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index 7dbf91262..cf88263d2 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -1000,4 +1000,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-hdpi/strings.xml b/mobile/src/main/res/values-hdpi/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-hdpi/strings.xml
+++ b/mobile/src/main/res/values-hdpi/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index e64827853..d16fb5eb7 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -988,4 +988,6 @@ Apakah Anda ingin membagikan analitik kepada tim Tella?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-kac/strings.xml b/mobile/src/main/res/values-kac/strings.xml
index 6e755dcd0..52b875932 100644
--- a/mobile/src/main/res/values-kac/strings.xml
+++ b/mobile/src/main/res/values-kac/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-kn/strings.xml b/mobile/src/main/res/values-kn/strings.xml
index 6681f7b22..7b4cf8afe 100644
--- a/mobile/src/main/res/values-kn/strings.xml
+++ b/mobile/src/main/res/values-kn/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-ksw/strings.xml b/mobile/src/main/res/values-ksw/strings.xml
index ef08d50d1..4f70d9e9f 100644
--- a/mobile/src/main/res/values-ksw/strings.xml
+++ b/mobile/src/main/res/values-ksw/strings.xml
@@ -989,4 +989,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-ku/strings.xml b/mobile/src/main/res/values-ku/strings.xml
index 911593d8d..35317766c 100644
--- a/mobile/src/main/res/values-ku/strings.xml
+++ b/mobile/src/main/res/values-ku/strings.xml
@@ -1001,4 +1001,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-mdpi/strings.xml b/mobile/src/main/res/values-mdpi/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-mdpi/strings.xml
+++ b/mobile/src/main/res/values-mdpi/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ml/strings.xml b/mobile/src/main/res/values-ml/strings.xml
index 66403f6c3..6e60a7bca 100644
--- a/mobile/src/main/res/values-ml/strings.xml
+++ b/mobile/src/main/res/values-ml/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-my/strings.xml b/mobile/src/main/res/values-my/strings.xml
index e23266056..7cbde78b5 100644
--- a/mobile/src/main/res/values-my/strings.xml
+++ b/mobile/src/main/res/values-my/strings.xml
@@ -989,4 +989,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-ndc/strings.xml b/mobile/src/main/res/values-ndc/strings.xml
index 826c63970..eb7c5fc73 100644
--- a/mobile/src/main/res/values-ndc/strings.xml
+++ b/mobile/src/main/res/values-ndc/strings.xml
@@ -980,4 +980,6 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+  <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt-rMZ/strings.xml b/mobile/src/main/res/values-pt-rMZ/strings.xml
index 4e8d3e6f3..4e7d1e583 100644
--- a/mobile/src/main/res/values-pt-rMZ/strings.xml
+++ b/mobile/src/main/res/values-pt-rMZ/strings.xml
@@ -992,4 +992,6 @@ Gostaria de partilhar dados com a equipa do Tella?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index cca390370..b67f8e7fd 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index 6dbfa6f3e..f6ab51a34 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1016,4 +1016,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-sn-rZW/strings.xml b/mobile/src/main/res/values-sn-rZW/strings.xml
index 826c63970..e28e5c649 100644
--- a/mobile/src/main/res/values-sn-rZW/strings.xml
+++ b/mobile/src/main/res/values-sn-rZW/strings.xml
@@ -980,4 +980,6 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-sw600dp/strings.xml b/mobile/src/main/res/values-sw600dp/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-sw600dp/strings.xml
+++ b/mobile/src/main/res/values-sw600dp/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ta/strings.xml b/mobile/src/main/res/values-ta/strings.xml
index 5e59a8067..4a2e8f99d 100644
--- a/mobile/src/main/res/values-ta/strings.xml
+++ b/mobile/src/main/res/values-ta/strings.xml
@@ -1006,4 +1006,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 5a70fe746..51e2ad678 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -986,4 +986,6 @@ Tella ekibiyle analizleri paylaşmak ister misiniz?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-ts/strings.xml b/mobile/src/main/res/values-ts/strings.xml
index 357000ae3..073d774bc 100644
--- a/mobile/src/main/res/values-ts/strings.xml
+++ b/mobile/src/main/res/values-ts/strings.xml
@@ -976,4 +976,6 @@ yi fanele ku ku nyika vutshokotshoko bya servhidor.</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-v21/strings.xml
+++ b/mobile/src/main/res/values-v21/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-v26/strings.xml b/mobile/src/main/res/values-v26/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-v26/strings.xml
+++ b/mobile/src/main/res/values-v26/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-vi/strings.xml b/mobile/src/main/res/values-vi/strings.xml
index 6bcd0bb37..e6754abfc 100644
--- a/mobile/src/main/res/values-vi/strings.xml
+++ b/mobile/src/main/res/values-vi/strings.xml
@@ -996,4 +996,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="stop">stop</string>
 </resources>
diff --git a/mobile/src/main/res/values-w820dp/strings.xml b/mobile/src/main/res/values-w820dp/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-w820dp/strings.xml
+++ b/mobile/src/main/res/values-w820dp/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xhdpi/strings.xml b/mobile/src/main/res/values-xhdpi/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-xhdpi/strings.xml
+++ b/mobile/src/main/res/values-xhdpi/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xxhdpi/strings.xml b/mobile/src/main/res/values-xxhdpi/strings.xml
index 8f72f3128..807975024 100644
--- a/mobile/src/main/res/values-xxhdpi/strings.xml
+++ b/mobile/src/main/res/values-xxhdpi/strings.xml
@@ -3,4 +3,6 @@
     <string name="send_files_title">Send files</string>
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="stop">stop</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 55e34ebe5..32335cdd8 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1057,4 +1057,7 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
     <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
   <string name="try_again">Try again</string>
+  <string name="stop_sharing_files">Stop sharing files?</string>
+  <string name="nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred">Nearby sharing will be stopped. The recipient will not have access to files that were not fully transferred.</string>
+  <string name="stop">stop</string>
 </resources>

From ae1235f6f6ff4e90da79ded87c8af3ed1bd0ad0f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 16 Jul 2025 15:23:45 +0100
Subject: [PATCH 082/153] wip resultView

---
 .../senderflow/PeerToPeerParticipant.kt       |   9 ++
 .../senderflow/PeerToPeerResultFragment.kt    | 111 ++++++++++++++++++
 .../layout/fragment_peer_to_peer_result.xml   |  56 +++++++++
 mobile/src/main/res/values-ar/strings.xml     |   1 +
 mobile/src/main/res/values-be/strings.xml     |   1 +
 mobile/src/main/res/values-blk/strings.xml    |   1 +
 mobile/src/main/res/values-bn/strings.xml     |   1 +
 mobile/src/main/res/values-es-rCU/strings.xml |   1 +
 mobile/src/main/res/values-es/strings.xml     |   1 +
 mobile/src/main/res/values-fa-rIR/strings.xml |   1 +
 mobile/src/main/res/values-fr/strings.xml     |   1 +
 mobile/src/main/res/values-hdpi/strings.xml   |   1 +
 mobile/src/main/res/values-in/strings.xml     |   1 +
 mobile/src/main/res/values-kac/strings.xml    |   1 +
 mobile/src/main/res/values-kn/strings.xml     |   1 +
 mobile/src/main/res/values-ksw/strings.xml    |   1 +
 mobile/src/main/res/values-ku/strings.xml     |   1 +
 mobile/src/main/res/values-mdpi/strings.xml   |   1 +
 mobile/src/main/res/values-ml/strings.xml     |   1 +
 mobile/src/main/res/values-my/strings.xml     |   1 +
 mobile/src/main/res/values-ndc/strings.xml    |   1 +
 mobile/src/main/res/values-pt-rMZ/strings.xml |   1 +
 mobile/src/main/res/values-pt/strings.xml     |   1 +
 mobile/src/main/res/values-ru/strings.xml     |   1 +
 mobile/src/main/res/values-sn-rZW/strings.xml |   1 +
 .../src/main/res/values-sw600dp/strings.xml   |   1 +
 mobile/src/main/res/values-ta/strings.xml     |   1 +
 mobile/src/main/res/values-tr/strings.xml     |   1 +
 mobile/src/main/res/values-ts/strings.xml     |   1 +
 mobile/src/main/res/values-v21/strings.xml    |   1 +
 mobile/src/main/res/values-v26/strings.xml    |   1 +
 mobile/src/main/res/values-vi/strings.xml     |   1 +
 mobile/src/main/res/values-w820dp/strings.xml |   1 +
 mobile/src/main/res/values-xhdpi/strings.xml  |   1 +
 mobile/src/main/res/values-xxhdpi/strings.xml |   1 +
 mobile/src/main/res/values/strings.xml        |  15 +++
 36 files changed, 223 insertions(+)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerParticipant.kt
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
 create mode 100644 mobile/src/main/res/layout/fragment_peer_to_peer_result.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerParticipant.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerParticipant.kt
new file mode 100644
index 000000000..18bbfdc23
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerParticipant.kt
@@ -0,0 +1,9 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+/**
+ * Created by wafa on 16/7/2025.
+ */
+enum class PeerToPeerParticipant {
+    SENDER,
+    RECIPIENT
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
new file mode 100644
index 000000000..362a25158
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -0,0 +1,111 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
+
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.activityViewModels
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
+import org.horizontal.tella.mobile.databinding.FragmentPeerToPeerResultBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
+
+class PeerToPeerResultFragment :
+    BaseBindingFragment<FragmentPeerToPeerResultBinding>(FragmentPeerToPeerResultBinding::inflate) {
+
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private lateinit var participant: PeerToPeerParticipant
+    private var transferredFiles: List<ProgressFile>? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Get values from shared state
+        participant = PeerToPeerParticipant.SENDER
+        transferredFiles = viewModel.p2PState.session.files.values.toList()
+
+        setupImage()
+        setupTexts()
+        setupButton()
+    }
+
+
+    private fun setupImage() {
+        binding.setupImgV.run {
+            val isSuccess = allFilesTransferred
+            setImageResource(if (isSuccess) R.drawable.checked_circle else R.drawable.ic_warning_orange)
+
+            if (!isSuccess) {
+                val whiteColor = ContextCompat.getColor(context, R.color.wa_white)
+                setColorFilter(whiteColor, PorterDuff.Mode.SRC_IN)
+            } else {
+                clearColorFilter()
+            }
+        }
+    }
+
+    private fun setupTexts() {
+        binding.tileTv.text = getString(if (allFilesTransferred) R.string.success_title else R.string.failure_title)
+        binding.descriptionTv.text = computeSubtitle()
+    }
+
+    private fun setupButton() {
+        if (!noFilesTransferred) {
+            binding.viewFilesBtn.apply {
+                setText(getString(R.string.view_files_action))
+                visibility = View.VISIBLE
+                setOnClickListener {
+                    // TODO: Implement button action
+                }
+            }
+        } else {
+            binding.viewFilesBtn.visibility = View.GONE
+        }
+    }
+
+    private fun computeSubtitle(): String {
+        val total = transferredFiles?.size
+        val successCount = transferredFiles?.count { it.status == successStatus }
+        val failureCount = total?.minus(successCount!!)
+
+        return when {
+            successCount == total -> getString(if (total == 1) successSingleRes() else successMultipleRes(), total)
+            failureCount == total -> getString(if (total == 1) failureSingleRes() else failureMultipleRes(), total)
+            else -> {
+                val resId = when {
+                    successCount == 1 && failureCount == 1 -> R.string.file_received_file_not_received
+                    successCount == 1 -> R.string.file_received_files_not_received
+                    failureCount == 1 -> R.string.files_received_file_not_received
+                    else -> R.string.files_received_files_not_received
+                }
+                getString(resId, successCount, failureCount)
+            }
+        }
+    }
+
+    private val successStatus: P2PFileStatus
+        get() = P2PFileStatus.FINISHED
+
+    private val allFilesTransferred: Boolean
+        get() = transferredFiles?.all { it.status == successStatus } == true
+
+    private val noFilesTransferred: Boolean
+        get() = transferredFiles?.none { it.status == successStatus } == true
+
+    private fun successSingleRes(): Int =
+        if (participant == PeerToPeerParticipant.RECIPIENT)
+            R.string.success_file_received_expl
+        else
+            R.string.success_file_sent_expl
+
+    private fun successMultipleRes(): Int =
+        if (participant == PeerToPeerParticipant.RECIPIENT)
+            R.string.success_files_received_expl
+        else
+            R.string.success_files_sent_expl
+
+    private fun failureSingleRes(): Int = R.string.failure_file_received_expl
+    private fun failureMultipleRes(): Int = R.string.failure_files_received_expl
+}
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
new file mode 100644
index 000000000..3cb86a22e
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/space_cadet">
+
+    <ImageView
+        android:id="@+id/setupImgV"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/checked_circle"
+        android:contentDescription="@string/Server_Connect_Icon"
+        app:layout_constraintBottom_toTopOf="@+id/tileTv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:layout_editor_absoluteX="175dp" />
+
+    <TextView
+        android:id="@+id/tileTv"
+        style="@style/Unlock_White_Text_Bold"
+        android:text="Success"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/descriptionTv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/setupImgV" />
+
+    <TextView
+        android:id="@+id/descriptionTv"
+        style="@style/Unlock_White_Text_Medium"
+        android:layout_marginTop="16dp"
+        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:text="You have successfully sent 6 files to the recipient."
+        app:layout_constraintBottom_toTopOf="@+id/view_files_btn"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tileTv" />
+
+    <org.hzontal.shared_ui.buttons.RoundButton
+        android:id="@+id/view_files_btn"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="50dp"
+        android:backgroundTint="@color/tigers_eye"
+        android:text="@string/view_files"
+        app:check_state="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/descriptionTv" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index 51d078583..93f33d150 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -1007,4 +1007,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-be/strings.xml b/mobile/src/main/res/values-be/strings.xml
index a29016ccf..518ba5415 100644
--- a/mobile/src/main/res/values-be/strings.xml
+++ b/mobile/src/main/res/values-be/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-blk/strings.xml b/mobile/src/main/res/values-blk/strings.xml
index 543cc4958..2b61d7cbb 100644
--- a/mobile/src/main/res/values-blk/strings.xml
+++ b/mobile/src/main/res/values-blk/strings.xml
@@ -146,4 +146,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-bn/strings.xml b/mobile/src/main/res/values-bn/strings.xml
index 082fe71cb..bd0343d1f 100644
--- a/mobile/src/main/res/values-bn/strings.xml
+++ b/mobile/src/main/res/values-bn/strings.xml
@@ -988,4 +988,5 @@
  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
  <string name="stop">stop</string>
+ <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-es-rCU/strings.xml b/mobile/src/main/res/values-es-rCU/strings.xml
index 8b9be4278..cd106a53b 100644
--- a/mobile/src/main/res/values-es-rCU/strings.xml
+++ b/mobile/src/main/res/values-es-rCU/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index a36797464..cefdf9d3c 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -992,4 +992,5 @@ Este feedback es anónimo, así que asegúrate de incluir tu información de con
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-fa-rIR/strings.xml b/mobile/src/main/res/values-fa-rIR/strings.xml
index 2b216405c..007e9d94c 100644
--- a/mobile/src/main/res/values-fa-rIR/strings.xml
+++ b/mobile/src/main/res/values-fa-rIR/strings.xml
@@ -1005,4 +1005,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index cf88263d2..fd663c7ad 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -1002,4 +1002,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-hdpi/strings.xml b/mobile/src/main/res/values-hdpi/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-hdpi/strings.xml
+++ b/mobile/src/main/res/values-hdpi/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index d16fb5eb7..118dc2fde 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -990,4 +990,5 @@ Apakah Anda ingin membagikan analitik kepada tim Tella?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-kac/strings.xml b/mobile/src/main/res/values-kac/strings.xml
index 52b875932..e815c91e3 100644
--- a/mobile/src/main/res/values-kac/strings.xml
+++ b/mobile/src/main/res/values-kac/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-kn/strings.xml b/mobile/src/main/res/values-kn/strings.xml
index 7b4cf8afe..394aec790 100644
--- a/mobile/src/main/res/values-kn/strings.xml
+++ b/mobile/src/main/res/values-kn/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-ksw/strings.xml b/mobile/src/main/res/values-ksw/strings.xml
index 4f70d9e9f..5e5da015c 100644
--- a/mobile/src/main/res/values-ksw/strings.xml
+++ b/mobile/src/main/res/values-ksw/strings.xml
@@ -991,4 +991,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-ku/strings.xml b/mobile/src/main/res/values-ku/strings.xml
index 35317766c..2ce58bf9e 100644
--- a/mobile/src/main/res/values-ku/strings.xml
+++ b/mobile/src/main/res/values-ku/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-mdpi/strings.xml b/mobile/src/main/res/values-mdpi/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-mdpi/strings.xml
+++ b/mobile/src/main/res/values-mdpi/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ml/strings.xml b/mobile/src/main/res/values-ml/strings.xml
index 6e60a7bca..80b92b4a4 100644
--- a/mobile/src/main/res/values-ml/strings.xml
+++ b/mobile/src/main/res/values-ml/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-my/strings.xml b/mobile/src/main/res/values-my/strings.xml
index 7cbde78b5..dfc48aaa0 100644
--- a/mobile/src/main/res/values-my/strings.xml
+++ b/mobile/src/main/res/values-my/strings.xml
@@ -991,4 +991,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-ndc/strings.xml b/mobile/src/main/res/values-ndc/strings.xml
index eb7c5fc73..4e11f421f 100644
--- a/mobile/src/main/res/values-ndc/strings.xml
+++ b/mobile/src/main/res/values-ndc/strings.xml
@@ -982,4 +982,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt-rMZ/strings.xml b/mobile/src/main/res/values-pt-rMZ/strings.xml
index 4e7d1e583..7afe2f38e 100644
--- a/mobile/src/main/res/values-pt-rMZ/strings.xml
+++ b/mobile/src/main/res/values-pt-rMZ/strings.xml
@@ -994,4 +994,5 @@ Gostaria de partilhar dados com a equipa do Tella?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index b67f8e7fd..27a723c2c 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index f6ab51a34..c6b174590 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1018,4 +1018,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-sn-rZW/strings.xml b/mobile/src/main/res/values-sn-rZW/strings.xml
index e28e5c649..33bcc3d08 100644
--- a/mobile/src/main/res/values-sn-rZW/strings.xml
+++ b/mobile/src/main/res/values-sn-rZW/strings.xml
@@ -982,4 +982,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-sw600dp/strings.xml b/mobile/src/main/res/values-sw600dp/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-sw600dp/strings.xml
+++ b/mobile/src/main/res/values-sw600dp/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ta/strings.xml b/mobile/src/main/res/values-ta/strings.xml
index 4a2e8f99d..5f1987688 100644
--- a/mobile/src/main/res/values-ta/strings.xml
+++ b/mobile/src/main/res/values-ta/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 51e2ad678..55637b0ff 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -988,4 +988,5 @@ Tella ekibiyle analizleri paylaşmak ister misiniz?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-ts/strings.xml b/mobile/src/main/res/values-ts/strings.xml
index 073d774bc..d6c91c436 100644
--- a/mobile/src/main/res/values-ts/strings.xml
+++ b/mobile/src/main/res/values-ts/strings.xml
@@ -978,4 +978,5 @@ yi fanele ku ku nyika vutshokotshoko bya servhidor.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-v21/strings.xml
+++ b/mobile/src/main/res/values-v21/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-v26/strings.xml b/mobile/src/main/res/values-v26/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-v26/strings.xml
+++ b/mobile/src/main/res/values-v26/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-vi/strings.xml b/mobile/src/main/res/values-vi/strings.xml
index e6754abfc..81fb3af01 100644
--- a/mobile/src/main/res/values-vi/strings.xml
+++ b/mobile/src/main/res/values-vi/strings.xml
@@ -998,4 +998,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
+  <string name="view_files">VIEW FILES</string>
 </resources>
diff --git a/mobile/src/main/res/values-w820dp/strings.xml b/mobile/src/main/res/values-w820dp/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-w820dp/strings.xml
+++ b/mobile/src/main/res/values-w820dp/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xhdpi/strings.xml b/mobile/src/main/res/values-xhdpi/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-xhdpi/strings.xml
+++ b/mobile/src/main/res/values-xhdpi/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xxhdpi/strings.xml b/mobile/src/main/res/values-xxhdpi/strings.xml
index 807975024..dd1a6f2a8 100644
--- a/mobile/src/main/res/values-xxhdpi/strings.xml
+++ b/mobile/src/main/res/values-xxhdpi/strings.xml
@@ -5,4 +5,5 @@
     <string name="failed_to_open_location_settings">Failed to open location settings.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
+    <string name="view_files">VIEW FILES</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 32335cdd8..da4d2c6ba 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1060,4 +1060,19 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred">Nearby sharing will be stopped. The recipient will not have access to files that were not fully transferred.</string>
   <string name="stop">stop</string>
+  <string name="success_title">Success</string>
+  <string name="failure_title">Something went wrong</string>
+  <string name="success_file_received_expl">You have successfully received %d file.</string>
+  <string name="success_files_received_expl">You have successfully received %d files.</string>
+  <string name="success_file_sent_expl">You have successfully sent %d file.</string>
+  <string name="success_files_sent_expl">You have successfully sent %d files.</string>
+  <string name="failure_file_received_expl">We couldn't receive %d file.</string>
+  <string name="failure_files_received_expl">We couldn't receive %d files.</string>
+  <string name="file_received_file_not_received">1 file received, 1 file not received</string>
+  <string name="file_received_files_not_received">1 file received, %d files not received</string>
+  <string name="files_received_file_not_received">%d files received, 1 file not received</string>
+  <string name="files_received_files_not_received">%d files received, %d files not received</string>
+  <string name="view_files_action">View Files</string>
+  <string name="view_files">VIEW FILES</string>
+
 </resources>

From 8a13fd4a5a3f132a3a52f93297f88475cc510c97 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 16 Jul 2025 16:38:56 +0100
Subject: [PATCH 083/153] wip recipient progress and result view

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 60 +++++++++------
 .../domain/peertopeer/PeerEventManager.kt     | 22 +-----
 .../RecipientUploadFilesFragment.kt           | 20 +++--
 .../senderflow/PeerToPeerResultFragment.kt    | 57 +++++++-------
 .../viewmodel/PeerToPeerViewModel.kt          | 75 ++++++++++++++++++-
 .../attachements/AttachmentsViewModel.kt      |  3 -
 mobile/src/main/res/values/strings.xml        | 31 +++++---
 7 files changed, 171 insertions(+), 97 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 9b8548b38..b0dd9a41a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -16,6 +16,7 @@ import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
+import io.ktor.server.routing.put
 import io.ktor.server.routing.routing
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -26,6 +27,7 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PeerApiRoutes
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
@@ -35,6 +37,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import java.security.KeyPair
 import java.security.KeyStore
@@ -43,7 +46,6 @@ import java.util.UUID
 
 const val port = 53317
 
-//TODO THIS CLASS MUST BE INJECTED
 class TellaPeerToPeerServer(
     private val ip: String,
     private val serverPort: Int = port,
@@ -143,6 +145,7 @@ class TellaPeerToPeerServer(
 
                         call.respond(HttpStatusCode.OK, session)
                     }
+
                     post(PeerApiRoutes.PREPARE_UPLOAD) {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
@@ -190,7 +193,7 @@ class TellaPeerToPeerServer(
                         }
                     }
 
-                    post(PeerApiRoutes.UPLOAD) {
+                    put(PeerApiRoutes.UPLOAD) {
                         val sessionId = call.parameters["sessionId"]
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
@@ -199,21 +202,19 @@ class TellaPeerToPeerServer(
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
-                            return@post
+                            return@put
                         }
 
-                        if (sessionId != p2PSharedState.session?.sessionId) {
-                            Timber.d("session Id")
+                        val session = p2PSharedState.session
+                        if (sessionId != session?.sessionId) {
                             call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
-                            return@post
+                            return@put
                         }
 
-                        val session = p2PSharedState.session
-                        val progressFile = session?.files?.get(transmissionId)
-
+                        val progressFile = session.files[transmissionId]
                         if (progressFile == null || progressFile.file.id != fileId) {
                             call.respond(HttpStatusCode.NotFound, "File not found in session")
-                            return@post
+                            return@put
                         }
 
                         val tmpFile = createTempFile(prefix = "p2p_", suffix = "_$fileId")
@@ -221,6 +222,7 @@ class TellaPeerToPeerServer(
 
                         try {
                             val input = call.receiveStream().buffered()
+                            val totalSize = session.files.values.sumOf { it.file.size }
                             var bytesRead = 0L
                             val buffer = ByteArray(8192)
 
@@ -229,42 +231,54 @@ class TellaPeerToPeerServer(
                                 if (read == -1) break
                                 output.write(buffer, 0, read)
                                 bytesRead += read
-
                                 progressFile.bytesTransferred = bytesRead.toInt()
-                                PeerEventManager.onUploadProgressState(
-                                    p2PSharedState
+
+                                // Optional: update session progress percent
+                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
+                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+
+                                val state = UploadProgressState(
+                                    percent = percent,
+                                    sessionStatus = session.status,
+                                    files = session.files.values.toList()
                                 )
+                                PeerEventManager.onUploadProgressState(state)
                             }
 
                             progressFile.status = P2PFileStatus.FINISHED
                             progressFile.path = tmpFile.absolutePath
 
+                            // Final emit after completion
+                            val finalState = UploadProgressState(
+                                percent = 100,
+                                sessionStatus = SessionStatus.FINISHED,
+                                files = session.files.values.toList()
+                            )
+                            PeerEventManager.onUploadProgressState(finalState)
 
                             call.respond(HttpStatusCode.OK, "Upload complete")
                         } catch (e: Exception) {
                             progressFile.status = P2PFileStatus.FAILED
-                            call.respond(
-                                HttpStatusCode.InternalServerError,
-                                "Upload failed: ${e.message}"
+
+                            val failedState = UploadProgressState(
+                                percent = 0,
+                                sessionStatus = session.status,
+                                files = session.files.values.toList()
                             )
+                            PeerEventManager.onUploadProgressState(failedState)
+
+                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
                         } finally {
                             output.close()
                         }
                     }
 
-
                 }
 
             }
         }).start(wait = false)
     }
 
-    private fun calculatePercent(files: Collection<ProgressFile>): Int {
-        val uploaded = files.sumOf { it.bytesTransferred.toLong() }
-        val total = files.sumOf { it.file.size }
-        return if (total > 0) ((uploaded * 100) / total).toInt() else 0
-    }
-
     override fun stop() {
         engine?.stop(1000, 5000)
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index dbdbc292a..a1a1e765b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -23,26 +23,8 @@ object PeerEventManager {
     private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 1)
     val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
 
-
-    suspend fun onUploadProgressState(p2PSharedState : P2PSharedState) {
-        val session = p2PSharedState.session
-        val files = session?.files?.values?.toList() ?: emptyList()
-
-        val totalSize = files.sumOf { it.file.size }
-        val uploaded = files.sumOf { it.bytesTransferred }
-        val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
-
-        val state = session?.status?.let {
-            UploadProgressState(
-                percent = percent,
-                sessionStatus = it,
-                files = files
-            )
-        }
-
-        if (state != null) {
-            _uploadProgressStateFlow.emit(state)
-        }
+    suspend fun onUploadProgressState(state: UploadProgressState) {
+        _uploadProgressStateFlow.emit(state)
     }
 
     suspend fun emitRegistrationSuccess() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 061f15690..276e5cdc1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -1,7 +1,5 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
-import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
@@ -9,13 +7,12 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
-import org.hzontal.shared_ui.utils.DialogUtils
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -44,7 +41,7 @@ class RecipientUploadFilesFragment :
                 {
                     PeerToPeerFlags.cancelled = true
                     baseActivity.finish()
-                 })
+                })
         }
     }
 
@@ -64,9 +61,18 @@ class RecipientUploadFilesFragment :
     }
 
     private fun observeUploadProgress() {
+
         viewModel.uploadProgress.observe(viewLifecycleOwner) { state ->
-            Timber.d("State "+ state?.percent + " Status: "+state?.sessionStatus?.name)
-        }
+            if (state == null) return@observe
+            val files = state.files
+            val percentFloat = state.percent / 100f
+            endView.setUploadProgress(files, percentFloat)
 
+            // Optional: finalize UI when upload is done
+            if (state.sessionStatus == SessionStatus.FINISHED) {
+                endView.clearPartsProgress(files, SessionStatus.FINISHED)
+            }
+        }
     }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
index 362a25158..13b8391b1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -24,7 +24,7 @@ class PeerToPeerResultFragment :
 
         // Get values from shared state
         participant = PeerToPeerParticipant.SENDER
-        transferredFiles = viewModel.p2PState.session.files.values.toList()
+        transferredFiles = viewModel.p2PState.session?.files?.values?.toList()
 
         setupImage()
         setupTexts()
@@ -47,7 +47,8 @@ class PeerToPeerResultFragment :
     }
 
     private fun setupTexts() {
-        binding.tileTv.text = getString(if (allFilesTransferred) R.string.success_title else R.string.failure_title)
+        binding.tileTv.text =
+            getString(if (allFilesTransferred) R.string.success_title else R.string.failure_title)
         binding.descriptionTv.text = computeSubtitle()
     }
 
@@ -57,7 +58,7 @@ class PeerToPeerResultFragment :
                 setText(getString(R.string.view_files_action))
                 visibility = View.VISIBLE
                 setOnClickListener {
-                    // TODO: Implement button action
+                    baseActivity.finish()
                 }
             }
         } else {
@@ -66,25 +67,33 @@ class PeerToPeerResultFragment :
     }
 
     private fun computeSubtitle(): String {
-        val total = transferredFiles?.size
-        val successCount = transferredFiles?.count { it.status == successStatus }
-        val failureCount = total?.minus(successCount!!)
-
-        return when {
-            successCount == total -> getString(if (total == 1) successSingleRes() else successMultipleRes(), total)
-            failureCount == total -> getString(if (total == 1) failureSingleRes() else failureMultipleRes(), total)
+        val total = transferredFiles?.size ?: 0
+        val successCount = transferredFiles?.count { it.status == successStatus } ?: 0
+        val failureCount = total - successCount
+
+        return when (successCount) {
+            total -> {
+                val resId = if (participant == PeerToPeerParticipant.RECIPIENT)
+                    R.plurals.success_file_received_from_sender
+                else
+                    R.plurals.success_file_sent_to_recipient
+
+                return resources.getQuantityString(resId, total, total)
+            }
+            0 -> {
+                baseActivity.resources.getQuantityString(
+                    R.plurals.failure_file_received_expl,
+                    failureCount,
+                    failureCount
+                )
+            }
             else -> {
-                val resId = when {
-                    successCount == 1 && failureCount == 1 -> R.string.file_received_file_not_received
-                    successCount == 1 -> R.string.file_received_files_not_received
-                    failureCount == 1 -> R.string.files_received_file_not_received
-                    else -> R.string.files_received_files_not_received
-                }
-                getString(resId, successCount, failureCount)
+                getString(R.string.partial_success_summary, successCount, failureCount)
             }
         }
     }
 
+
     private val successStatus: P2PFileStatus
         get() = P2PFileStatus.FINISHED
 
@@ -94,18 +103,4 @@ class PeerToPeerResultFragment :
     private val noFilesTransferred: Boolean
         get() = transferredFiles?.none { it.status == successStatus } == true
 
-    private fun successSingleRes(): Int =
-        if (participant == PeerToPeerParticipant.RECIPIENT)
-            R.string.success_file_received_expl
-        else
-            R.string.success_file_sent_expl
-
-    private fun successMultipleRes(): Int =
-        if (participant == PeerToPeerParticipant.RECIPIENT)
-            R.string.success_files_received_expl
-        else
-            R.string.success_files_sent_expl
-
-    private fun failureSingleRes(): Int = R.string.failure_file_received_expl
-    private fun failureMultipleRes(): Int = R.string.failure_files_received_expl
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index c572fe5d9..2b372e2e2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -6,25 +6,35 @@ import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.hzontal.tella_vault.VaultFile
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
+import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
+import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
+import java.io.File
+import java.io.FileInputStream
 import javax.inject.Inject
 
 @HiltViewModel
@@ -35,7 +45,7 @@ class PeerToPeerViewModel @Inject constructor(
     val p2PState: P2PSharedState
 ) : ViewModel() {
 
-    var isManualConnection: Boolean = true // default is manual
+    var isManualConnection: Boolean = true
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
     private val _registrationSuccess = SingleLiveEvent<Boolean>()
@@ -82,7 +92,20 @@ class PeerToPeerViewModel @Inject constructor(
 
         viewModelScope.launch {
             PeerEventManager.uploadProgressStateFlow.collect { state ->
+                _uploadProgress.postValue(state)
+            }
+        }
+
+        viewModelScope.launch {
+            PeerEventManager.uploadProgressStateFlow.collect { state ->
+                _uploadProgress.postValue(state)
+
+                val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
+                val alreadySaved = state.sessionStatus == SessionStatus.FINISHED
 
+                if (allFinished && !alreadySaved) {
+                    finalizeAndSaveReceivedFiles(state.files)
+                }
             }
         }
     }
@@ -195,6 +218,56 @@ class PeerToPeerViewModel @Inject constructor(
         hasNavigatedToSuccessFragment = false
     }
 
+    private fun finalizeAndSaveReceivedFiles(progressFiles: List<ProgressFile>) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val vault = MyApplication.keyRxVault.rxVault.blockingFirst()
+            val root = vault.root.blockingGet()
+            val folder = vault.builder()
+                .setName("Received_" + System.currentTimeMillis())
+                .setType(VaultFile.Type.DIRECTORY)
+                .build(root.id)
+                .blockingGet()
+
+            progressFiles.forEach { progressFile ->
+                try {
+                    val path = progressFile.path ?: return@forEach
+                    val file = File(path)
+                    if (!file.exists()) return@forEach
+
+                    val vaultFile = when (file.extension.lowercase()) {
+                        "jpg", "jpeg" -> MediaFileHandler.saveJpegPhoto(file.readBytes(), folder.id).blockingGet()
+                        "png" -> MediaFileHandler.savePngImage(file.readBytes())
+                        "mp4" -> MediaFileHandler.saveMp4Video(file, folder.id)
+                        else -> vault.builder(FileInputStream(file))
+                            .setName(file.name)
+                            .setType(VaultFile.Type.FILE)
+                            .build(folder.id)
+                            .blockingGet()
+                    }
+
+                    progressFile.vaultFile = vaultFile
+
+                } catch (e: Exception) {
+                    Timber.e(e, "Saving to vault failed for file ${progressFile.file.fileName}")
+                    progressFile.status = P2PFileStatus.FAILED
+                }
+            }
+
+            // Optional: Update final session state
+            p2PState.session?.status = SessionStatus.FINISHED
+
+            // Re-emit new state with VaultFiles linked
+            _uploadProgress.postValue(
+                UploadProgressState(
+                    percent = 100,
+                    sessionStatus = SessionStatus.FINISHED,
+                    files = progressFiles
+                )
+            )
+        }
+    }
+
+
     override fun onCleared() {
         super.onCleared()
         p2PState.clear()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
index b2f3c2517..00f5e31d7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsViewModel.kt
@@ -105,7 +105,6 @@ class AttachmentsViewModel @Inject constructor(
         )
     }
 
-
     fun moveFiles(parentId: String?, vaultFiles: List<VaultFile?>?) {
         if (vaultFiles == null || parentId == null) return
 
@@ -169,7 +168,6 @@ class AttachmentsViewModel @Inject constructor(
         )
     }
 
-
     private fun deleteFile(vaultFile: VaultFile): Single<Boolean> {
         return MyApplication.keyRxVault.rxVault
             .firstOrError()
@@ -178,7 +176,6 @@ class AttachmentsViewModel @Inject constructor(
             .observeOn(AndroidSchedulers.mainThread())
     }
 
-
     fun createFolder(folderName: String, parent: String) {
         disposables.add(
             MyApplication.keyRxVault.rxVault
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index da4d2c6ba..c5800651c 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1048,13 +1048,13 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="exit_nearby_sharing">Exit nearby sharing?</string>
   <string name="your_progress_will_be_lost">Your progress will be lost.</string>
   <string name="ip_address">IP address</string>
-    <string name="sender_files_rejected">Sender\'s files rejected.</string>
+  <string name="sender_files_rejected">Sender\'s files rejected.</string>
   <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
   <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
   <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
   <string name="sending_files">Sending files</string>
   <string name="send_files_title">Send files</string>
-    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+  <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
   <string name="failed_to_open_location_settings">Failed to open location settings.</string>
   <string name="try_again">Try again</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
@@ -1062,16 +1062,23 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
   <string name="stop">stop</string>
   <string name="success_title">Success</string>
   <string name="failure_title">Something went wrong</string>
-  <string name="success_file_received_expl">You have successfully received %d file.</string>
-  <string name="success_files_received_expl">You have successfully received %d files.</string>
-  <string name="success_file_sent_expl">You have successfully sent %d file.</string>
-  <string name="success_files_sent_expl">You have successfully sent %d files.</string>
-  <string name="failure_file_received_expl">We couldn't receive %d file.</string>
-  <string name="failure_files_received_expl">We couldn't receive %d files.</string>
-  <string name="file_received_file_not_received">1 file received, 1 file not received</string>
-  <string name="file_received_files_not_received">1 file received, %d files not received</string>
-  <string name="files_received_file_not_received">%d files received, 1 file not received</string>
-  <string name="files_received_files_not_received">%d files received, %d files not received</string>
+
+  <plurals name="success_file_received_from_sender">
+    <item quantity="one">You have successfully received %1$d file from the sender.</item>
+    <item quantity="other">You have successfully received %1$d files from the sender.</item>
+  </plurals>
+
+  <plurals name="success_file_sent_to_recipient">
+    <item quantity="one">You have successfully sent %1$d file to the recipient.</item>
+    <item quantity="other">You have successfully sent %1$d files to the recipient.</item>
+  </plurals>
+
+  <string name="partial_success_summary">Only %1$d files were received. %2$d files were not received.</string>
+  <plurals name="failure_file_received_expl">
+    <item quantity="one">0 files were received. %1$d file was not received.</item>
+    <item quantity="other">0 files were received. %1$d files were not received.</item>
+  </plurals>
+
   <string name="view_files_action">View Files</string>
   <string name="view_files">VIEW FILES</string>
 

From 8818868642cfccf6f28cf91312b65eef8f20e6b3 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 16 Jul 2025 21:10:50 +0100
Subject: [PATCH 084/153] WIP save files in the recepient

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  8 ++-
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 12 +++-
 .../tella/mobile/domain/peertopeer/P2PFile.kt |  2 +-
 .../RecipientUploadFilesFragment.kt           |  4 --
 .../senderflow/PrepareUploadFragment.kt       |  3 +-
 .../viewmodel/FileTransferViewModel.kt        |  3 +
 .../viewmodel/PeerToPeerViewModel.kt          | 57 ++++++++++++-------
 .../viewmodel/state/UploadProgressState.kt    |  1 +
 .../uwazi/widgets/PeerToPeerEndView.java      | 57 +++++++++++++------
 9 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index f37890552..daec37b6f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -33,7 +33,7 @@ import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
-class TellaPeerToPeerClient @Inject constructor(){
+class TellaPeerToPeerClient @Inject constructor() {
 
     private fun getClientWithFingerprintValidation(expectedFingerprint: String): OkHttpClient {
         val trustManager = object : X509TrustManager {
@@ -136,7 +136,8 @@ class TellaPeerToPeerClient @Inject constructor(){
                 fileName = it.name,
                 size = it.size,
                 fileType = mimeType,
-                sha256 = it.hash
+                sha256 = it.hash,
+                thumb = it.thumb
             )
         }
 
@@ -177,6 +178,7 @@ class TellaPeerToPeerClient @Inject constructor(){
             PrepareUploadResult.Failure(Exception("Malformed server response"))
         }
     }
+
     private fun handleServerError(code: Int, body: String): PrepareUploadResult {
         return when (code) {
             400 -> PrepareUploadResult.BadRequest
@@ -208,7 +210,7 @@ class TellaPeerToPeerClient @Inject constructor(){
 
         val request = Request.Builder()
             .url(url)
-            .post(requestBody)
+            .put(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
             .build()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index b0dd9a41a..c43e084f1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -39,10 +39,13 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
 import org.horizontal.tella.mobile.domain.peertopeer.TellaServer
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
+import java.io.File
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
 import java.util.UUID
+import kotlin.io.path.outputStream
+import kotlin.io.path.pathString
 
 const val port = 53317
 
@@ -217,7 +220,7 @@ class TellaPeerToPeerServer(
                             return@put
                         }
 
-                        val tmpFile = createTempFile(prefix = "p2p_", suffix = "_$fileId")
+                        val tmpFile = File.createTempFile(fileId, ".tmp")
                         val output = tmpFile.outputStream().buffered()
 
                         try {
@@ -238,6 +241,7 @@ class TellaPeerToPeerServer(
                                 val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
 
                                 val state = UploadProgressState(
+                                    title = session.title ?: "",
                                     percent = percent,
                                     sessionStatus = session.status,
                                     files = session.files.values.toList()
@@ -246,14 +250,15 @@ class TellaPeerToPeerServer(
                             }
 
                             progressFile.status = P2PFileStatus.FINISHED
-                            progressFile.path = tmpFile.absolutePath
+                            progressFile.path = tmpFile.path
 
-                            // Final emit after completion
                             val finalState = UploadProgressState(
+                                title = session.title ?: "",
                                 percent = 100,
                                 sessionStatus = SessionStatus.FINISHED,
                                 files = session.files.values.toList()
                             )
+
                             PeerEventManager.onUploadProgressState(finalState)
 
                             call.respond(HttpStatusCode.OK, "Upload complete")
@@ -261,6 +266,7 @@ class TellaPeerToPeerServer(
                             progressFile.status = P2PFileStatus.FAILED
 
                             val failedState = UploadProgressState(
+                                title = session.title ?: "",
                                 percent = 0,
                                 sessionStatus = session.status,
                                 files = session.files.values.toList()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
index c4a6db2d8..43fc2e92b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
@@ -9,7 +9,7 @@ data class P2PFile(
     val size: Long,
     val fileType: String,
     val sha256: String,
-    val thumb: ByteArray? = null
+    val thumb: ByteArray
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 276e5cdc1..952a2d3a2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -68,10 +68,6 @@ class RecipientUploadFilesFragment :
             val percentFloat = state.percent / 100f
             endView.setUploadProgress(files, percentFloat)
 
-            // Optional: finalize UI when upload is done
-            if (state.sessionStatus == SessionStatus.FINISHED) {
-                endView.clearPartsProgress(files, SessionStatus.FINISHED)
-            }
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 5c086f855..4a7e44303 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -267,7 +267,8 @@ class PrepareUploadFragment :
                             fileName = vaultFile.name,
                             size = vaultFile.size,
                             fileType = vaultFile.mimeType ?: "application/octet-stream",
-                            sha256 = vaultFile.hash
+                            sha256 = vaultFile.hash,
+                            thumb = vaultFile.thumb
                         )
 
                         val progressFile = ProgressFile(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index b3b4b9059..07b6bf5cf 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -139,6 +139,7 @@ class FileTransferViewModel @Inject constructor(
 
                             _uploadProgress.postValue(
                                 UploadProgressState(
+                                    title = session.title ?: "",
                                     percent = percent,
                                     sessionStatus = session.status,
                                     files = session.files.values.toList()
@@ -158,6 +159,7 @@ class FileTransferViewModel @Inject constructor(
                 // Post state after each file is done
                 _uploadProgress.postValue(
                     UploadProgressState(
+                        title = session.title ?: "",
                         percent = session.files.values.sumOf { it.bytesTransferred }.let {
                             if (totalSize > 0) ((it * 100) / totalSize).toInt() else 0
                         },
@@ -172,6 +174,7 @@ class FileTransferViewModel @Inject constructor(
             // Final update after all uploads complete
             _uploadProgress.postValue(
                 UploadProgressState(
+                    title = session.title ?: "",
                     percent = 100,
                     sessionStatus = session.status,
                     files = session.files.values.toList()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 2b372e2e2..047efee3d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
@@ -29,12 +28,12 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.media.MediaFileHandler
+import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import java.io.File
-import java.io.FileInputStream
 import javax.inject.Inject
 
 @HiltViewModel
@@ -65,6 +64,8 @@ class PeerToPeerViewModel @Inject constructor(
     val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
     private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
     val uploadProgress: SingleLiveEvent<UploadProgressState?> = _uploadProgress
+    private var isVaultSaveDone = false
+
 
     init {
         viewModelScope.launch {
@@ -92,22 +93,16 @@ class PeerToPeerViewModel @Inject constructor(
 
         viewModelScope.launch {
             PeerEventManager.uploadProgressStateFlow.collect { state ->
-                _uploadProgress.postValue(state)
-            }
-        }
-
-        viewModelScope.launch {
-            PeerEventManager.uploadProgressStateFlow.collect { state ->
-                _uploadProgress.postValue(state)
 
                 val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
-                val alreadySaved = state.sessionStatus == SessionStatus.FINISHED
 
-                if (allFinished && !alreadySaved) {
-                    finalizeAndSaveReceivedFiles(state.files)
+                if (allFinished && !isVaultSaveDone) {
+                    isVaultSaveDone = true // prevent re-saving
+                    finalizeAndSaveReceivedFiles(p2PState.session?.title.orEmpty(), state.files)
                 }
             }
         }
+
     }
 
     fun resetRegistrationState() {
@@ -218,34 +213,58 @@ class PeerToPeerViewModel @Inject constructor(
         hasNavigatedToSuccessFragment = false
     }
 
-    private fun finalizeAndSaveReceivedFiles(progressFiles: List<ProgressFile>) {
+    private fun finalizeAndSaveReceivedFiles(
+        folderName: String,
+        progressFiles: List<ProgressFile>
+    ) {
         viewModelScope.launch(Dispatchers.IO) {
             val vault = MyApplication.keyRxVault.rxVault.blockingFirst()
             val root = vault.root.blockingGet()
+
             val folder = vault.builder()
-                .setName("Received_" + System.currentTimeMillis())
+                .setName(folderName)
                 .setType(VaultFile.Type.DIRECTORY)
                 .build(root.id)
                 .blockingGet()
 
+            val totalFiles = progressFiles.size
+            var savedFiles = 0
+
             progressFiles.forEach { progressFile ->
                 try {
                     val path = progressFile.path ?: return@forEach
                     val file = File(path)
                     if (!file.exists()) return@forEach
 
-                    val vaultFile = when (file.extension.lowercase()) {
-                        "jpg", "jpeg" -> MediaFileHandler.saveJpegPhoto(file.readBytes(), folder.id).blockingGet()
+                    val vaultFile = when (progressFile.file.fileType) {
+                        "jpg", "jpeg" -> MediaFileHandler.saveJpegPhoto(file.readBytes(), folder.id)
+                            .blockingGet()
+
                         "png" -> MediaFileHandler.savePngImage(file.readBytes())
                         "mp4" -> MediaFileHandler.saveMp4Video(file, folder.id)
-                        else -> vault.builder(FileInputStream(file))
+                        else -> vault.builder(file.inputStream())
                             .setName(file.name)
+                            .setMimeType(progressFile.file.fileType)
                             .setType(VaultFile.Type.FILE)
                             .build(folder.id)
                             .blockingGet()
                     }
 
                     progressFile.vaultFile = vaultFile
+                    savedFiles++
+
+                    // Delete temp file after saving
+                    file.delete()
+
+                    // Emit progress after each file
+                    _uploadProgress.postValue(
+                        UploadProgressState(
+                            title = folderName,
+                            percent = ((savedFiles * 100) / totalFiles),
+                            sessionStatus = SessionStatus.SENDING,
+                            files = progressFiles
+                        )
+                    )
 
                 } catch (e: Exception) {
                     Timber.e(e, "Saving to vault failed for file ${progressFile.file.fileName}")
@@ -253,12 +272,11 @@ class PeerToPeerViewModel @Inject constructor(
                 }
             }
 
-            // Optional: Update final session state
             p2PState.session?.status = SessionStatus.FINISHED
 
-            // Re-emit new state with VaultFiles linked
             _uploadProgress.postValue(
                 UploadProgressState(
+                    title = folderName,
                     percent = 100,
                     sessionStatus = SessionStatus.FINISHED,
                     files = progressFiles
@@ -267,7 +285,6 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-
     override fun onCleared() {
         super.onCleared()
         p2PState.clear()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt
index e8ca736e4..b41d36381 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/UploadProgressState.kt
@@ -4,6 +4,7 @@ import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 
 data class UploadProgressState(
+    val title: String,
     val percent: Int,
     val sessionStatus: SessionStatus,
     val files: List<ProgressFile>
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index 573af2234..2f3f2b445 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -66,8 +66,12 @@ public void setUploadProgress(List<ProgressFile> progressFiles, float pct) {
         int percentComplete = getTotalUploadedSizePercent(progressFiles);
 
         for (ProgressFile file : progressFiles) {
-            if (file.getStatus() == P2PFileStatus.FINISHED && file.getVaultFile() != null) {
-                SubmittingItem item = partsListView.findViewWithTag(file.getVaultFile().id);
+            String tagId = file.getVaultFile() != null && file.getVaultFile().id != null
+                    ? file.getVaultFile().id
+                    : file.getFile().getId();
+
+            if (file.getStatus() == P2PFileStatus.FINISHED) {
+                SubmittingItem item = partsListView.findViewWithTag(tagId);
                 if (item != null) item.setPartUploaded();
             }
         }
@@ -76,12 +80,13 @@ public void setUploadProgress(List<ProgressFile> progressFiles, float pct) {
         setFormSizeLabel(progressFiles, percentComplete);
     }
 
-
     public void clearPartsProgress(List<ProgressFile> progressFiles, SessionStatus sessionStatus) {
         for (ProgressFile file : progressFiles) {
-            if (file.getVaultFile() == null) continue;
+            String tagId = file.getVaultFile() != null && file.getVaultFile().id != null
+                    ? file.getVaultFile().id
+                    : file.getFile().getId();
 
-            SubmittingItem item = partsListView.findViewWithTag(file.getVaultFile().id);
+            SubmittingItem item = partsListView.findViewWithTag(tagId);
             if (item != null) {
                 if (sessionStatus == SessionStatus.FINISHED || file.getStatus() == P2PFileStatus.FINISHED) {
                     item.setPartUploaded();
@@ -98,9 +103,12 @@ private int getTotalUploadedSizePercent(List<ProgressFile> progressFiles) {
 
         for (ProgressFile file : progressFiles) {
             totalUploadedSize += file.getBytesTransferred();
-            if (file.getVaultFile() != null) {
-                totalSize += file.getVaultFile().size;
-            }
+
+            long size = file.getVaultFile() != null && file.getVaultFile().size > 0
+                    ? file.getVaultFile().size
+                    : file.getFile().getSize();
+
+            totalSize += size;
         }
 
         return totalSize > 0 ? Math.round((totalUploadedSize * 1f / totalSize) * 100) : 0;
@@ -112,9 +120,11 @@ private void setFormSizeLabel(List<ProgressFile> files, int percent) {
         long totalUploaded = 0;
 
         for (ProgressFile file : files) {
-            if (file.getVaultFile() != null) {
-                totalSize += file.getVaultFile().size;
-            }
+            long size = file.getVaultFile() != null && file.getVaultFile().size > 0
+                    ? file.getVaultFile().size
+                    : file.getFile().getSize();
+
+            totalSize += size;
             totalUploaded += file.getBytesTransferred();
         }
 
@@ -136,14 +146,29 @@ private void uploadProgressVisibility(List<ProgressFile> files, boolean isOnline
     private View createProgressFileItemView(@NonNull ProgressFile file, boolean offline) {
         SubmittingItem item = new SubmittingItem(getContext(), null, 0);
         ImageView thumbView = item.findViewById(R.id.fileThumb);
-        item.setTag(file.getVaultFile() != null ? file.getVaultFile().id : file.getFile().getId());
 
-        item.setPartName(file.getFile().getFileName());
-        item.setPartSize(file.getFile().getSize());
+        String tagId = file.getVaultFile() != null && file.getVaultFile().id != null
+                ? file.getVaultFile().id
+                : file.getFile().getId();
+        item.setTag(tagId);
+
+        String name = file.getVaultFile() != null && file.getVaultFile().name != null
+                ? file.getVaultFile().name
+                : file.getFile().getFileName();
+        item.setPartName(name);
+
+        long size = file.getVaultFile() != null && file.getVaultFile().size > 0
+                ? file.getVaultFile().size
+                : file.getFile().getSize();
+        item.setPartSize(size);
+
+        byte[] thumb = file.getVaultFile() != null && file.getVaultFile().thumb != null
+                ? file.getVaultFile().thumb
+                : file.getFile().getThumb();
 
-        if (file.getVaultFile() != null && file.getVaultFile().thumb != null) {
+        if (thumb != null) {
             Glide.with(getContext())
-                    .load(file.getVaultFile().thumb)
+                    .load(thumb)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .skipMemoryCache(true)
                     .into(thumbView);

From 14fb06bb32252a1311aec61813977e987b3c7219 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 16 Jul 2025 21:44:14 +0100
Subject: [PATCH 085/153] Finish saving files in DB

---
 .../viewmodel/PeerToPeerViewModel.kt          | 47 ++++++++++++++-----
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 047efee3d..aa61aba0b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -2,11 +2,15 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
 import android.content.Context
 import android.os.Build
+import android.os.Environment
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
+import com.hzontal.utils.MediaFile.isAudioFileType
+import com.hzontal.utils.MediaFile.isImageFileType
+import com.hzontal.utils.MediaFile.isVideoFileType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -28,7 +32,6 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.RegisterPeerResult
 import org.horizontal.tella.mobile.domain.peertopeer.IncomingRegistration
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.media.MediaFileHandler
-import org.horizontal.tella.mobile.util.FileUtil.getMimeType
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
@@ -236,20 +239,38 @@ class PeerToPeerViewModel @Inject constructor(
                     val file = File(path)
                     if (!file.exists()) return@forEach
 
-                    val vaultFile = when (progressFile.file.fileType) {
-                        "jpg", "jpeg" -> MediaFileHandler.saveJpegPhoto(file.readBytes(), folder.id)
-                            .blockingGet()
-
-                        "png" -> MediaFileHandler.savePngImage(file.readBytes())
-                        "mp4" -> MediaFileHandler.saveMp4Video(file, folder.id)
-                        else -> vault.builder(file.inputStream())
-                            .setName(file.name)
-                            .setMimeType(progressFile.file.fileType)
-                            .setType(VaultFile.Type.FILE)
-                            .build(folder.id)
-                            .blockingGet()
+                    val vaultFile = try {
+                        when {
+                            isImageFileType(progressFile.file.fileType) -> {
+                                val imageBytes = file.readBytes()
+                                if (progressFile.file.fileType.contains("png", ignoreCase = true)) {
+                                    MediaFileHandler.savePngImage(imageBytes)
+                                } else {
+                                    MediaFileHandler.saveJpegPhoto(imageBytes, folder.id)
+                                        .blockingGet()
+                                }
+                            }
+
+                            isVideoFileType(progressFile.file.fileType) -> {
+                                MediaFileHandler.saveMp4Video(file, folder.id)
+                            }
+
+                            else -> {
+                                vault.builder(file.inputStream())
+                                    .setName(file.name)
+                                    .setMimeType(progressFile.file.fileType)
+                                    .setType(VaultFile.Type.FILE)
+                                    .build(folder.id)
+                                    .blockingGet()
+                            }
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to save file ${progressFile.file.fileName}")
+                        null
                     }
 
+
+
                     progressFile.vaultFile = vaultFile
                     savedFiles++
 

From 07524d7c34a0d17e8321bc95cf96f66d43c3b3d2 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 16 Jul 2025 22:21:27 +0100
Subject: [PATCH 086/153] wip finish peer to peer result

---
 .../data/peertopeer/model/P2PFileStatus.kt     |  3 ++-
 .../tella/mobile/util/NavigationManager.kt     | 11 ++++++++++-
 .../RecipientUploadFilesFragment.kt            | 10 ++++++++++
 .../senderflow/PeerToPeerResultFragment.kt     |  4 +---
 .../senderflow/SenderUploadFilesFragment.kt    | 10 ++++++++++
 .../viewmodel/FileTransferViewModel.kt         |  2 ++
 .../viewmodel/PeerToPeerViewModel.kt           |  5 +++--
 .../main/res/navigation/peer_to_peer_graph.xml | 18 ++++++++++++++++--
 8 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
index 1a3f7d1c2..cd10bd3a4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
@@ -4,5 +4,6 @@ enum class P2PFileStatus {
     QUEUE,
     SENDING,
     FAILED,
-    FINISHED
+    FINISHED,
+    SAVED,
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index ddb249c4e..7eaca5738 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -224,12 +224,21 @@ class NavigationManager(
 
     fun navigateFromWaitingSenderFragmentToUploadFilesFragment() {
         navigateToWithBundle(R.id.action_waitingSenderFragment_to_uploadFilesFragment)
-    } 
+    }
+
+    fun navigateFromUploadSenderFragmentToPeerToPeerResultFragment() {
+        navigateToWithBundle(R.id.action_uploadSenderFragment_to_peerToPeerResultFragment)
+    }
+
+    fun navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment() {
+        navigateToWithBundle(R.id.action_recipientUploadFilesFragment_to_peerToPeerResultFragment)
+    }
 
     fun navigateFromRecipientSuccessFragmentToRecipientUploadFilesFragment() {
         navigateToWithBundle(R.id.action_recipientSuccessFragment_to_recipientUploadFilesFragment)
     }
 
+
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
         navControllerProvider.navController.navigate(
             R.id.startNearBySharingFragment,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 952a2d3a2..8671ea911 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -6,10 +6,12 @@ import androidx.fragment.app.activityViewModels
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
@@ -30,6 +32,8 @@ class RecipientUploadFilesFragment :
         super.onViewCreated(view, savedInstanceState)
         showFormEndView()
         observeUploadProgress()
+        viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+
         binding.cancel.setOnClickListener {
             showStandardSheet(
                 baseActivity.supportFragmentManager,
@@ -68,6 +72,12 @@ class RecipientUploadFilesFragment :
             val percentFloat = state.percent / 100f
             endView.setUploadProgress(files, percentFloat)
 
+            val allSaved = state.files.all { it.status == P2PFileStatus.SAVED }
+
+            if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
+                navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
+            }
+
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
index 13b8391b1..14bc6dd98 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -16,14 +16,12 @@ class PeerToPeerResultFragment :
     BaseBindingFragment<FragmentPeerToPeerResultBinding>(FragmentPeerToPeerResultBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
-    private lateinit var participant: PeerToPeerParticipant
     private var transferredFiles: List<ProgressFile>? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         // Get values from shared state
-        participant = PeerToPeerParticipant.SENDER
         transferredFiles = viewModel.p2PState.session?.files?.values?.toList()
 
         setupImage()
@@ -73,7 +71,7 @@ class PeerToPeerResultFragment :
 
         return when (successCount) {
             total -> {
-                val resId = if (participant == PeerToPeerParticipant.RECIPIENT)
+                val resId = if (viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
                     R.plurals.success_file_received_from_sender
                 else
                     R.plurals.success_file_sent_to_recipient
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 37a30da26..b3bf9cf62 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -5,6 +5,8 @@ import android.view.View
 import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
+import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
@@ -20,6 +22,7 @@ class SenderUploadFilesFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel.uploadAllFiles()
+        viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
         showFormEndView()
         observeUploadProgress()
         viewModel.uploadAllFiles()
@@ -54,6 +57,13 @@ class SenderUploadFilesFragment :
             val files = state.files
             val percentFloat = state.percent / 100f
             endView.setUploadProgress(files, percentFloat)
+
+
+            val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
+
+            if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
+                navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
+            }
         }
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 07b6bf5cf..c40403619 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -23,6 +23,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
 import org.horizontal.tella.mobile.util.fromJsonToObjectList
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import javax.inject.Inject
@@ -38,6 +39,7 @@ class FileTransferViewModel @Inject constructor(
     val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
     private val _uploadProgress = MutableLiveData<UploadProgressState>()
     val uploadProgress: LiveData<UploadProgressState> get() = _uploadProgress
+    var peerToPeerParticipant: PeerToPeerParticipant = PeerToPeerParticipant.SENDER
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
         return Single.fromCallable {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index aa61aba0b..927df4234 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -34,6 +34,7 @@ import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import java.io.File
@@ -46,7 +47,7 @@ class PeerToPeerViewModel @Inject constructor(
     peerToPeerManager: PeerToPeerManager,
     val p2PState: P2PSharedState
 ) : ViewModel() {
-
+    var peerToPeerParticipant: PeerToPeerParticipant = PeerToPeerParticipant.SENDER
     var isManualConnection: Boolean = true
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
@@ -270,7 +271,7 @@ class PeerToPeerViewModel @Inject constructor(
                     }
 
 
-
+                    p2PState.session?.files?.get(progressFile.file.id)?.status =  P2PFileStatus.SAVED
                     progressFile.vaultFile = vaultFile
                     savedFiles++
 
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index c16a8bc82..6f3ff107b 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -92,7 +92,11 @@
         android:id="@+id/recipientUploadFilesFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientUploadFilesFragment"
         android:label="recipientUploadFilesFragment"
-        tools:layout="@layout/fragment_upload_files" />
+        tools:layout="@layout/fragment_upload_files" >
+        <action
+            android:id="@+id/action_recipientUploadFilesFragment_to_peerToPeerResultFragment"
+            app:destination="@id/peerToPeerResultFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/prepareUploadFragment"
@@ -151,6 +155,16 @@
         android:id="@+id/uploadSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderUploadFilesFragment"
         android:label="UploadFilesFragment"
-        tools:layout="@layout/fragment_upload_files" />
+        tools:layout="@layout/fragment_upload_files" >
+        <action
+            android:id="@+id/action_uploadSenderFragment_to_peerToPeerResultFragment"
+            app:destination="@id/peerToPeerResultFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/peerToPeerResultFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerResultFragment"
+        android:label="PeerToPeerResultFragment"
+        tools:layout="@layout/fragment_peer_to_peer_result"/>
+
 
 </navigation>
\ No newline at end of file

From 633df7e04242be6a98ef79d28f1937afedd76d6f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 08:47:02 +0100
Subject: [PATCH 087/153] WIP fix design and result progress state

---
 .../data/peertopeer/model/P2PFileStatus.kt    |   6 +---
 .../receipentflow/ConnectHotspotFragment.kt   |   3 +-
 .../viewmodel/PeerToPeerViewModel.kt          |   6 +++-
 .../uwazi/widgets/PeerToPeerEndView.java      |  27 +++++++++---------
 .../adapters/connections/ServerViewHolder.kt  |   2 +-
 mobile/src/main/res/drawable/ic_p2p.xml       |  19 ++++++++++++
 .../src/main/res/drawable/ic_p2p_sharing.png  | Bin 0 -> 1539 bytes
 .../res/layout/connect_hotspot_layout.xml     |   7 -----
 .../src/main/res/layout/fragment_qr_code.xml  |   3 +-
 .../layout/start_near_by_sharing_fragment.xml |  10 +++++--
 mobile/src/main/res/values/strings.xml        |   2 +-
 mobile/src/main/res/values/styles.xml         |   3 --
 .../hzontal/shared_ui/buttons/RoundButton.kt  |  25 ++++++++++++----
 .../res/drawable/bg_rounded_information.xml   |  19 ++++++++++++
 .../res/layout/dual_text_check_layout.xml     |   2 +-
 .../main/res/layout/layout_round_button.xml   |   1 +
 shared-ui/src/main/res/values/attrs.xml       |   2 ++
 17 files changed, 93 insertions(+), 44 deletions(-)
 create mode 100644 mobile/src/main/res/drawable/ic_p2p.xml
 create mode 100644 mobile/src/main/res/drawable/ic_p2p_sharing.png
 create mode 100644 shared-ui/src/main/res/drawable/bg_rounded_information.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
index cd10bd3a4..766205915 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PFileStatus.kt
@@ -1,9 +1,5 @@
 package org.horizontal.tella.mobile.data.peertopeer.model
 
 enum class P2PFileStatus {
-    QUEUE,
-    SENDING,
-    FAILED,
-    FINISHED,
-    SAVED,
+    QUEUE, SENDING, FINISHED, SAVED, FAILED
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index c14b50ef8..501707d97 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -81,7 +81,6 @@ class ConnectHotspotFragment :
         }
 
         binding.toolbar.backClickListener = { baseActivity.onBackPressed() }
-        binding.backBtn.setOnClickListener { baseActivity.onBackPressed() }
     }
 
     private fun updateNextButtonState(connectionType: ConnectionType?) {
@@ -110,7 +109,7 @@ class ConnectHotspotFragment :
         if (ContextCompat.checkSelfPermission(baseActivity, ACCESS_FINE_LOCATION)
             != PackageManager.PERMISSION_GRANTED
         ) {
-            baseActivity.maybeChangeTemporaryTimeout{
+            baseActivity.maybeChangeTemporaryTimeout {
                 requestPermissionLauncher.launch(ACCESS_FINE_LOCATION)
             }
         } else {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 927df4234..a1f5fbca3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -270,8 +270,10 @@ class PeerToPeerViewModel @Inject constructor(
                         null
                     }
 
+                    //  Update both the shared session and local progress file status
+                    p2PState.session?.files?.get(progressFile.file.id)?.status = P2PFileStatus.SAVED
+                    progressFile.status = P2PFileStatus.SAVED //  <-- Important!
 
-                    p2PState.session?.files?.get(progressFile.file.id)?.status =  P2PFileStatus.SAVED
                     progressFile.vaultFile = vaultFile
                     savedFiles++
 
@@ -294,6 +296,7 @@ class PeerToPeerViewModel @Inject constructor(
                 }
             }
 
+            // ✅ Final session status
             p2PState.session?.status = SessionStatus.FINISHED
 
             _uploadProgress.postValue(
@@ -307,6 +310,7 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+
     override fun onCleared() {
         super.onCleared()
         p2PState.clear()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index 2f3f2b445..6aaa6c1b3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -70,7 +70,7 @@ public void setUploadProgress(List<ProgressFile> progressFiles, float pct) {
                     ? file.getVaultFile().id
                     : file.getFile().getId();
 
-            if (file.getStatus() == P2PFileStatus.FINISHED) {
+            if (isUploadedStatus(file.getStatus())) {
                 SubmittingItem item = partsListView.findViewWithTag(tagId);
                 if (item != null) item.setPartUploaded();
             }
@@ -88,7 +88,7 @@ public void clearPartsProgress(List<ProgressFile> progressFiles, SessionStatus s
 
             SubmittingItem item = partsListView.findViewWithTag(tagId);
             if (item != null) {
-                if (sessionStatus == SessionStatus.FINISHED || file.getStatus() == P2PFileStatus.FINISHED) {
+                if (sessionStatus == SessionStatus.FINISHED || isUploadedStatus(file.getStatus())) {
                     item.setPartUploaded();
                 } else {
                     item.setPartCleared();
@@ -174,21 +174,20 @@ private View createProgressFileItemView(@NonNull ProgressFile file, boolean offl
                     .into(thumbView);
         }
 
-        switch (file.getStatus()) {
-            case FINISHED:
+        if (isUploadedStatus(file.getStatus())) {
+            item.setPartUploaded();
+        } else {
+            if (previewUploaded) {
                 item.setPartUploaded();
-                break;
-            case FAILED:
-            case QUEUE:
-            case SENDING:
-                if (previewUploaded) {
-                    item.setPartUploaded();
-                } else {
-                    item.setPartPrepared(offline);
-                }
-                break;
+            } else {
+                item.setPartPrepared(offline);
+            }
         }
 
         return item;
     }
+
+    private boolean isUploadedStatus(P2PFileStatus status) {
+        return status == P2PFileStatus.FINISHED || status == P2PFileStatus.SAVED;
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
index 36b117ea0..657fd4e05 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
@@ -103,7 +103,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                 reportTypeImg.setImageDrawable(
                     ResourcesCompat.getDrawable(
                         view.resources,
-                        R.drawable.ic_share,
+                        R.drawable.ic_p2p,
                         null
                     )
                 )
diff --git a/mobile/src/main/res/drawable/ic_p2p.xml b/mobile/src/main/res/drawable/ic_p2p.xml
new file mode 100644
index 000000000..69ed0f6f2
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_p2p.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M4.308,19.5C3.811,19.5 3.385,19.323 3.031,18.969C2.677,18.615 2.5,18.189 2.5,17.692V4.308C2.5,3.811 2.677,3.385 3.031,3.031C3.385,2.677 3.811,2.5 4.308,2.5H9.096C9.593,2.5 10.019,2.677 10.373,3.031C10.727,3.385 10.904,3.811 10.904,4.308V8.923H9.404V6.913H4V15.087H10.904V17.692C10.904,18.189 10.727,18.615 10.373,18.969C10.019,19.323 9.593,19.5 9.096,19.5H4.308ZM14.817,21.5C14.344,21.5 13.939,21.331 13.602,20.994C13.265,20.657 13.096,20.252 13.096,19.779V15.087H14.596V17.087H20V8.923H13.096V6.308C13.096,5.811 13.273,5.385 13.627,5.031C13.981,4.677 14.407,4.5 14.904,4.5H19.692C20.189,4.5 20.615,4.677 20.969,5.031C21.323,5.385 21.5,5.811 21.5,6.308V19.692C21.5,20.189 21.323,20.615 20.969,20.969C20.615,21.323 20.189,21.5 19.692,21.5H14.817ZM4,16.587V17.692C4,17.782 4.029,17.856 4.087,17.913C4.144,17.971 4.218,18 4.308,18H9.096C9.186,18 9.26,17.971 9.317,17.913C9.375,17.856 9.404,17.782 9.404,17.692V16.587H4ZM14.596,18.587V19.692C14.596,19.782 14.625,19.856 14.683,19.913C14.74,19.971 14.814,20 14.904,20H19.692C19.782,20 19.856,19.971 19.913,19.913C19.971,19.856 20,19.782 20,19.692V18.587H14.596ZM4,5.413H9.404V4.308C9.404,4.218 9.375,4.144 9.317,4.087C9.26,4.029 9.186,4 9.096,4H4.308C4.218,4 4.144,4.029 4.087,4.087C4.029,4.144 4,4.218 4,4.308V5.413ZM14.596,7.423H20V6.308C20,6.218 19.971,6.144 19.913,6.087C19.856,6.029 19.782,6 19.692,6H14.904C14.814,6 14.74,6.029 14.683,6.087C14.625,6.144 14.596,6.218 14.596,6.308V7.423Z"
+        android:fillColor="#ffffff"/>
+  </group>
+  <path
+      android:pathData="M8,12.5L9,13.5L8,14L6,12L8,10L9,10.5L8,11.5H12V12.5H8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,11.5L15,10.5L16,10L18,12L16,14L15,13.5L16,12.5H12V11.5H16Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_p2p_sharing.png b/mobile/src/main/res/drawable/ic_p2p_sharing.png
new file mode 100644
index 0000000000000000000000000000000000000000..d827a7ec519a86a2b412ee5644e4e8838ec46eba
GIT binary patch
literal 1539
zcmV+e2K@PnP)<h;3K|Lk000e1NJLTq002<{002-31^@s6VbhtD00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1(-=hK~#7F?VL?g
z<3<$6UmKH3cD?~(30}n6O<+=yPY~t=W0tAG1wH}h1U6$*S(-Tk<OJ4KfNeYraCTNs
zFiwRG6#nRW&ys8-%SLLoB!l}`CG3`4vh;WN>(}qK08l6t3WY+UP$(3Uz+j2Ee!o><
zjMee3P1aq_Z<Gu($nmX{?YEpml>x7A6t9k){V7-?I7{WMH=sefrv*3^TD7f16z~+^
zW;n2NyP{{D&(g3&V7FTv71C+b?{PQpw<{drz$v4MN9!e{GddM45!ek!t!Lxcr@L~y
zu4nFUyJz@TpEyY=yLVBYthZDmB35@soA^}4*6**hyZ^fle5(z2aOeO_?QZV<dG4;e
zR5lT@TOu>(Rl5FdE64jQjiK!%IGDW8^P9zK0f|5&a?Ul}8n}Jt;b`EdLyV9xqx%>P
z{+(6truNeg8?Z+Lvi@p5Te@n_I>xt%c++$de}QEmG7t_OHxlvyVj?w2jjx%dJO%l?
z_TxUlfNY>umoekJ{^}1;xkA4EM7-fPIQBs<>*%|g5Cbjr6UohCy>!(r%+Q5F*JZqi
z9d8ydeErD2L_`61@Z}7m;TT1Xtwp+_5%~VUZiO=_IQz(j$rdlle$U}|bk4cT)E(Y{
z7$n&KMEQG22zvxR!=^O0mnpuReRp{Z0T6X@nxb70TXhozum>U?#Gz|`G`bGZPBIS8
zET%&v@Vo(J77Onu+5;My5)DFv=Q8nS7sWKFoPBrIyso`IVhnykJNafa;9NTBmzP~G
zN*x5jV+(F~XHH#Bf;;6!F5qQj*Vi=~m?r1U4x%lQgeXAt971?^%8Lqa`B@(h2b<eo
zZYVb6KjZkT^IkWDE)RUM0vF}U`U~5g@dik|f@`;dn+d_u;ITc`sg--#^_$w(8P1n?
zh6OhIGa|+Kn){eVwuw_M5N|pUf>0lJ?b5*W2Vwg3!8mVDu_nHLf^NF%{&?8}5Kn?W
zBKocTE&7cH>%%9$!VMaL<{cv{;zw}Vg#hSa*}8?qcCyPsju92H?YId+AzK83#59-%
z=DBreVb>~3mMxwb2}(o>B+;EI!DCF6=Z$;@$U}#Sh+RZG2ypJBo(Xei6+!Xv6Q!ZL
zvjmig5{SGzTe;hZIwRYc{^o<9e6OE#-rqj#bH*~8dzU3hm`GdVP{3jCmhDjfg7>?P
zR_(P8A)u@s1_;{2d<chw>yz!oeaFZ|90|xLLhqb?*eG5Y5CWRV()`vbV`RFJw2+aA
z=qX^p<j*|lJaj&%oV1YAZK9WeK)xZy;pE;Zw?b5Q$jlZJvU``i5Hr$6^bnAsgirw@
zCMhAMcW1PFe?XEj{t;qEdP^jGg&8zj#x{-_+AFGXUk7Bt2O7FKlq(rUz^$C|)hWbG
zB!1$Qkc@70aQJO+H9xsHQWQ$M^ZrU5f1JbxBqDQh+#@KGyGwT)UMa^Q*aD7MZ9%dE
z5|KLFQ$jM<`2r6bgy9~@JdEsK(gOM>Z1Vo*WcwiOOvO#B@=Bw%gnsLLB=B{J6E1ND
zL{da4qUgYq36pSg(ZSfE=V0Uhj=0t_21QiF9eb030Up6uTfnw!_d-6rq~eJZP$Eh|
zi6{Y4n@ICx(RJ2jODph#5Eb!rh~>t@(>`*wU;%k<%SaY-A(W_1)IgjycwzW$iKeTp
zOH78F@XYc1Fc3vv$nlM0{j}#3RWqFJQxK=%D(6L)2MR-TO)j7EobS`zl_3N?!nw0=
zn`r-P>mX;55iMe(=Sj-&0thrZJBy6$?k(K47d4O|ija$AM_uIQOMJqu5Zpfy950VR
z+VwB=zjWczJsxagLs$n%Ec)E}7^2|_mI*!`RgcUg5an6?hbC@4&{zQRXQRpfku5!s
p-8WPy6bgkxp-?Ck3WY)eUjfq!132>aF@pdA002ovPDHLkV1gdd%H{w7

literal 0
HcmV?d00001

diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
index 171c2009e..40dd27594 100644
--- a/mobile/src/main/res/layout/connect_hotspot_layout.xml
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -115,13 +115,6 @@
         app:leftText="@string/same_wifi_text" />
 
 
-    <TextView
-        android:id="@+id/back_btn"
-        style="@style/Unlock_White_Text_Back"
-        android:text="@string/LockSelect_Action_Back"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <TextView
         android:id="@+id/next_btn"
         style="@style/Unlock_White_Text_Next"
diff --git a/mobile/src/main/res/layout/fragment_qr_code.xml b/mobile/src/main/res/layout/fragment_qr_code.xml
index 26a86698e..3efd2afa7 100644
--- a/mobile/src/main/res/layout/fragment_qr_code.xml
+++ b/mobile/src/main/res/layout/fragment_qr_code.xml
@@ -67,12 +67,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/qrCodeImageView" />
 
-    <!-- Manual Connection Button -->
     <org.hzontal.shared_ui.buttons.RoundButton
         android:id="@+id/connectManuallyButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
+        app:text_all_caps="true"
+        app:default_background="@drawable/bg_rounded_information"
         android:backgroundTint="@color/light_purple"
         android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
index 24a6169f6..4449cde65 100644
--- a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
+++ b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="50dp"
         android:layout_marginBottom="24dp"
-        android:background="@drawable/ic_share_big"
+        android:background="@drawable/ic_p2p_sharing"
         app:layout_constraintBottom_toTopOf="@+id/shareFilesTitleTv"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/shareFilesTitleTv"
-        style="@style/Tella_Main_White_Text.Meduim"
+        style="@style/Tella_Main_White_Text.Bold"
         android:layout_marginBottom="12dp"
         android:text="@string/how_it_works"
         android:textSize="18sp"
@@ -72,7 +72,9 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/shareFilesDescriptionTv"
-        app:text="@string/send_files" />
+        app:text="@string/send_files"
+        app:text_all_caps="true"
+        app:text_round_bold="true" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
         android:id="@+id/receiveFilesBtn"
@@ -85,6 +87,8 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintTop_toBottomOf="@+id/sendFilesBtn"
         app:text="@string/receive_files"
+        app:text_all_caps="true"
+        app:text_round_bold="true"
         tools:layout_editor_absoluteX="24dp" />
 
     <TextView
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index c5800651c..f1b66bebf 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1004,7 +1004,7 @@ Would you like to share analytics with the Tella team?</string>
   <string name="Collect_MediaWidget_Attach_File">Attach file</string>
   <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="connect_to_device">Connect to device</string>
-  <string name="qr_code_sender_instruction">Show this QR code for the sender to scan</string>
+  <string name="qr_code_sender_instruction">Show this QR code for the\n sender to scan</string>
   <string name="qr_code_scan_instruction">Scan the recipient’s QR code</string>
   <string name="qr_code_issue_prompt">Having trouble with the QR code?</string>
   <string name="connect_manually">Connect manually</string>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 40583fcd0..b701d9e9f 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -427,9 +427,6 @@
         <item name="android:textColor">@color/wa_white</item>
         <item name="android:textSize">40sp</item>
     </style>
-    <style name="Tella_Main_White_Text.Bold">
-        <item name="android:textStyle">bold</item>
-    </style>
 
     <style name="DialogDataCollectionTextEntryLayout" parent="Theme.AppCompat.Light.NoActionBar">
 
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
index a7c654873..82376aefe 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
@@ -26,24 +26,26 @@ class RoundButton @JvmOverloads constructor(
     private val binding: LayoutRoundButtonBinding =
         LayoutRoundButtonBinding.inflate(LayoutInflater.from(context), this, true)
     private var mChecked = false
+    private var isTextBold = false
+    private var defaultBackground = R.drawable.bg_information_button
     var clickListener: (() -> Unit)? = null
 
     init {
-        initView()
         initListeners()
         extractAttributes(attrs, defStyleAttr)
+        initView()
     }
 
     private fun initView() {
         binding.sheetTextView.background =
-            ContextCompat.getDrawable(context, R.drawable.bg_information_button)
+            ContextCompat.getDrawable(context, defaultBackground)
     }
 
     private fun extractAttributes(attrs: AttributeSet?, defStyleAttr: Int) {
         attrs?.let {
             val typedArray = context.obtainStyledAttributes(
-                    attrs, R.styleable.RoundButton, defStyleAttr, defStyleAttr
-                )
+                attrs, R.styleable.RoundButton, defStyleAttr, defStyleAttr
+            )
 
             try {
                 text = typedArray.getResourceId(R.styleable.RoundButton_text, -1)
@@ -51,6 +53,11 @@ class RoundButton @JvmOverloads constructor(
                 tintColor = typedArray.getColor(R.styleable.RoundButton_tint_color, -1)
                 textColor = typedArray.getColor(R.styleable.RoundButton_text_color, -1)
                 isTextAllCaps = typedArray.getBoolean(R.styleable.RoundButton_text_all_caps, false)
+                isTextBold = typedArray.getBoolean(R.styleable.RoundButton_text_round_bold, false)
+                defaultBackground = typedArray.getResourceId(
+                    R.styleable.RoundButton_default_background,
+                    R.drawable.bg_information_button
+                )
                 isChecked = mChecked
 
             } finally {
@@ -74,6 +81,7 @@ class RoundButton @JvmOverloads constructor(
         setTextAndVisibility(text, binding.sheetTextView)
         setBackgroundTintColor(tintColor)
         setTextCaps(isTextAllCaps)
+        setTextBold(isBold = isTextBold)
     }
 
     private fun setTextAndVisibility(text: Int, textView: TextView) {
@@ -125,7 +133,7 @@ class RoundButton @JvmOverloads constructor(
             context,
             R.drawable.bg_information_button_selected
         )
-        else ContextCompat.getDrawable(context, R.drawable.bg_information_button)
+        else ContextCompat.getDrawable(context, defaultBackground)
     }
 
     //TODO FIX TEXT ALLCAPS EVERY WHERE
@@ -133,4 +141,11 @@ class RoundButton @JvmOverloads constructor(
         binding.sheetTextView.isAllCaps = isTextAllCaps
     }
 
+    private fun setTextBold(isBold: Boolean) {
+        binding.sheetTextView.setTypeface(
+            null,
+            if (isBold) android.graphics.Typeface.BOLD else android.graphics.Typeface.NORMAL
+        )
+    }
+
 }
\ No newline at end of file
diff --git a/shared-ui/src/main/res/drawable/bg_rounded_information.xml b/shared-ui/src/main/res/drawable/bg_rounded_information.xml
new file mode 100644
index 000000000..2b5859aa4
--- /dev/null
+++ b/shared-ui/src/main/res/drawable/bg_rounded_information.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <corners
+        android:radius="25dp"
+        >
+    </corners>
+
+    <solid
+        android:color="#29FFFFFF"
+        >
+    </solid>
+    <stroke
+        android:color="#29FFFFFF"
+        >
+    </stroke>
+</shape>
\ No newline at end of file
diff --git a/shared-ui/src/main/res/layout/dual_text_check_layout.xml b/shared-ui/src/main/res/layout/dual_text_check_layout.xml
index 6e4b2009f..3ac94e105 100644
--- a/shared-ui/src/main/res/layout/dual_text_check_layout.xml
+++ b/shared-ui/src/main/res/layout/dual_text_check_layout.xml
@@ -12,7 +12,7 @@
         style="@style/Tella_Main_White_Text.Meduim"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:maxLines="1"
+        android:maxLines="2"
         android:ellipsize="end"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/shared-ui/src/main/res/layout/layout_round_button.xml b/shared-ui/src/main/res/layout/layout_round_button.xml
index d1adb1530..1964bc85d 100644
--- a/shared-ui/src/main/res/layout/layout_round_button.xml
+++ b/shared-ui/src/main/res/layout/layout_round_button.xml
@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="54dp"
         android:gravity="center"
+        android:textFontWeight="700"
         tools:text=",e,f eazfazef"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/shared-ui/src/main/res/values/attrs.xml b/shared-ui/src/main/res/values/attrs.xml
index 6cbaa3a85..b5051fd84 100644
--- a/shared-ui/src/main/res/values/attrs.xml
+++ b/shared-ui/src/main/res/values/attrs.xml
@@ -26,6 +26,8 @@
         <attr name="tint_color" format="color|reference" />
         <attr name="text_color" format="color|reference" />
         <attr name="text_all_caps" format="boolean"/>
+        <attr name="text_round_bold" format="boolean"/>
+        <attr name="default_background" format="reference"/>
     </declare-styleable>
 
 

From f66069aec494ea4178e5fb6e2539668a5a114dbd Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 11:26:30 +0100
Subject: [PATCH 088/153] fix qrcode design

---
 .../senderflow/ScanQrCodeFragment.kt          |  2 +
 .../res/drawable/qr_scan_border_camera.xml    |  9 ++++
 .../main/res/layout/scan_qrcode_fragment.xml  | 41 ++++++++++++-------
 3 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 mobile/src/main/res/drawable/qr_scan_border_camera.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 81972b300..645c89314 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -36,6 +36,8 @@ class ScanQrCodeFragment :
 
         barcodeView = CompoundBarcodeView(requireContext())
         barcodeView = binding.qrCodeScanView
+        barcodeView.statusView.visibility = View.GONE
+        barcodeView.viewFinder.visibility = View.GONE
 
         if (ContextCompat.checkSelfPermission(
                 requireContext(),
diff --git a/mobile/src/main/res/drawable/qr_scan_border_camera.xml b/mobile/src/main/res/drawable/qr_scan_border_camera.xml
new file mode 100644
index 000000000..fa868009e
--- /dev/null
+++ b/mobile/src/main/res/drawable/qr_scan_border_camera.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="248dp"
+    android:height="249dp"
+    android:viewportWidth="248"
+    android:viewportHeight="249">
+  <path
+      android:pathData="M0,8.25C0,6.19 0.82,4.22 2.27,2.77C3.72,1.32 5.69,0.5 7.75,0.5L54.25,0.5C56.31,0.5 58.28,1.32 59.73,2.77C61.18,4.22 62,6.19 62,8.25C62,10.31 61.18,12.28 59.73,13.73C58.28,15.18 56.31,16 54.25,16H36.5C24.9,16 15.5,25.4 15.5,37V54.75C15.5,56.81 14.68,58.78 13.23,60.23C11.78,61.68 9.81,62.5 7.75,62.5C5.69,62.5 3.72,61.68 2.27,60.23C0.82,58.78 0,56.81 0,54.75V8.25ZM186,8.25C186,6.19 186.82,4.22 188.27,2.77C189.72,1.32 191.7,0.5 193.75,0.5L240.25,0.5C242.3,0.5 244.28,1.32 245.73,2.77C247.18,4.22 248,6.19 248,8.25V54.75C248,56.81 247.18,58.78 245.73,60.23C244.28,61.68 242.3,62.5 240.25,62.5C238.2,62.5 236.22,61.68 234.77,60.23C233.32,58.78 232.5,56.81 232.5,54.75V37C232.5,25.4 223.1,16 211.5,16H193.75C191.7,16 189.72,15.18 188.27,13.73C186.82,12.28 186,10.31 186,8.25ZM7.75,186.5C9.81,186.5 11.78,187.32 13.23,188.77C14.68,190.22 15.5,192.2 15.5,194.25V212C15.5,223.6 24.9,233 36.5,233H54.25C56.31,233 58.28,233.82 59.73,235.27C61.18,236.72 62,238.7 62,240.75C62,242.8 61.18,244.78 59.73,246.23C58.28,247.68 56.31,248.5 54.25,248.5H7.75C5.69,248.5 3.72,247.68 2.27,246.23C0.82,244.78 0,242.8 0,240.75V194.25C0,192.2 0.82,190.22 2.27,188.77C3.72,187.32 5.69,186.5 7.75,186.5ZM240.25,186.5C242.3,186.5 244.28,187.32 245.73,188.77C247.18,190.22 248,192.2 248,194.25V240.75C248,242.8 247.18,244.78 245.73,246.23C244.28,247.68 242.3,248.5 240.25,248.5H193.75C191.7,248.5 189.72,247.68 188.27,246.23C186.82,244.78 186,242.8 186,240.75C186,238.7 186.82,236.72 188.27,235.27C189.72,233.82 191.7,233 193.75,233H211.5C223.1,233 232.5,223.6 232.5,212V194.25C232.5,192.2 233.32,190.22 234.77,188.77C236.22,187.32 238.2,186.5 240.25,186.5Z"
+      android:fillColor="#D6933B"/>
+</vector>
diff --git a/mobile/src/main/res/layout/scan_qrcode_fragment.xml b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
index 8e7336bcf..0ec002320 100644
--- a/mobile/src/main/res/layout/scan_qrcode_fragment.xml
+++ b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
@@ -30,27 +30,40 @@
         app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
 
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
-        android:id="@+id/qrCodeScanView"
-        android:layout_width="240dp"
-        android:layout_height="240dp"
+    <FrameLayout
+        android:layout_width="248dp"
+        android:layout_height="248dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/qr_scan_border"
-        android:keepScreenOn="true"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:id="@+id/qrCodeScanViewFrame"
+        app:layout_constraintTop_toBottomOf="@id/titleTextView"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titleTextView" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <!-- Camera preview -->
+        <com.journeyapps.barcodescanner.CompoundBarcodeView
+            android:id="@+id/qrCodeScanView"
+            android:layout_width="240dp"
+            android:layout_height="240dp"
+            android:layout_gravity="center"
+            android:keepScreenOn="true" />
 
+        <!-- Rounded border overlay -->
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/qr_scan_border_camera"
+            android:scaleType="fitXY"
+            android:contentDescription="@null" />
+    </FrameLayout>
 
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress_circular"
         style="@style/Tella_Progress_Circular"
-        app:layout_constraintBottom_toBottomOf="@id/qrCodeScanView"
-        app:layout_constraintEnd_toEndOf="@id/qrCodeScanView"
-        app:layout_constraintStart_toStartOf="@id/qrCodeScanView"
-        app:layout_constraintTop_toTopOf="@id/qrCodeScanView" />
+        app:layout_constraintBottom_toBottomOf="@id/qrCodeScanViewFrame"
+        app:layout_constraintEnd_toEndOf="@id/qrCodeScanViewFrame"
+        app:layout_constraintStart_toStartOf="@id/qrCodeScanViewFrame"
+        app:layout_constraintTop_toTopOf="@id/qrCodeScanViewFrame" />
 
     <!-- Troubleshooting Text -->
     <TextView
@@ -62,7 +75,7 @@
         android:text="@string/qr_code_issue_prompt"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/qrCodeScanView" />
+        app:layout_constraintTop_toBottomOf="@id/qrCodeScanViewFrame" />
 
     <!-- Manual Connection Button -->
     <org.hzontal.shared_ui.buttons.RoundButton

From 1f0bf26906a6990286bb70d54e43b14726b7fa4a Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 11:36:49 +0100
Subject: [PATCH 089/153] fix design of all buttons

---
 mobile/src/main/res/layout/connect_manually_verification.xml    | 2 ++
 .../src/main/res/layout/drop_box_connected_server_fragment.xml  | 1 +
 mobile/src/main/res/layout/fragment_peer_to_peer_result.xml     | 1 +
 mobile/src/main/res/layout/fragment_recipient_success.xml       | 2 ++
 mobile/src/main/res/layout/scan_qrcode_fragment.xml             | 1 +
 5 files changed, 7 insertions(+)

diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 53d5235ed..67f76b0d2 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -98,6 +98,7 @@
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:background="@drawable/bg_round_orange16_btn"
         app:text_color="@color/btn_dark_letter"
+        app:text_all_caps="true"
         app:check_state="false"
         app:layout_constraintTop_toBottomOf="@id/warningTextView"
         app:layout_constraintBottom_toTopOf="@+id/discardBtn"
@@ -112,6 +113,7 @@
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         app:check_state="false"
+        app:text_all_caps="true"
         app:layout_constraintTop_toBottomOf="@id/confirmAndConnectBtn"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml b/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
index de80445f6..07a01f5dd 100644
--- a/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
+++ b/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
@@ -74,6 +74,7 @@
         android:background="@drawable/bg_round_orange_btn"
         app:text_color="@color/btn_dark_letter"
         app:text="@string/go_to_dropbox"
+        app:text_all_caps="true"
         app:check_state="false"
         app:layout_constraintTop_toBottomOf="@+id/sheet_subtitle"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
index 3cb86a22e..4f0dfdc52 100644
--- a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
+++ b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
@@ -49,6 +49,7 @@
         android:backgroundTint="@color/tigers_eye"
         android:text="@string/view_files"
         app:check_state="false"
+        app:text_all_caps="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/mobile/src/main/res/layout/fragment_recipient_success.xml b/mobile/src/main/res/layout/fragment_recipient_success.xml
index ddd7d88d5..2835e1fc5 100644
--- a/mobile/src/main/res/layout/fragment_recipient_success.xml
+++ b/mobile/src/main/res/layout/fragment_recipient_success.xml
@@ -68,6 +68,7 @@
             app:text_color="@color/btn_dark_letter"
             app:text="@string/accept"
             app:check_state="false"
+            app:text_all_caps="true"
             app:layout_constraintBottom_toTopOf="@+id/reject_btn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -82,6 +83,7 @@
             android:layout_marginTop="10dp"
             android:gravity="center"
             app:text="@string/reject"
+            app:text_all_caps="true"
             app:layout_constraintTop_toBottomOf="@+id/accept_btn" />
 
 
diff --git a/mobile/src/main/res/layout/scan_qrcode_fragment.xml b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
index 0ec002320..23b8cac89 100644
--- a/mobile/src/main/res/layout/scan_qrcode_fragment.xml
+++ b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
@@ -85,6 +85,7 @@
         android:layout_marginTop="12dp"
         android:backgroundTint="@color/light_purple"
         android:textColor="@android:color/white"
+        app:text_all_caps="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/helpTextView"

From 9ae5269d7eda110f1cd82f2346f98761724bacae Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 12:27:23 +0100
Subject: [PATCH 090/153] fix design

---
 .../senderflow/PrepareUploadFragment.kt       | 15 ++++++++
 .../senderflow/ScanQrCodeFragment.kt          |  3 ++
 .../SenderManualConnectionFragment.kt         |  9 +----
 .../senderflow/SenderVerificationFragment.kt  | 37 ++++++++++++++++---
 .../main/res/layout/scan_qrcode_fragment.xml  |  1 +
 5 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 4a7e44303..c943f99b8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -99,7 +99,22 @@ class PrepareUploadFragment :
                     )
                 }
             }
+        findNavController().currentBackStackEntry
+            ?.savedStateHandle
+            ?.getLiveData<Boolean>("registrationSuccess")
+            ?.observe(viewLifecycleOwner) { success ->
+                if (success == true) {
+                    DialogUtils.showBottomMessage(
+                        baseActivity,
+                        "Success! Connected to device",
+                        false
+                    )
 
+                    // Remove it so it's not shown again on back navigation
+                    findNavController().currentBackStackEntry?.savedStateHandle
+                        ?.remove<Boolean>("registrationSuccess")
+                }
+            }
         binding.toolbar.backClickListener = {
             BottomSheetUtils.showConfirmSheet(
                 baseActivity.supportFragmentManager,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index 645c89314..e98af9c0d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
 import com.google.gson.Gson
 import com.journeyapps.barcodescanner.BarcodeCallback
 import com.journeyapps.barcodescanner.BarcodeResult
@@ -130,6 +131,8 @@ class ScanQrCodeFragment :
     private fun initObservers() {
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
+                findNavController().currentBackStackEntry?.savedStateHandle
+                    ?.set("registrationSuccess", true)
                 navManager().navigateFromScanQrCodeToPrepareUploadFragment()
             } else {
                 //  handle error UI
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index dc9b5d9c1..cfe2149e1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -73,13 +73,8 @@ class SenderManualConnectionFragment :
                 getString(R.string.try_again),
                 null,
              {
-                viewModel.startRegistration(
-                    ip = viewModel.p2PState.ip,
-                    port = viewModel.p2PState.port,
-                    hash = viewModel.p2PState.hash,
-                    pin = viewModel.p2PState.pin.toString()
-                )
-            })
+                 viewModel.handleCertificate(viewModel.p2PState.ip, viewModel.p2PState.port, viewModel.p2PState.pin.toString())
+             })
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index e5468e659..c4edc90f5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -3,12 +3,15 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
 import org.horizontal.tella.mobile.util.formatHash
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import org.hzontal.shared_ui.utils.DialogUtils
 import javax.inject.Inject
 
 class SenderVerificationFragment :
@@ -53,13 +56,35 @@ class SenderVerificationFragment :
     private fun initObservers() {
 
         viewModel.isManualConnection = true
+            viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+                if (success) {
+                    findNavController().currentBackStackEntry?.savedStateHandle
+                        ?.set("registrationSuccess", true)
+                    navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
+                } else {
+                    //  handle error UI
+                }
+        }
+        viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
+            DialogUtils.showBottomMessage(baseActivity, message, true)
+        }
 
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
-            } else {
-                //  handle error UI
-            }
+        viewModel.bottomSheetError.observe(viewLifecycleOwner) { (title, description) ->
+            showStandardSheet(
+                baseActivity.supportFragmentManager,
+                title,
+                description,
+                null,
+                getString(R.string.try_again),
+                null,
+                {
+                    viewModel.startRegistration(
+                        ip = viewModel.p2PState.ip,
+                        port = viewModel.p2PState.port,
+                        hash = viewModel.p2PState.hash,
+                        pin = viewModel.p2PState.pin.toString()
+                    )
+                })
         }
     }
 }
diff --git a/mobile/src/main/res/layout/scan_qrcode_fragment.xml b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
index 23b8cac89..1ef50953d 100644
--- a/mobile/src/main/res/layout/scan_qrcode_fragment.xml
+++ b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
@@ -83,6 +83,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
+        app:circularflow_radiusInDP="25px"
         android:backgroundTint="@color/light_purple"
         android:textColor="@android:color/white"
         app:text_all_caps="true"

From f4c7a7f8f7309c6cb1d29c4faed79813b7860afd Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 17 Jul 2025 12:28:11 +0100
Subject: [PATCH 091/153] WIP code

---
 .../data/peertopeer/PeerToPeerConstants.kt    |  2 -
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 21 ++++--
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 75 +++++++++++--------
 .../viewmodel/FileTransferViewModel.kt        |  7 +-
 4 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt
index 6359cd70a..fd4b8629e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerToPeerConstants.kt
@@ -8,6 +8,4 @@ object PeerToPeerConstants {
     const val CONTENT_TYPE_JSON = "application/json"
     const val CONTENT_TYPE = "Content-Type"
     const val CONTENT_TYPE_OCTET = "application/octet-stream"
-
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index daec37b6f..d287d089c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -198,20 +199,29 @@ class TellaPeerToPeerClient @Inject constructor() {
         transmissionId: String,
         inputStream: InputStream,
         fileSize: Long,
+        fileName: String,
         onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
 
-        Timber.d("session id from the client+$sessionId")
         val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
-
         val client = getClientWithFingerprintValidation(expectedFingerprint)
 
-        val requestBody = ProgressRequestBody(inputStream, fileSize, onProgress)
+        // Progress-aware RequestBody for the actual file content
+        val fileBody = ProgressRequestBody(inputStream, fileSize, onProgress)
+
+        // Multipart body
+        val multipartBody = MultipartBody.Builder()
+            .setType(MultipartBody.FORM)
+            .addFormDataPart(
+                "file", // form field name
+                fileName, // filename
+                fileBody // content
+            )
+            .build()
 
         val request = Request.Builder()
             .url(url)
-            .put(requestBody)
-            .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
+            .put(multipartBody)
             .build()
 
         return@withContext try {
@@ -230,4 +240,5 @@ class TellaPeerToPeerClient @Inject constructor() {
         }
     }
 
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index c43e084f1..ff7ca4e9e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -1,6 +1,9 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
 import io.ktor.http.HttpStatusCode
+import io.ktor.http.content.PartData
+import io.ktor.http.content.forEachPart
+import io.ktor.http.content.streamProvider
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.call
 import io.ktor.server.application.install
@@ -11,6 +14,7 @@ import io.ktor.server.engine.sslConnector
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
+import io.ktor.server.request.receiveMultipart
 import io.ktor.server.request.receiveStream
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
@@ -201,7 +205,7 @@ class TellaPeerToPeerServer(
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
 
-                        Timber.d("session id from the server +$sessionId")
+                        Timber.d("session id from the server: $sessionId")
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
@@ -220,53 +224,64 @@ class TellaPeerToPeerServer(
                             return@put
                         }
 
-                        val tmpFile = File.createTempFile(fileId, ".tmp")
-                        val output = tmpFile.outputStream().buffered()
-
                         try {
-                            val input = call.receiveStream().buffered()
-                            val totalSize = session.files.values.sumOf { it.file.size }
+                            val multipart = call.receiveMultipart()
                             var bytesRead = 0L
-                            val buffer = ByteArray(8192)
-
-                            while (true) {
-                                val read = input.read(buffer)
-                                if (read == -1) break
-                                output.write(buffer, 0, read)
-                                bytesRead += read
-                                progressFile.bytesTransferred = bytesRead.toInt()
-
-                                // Optional: update session progress percent
-                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
-                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
-
-                                val state = UploadProgressState(
-                                    title = session.title ?: "",
-                                    percent = percent,
-                                    sessionStatus = session.status,
-                                    files = session.files.values.toList()
-                                )
-                                PeerEventManager.onUploadProgressState(state)
+                            val tmpFile = File.createTempFile(fileId, ".tmp")
+                            val output = tmpFile.outputStream().buffered()
+
+                            multipart.forEachPart { part ->
+                                if (part is PartData.FileItem) {
+                                    val input = part.streamProvider().buffered()
+                                    val buffer = ByteArray(8192)
+
+                                    while (true) {
+                                        val read = input.read(buffer)
+                                        if (read == -1) break
+                                        output.write(buffer, 0, read)
+                                        bytesRead += read
+                                        progressFile.bytesTransferred = bytesRead.toInt()
+
+                                        // Update progress
+                                        val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
+                                        val totalSize = session.files.values.sumOf { it.file.size }
+                                        val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+
+                                        val state = UploadProgressState(
+                                            title = session.title.orEmpty(),
+                                            percent = percent,
+                                            sessionStatus = session.status,
+                                            files = session.files.values.toList()
+                                        )
+                                        PeerEventManager.onUploadProgressState(state)
+                                    }
+
+                                    input.close()
+                                    part.dispose()
+                                } else {
+                                    part.dispose()
+                                }
                             }
 
+                            output.close()
                             progressFile.status = P2PFileStatus.FINISHED
                             progressFile.path = tmpFile.path
 
                             val finalState = UploadProgressState(
-                                title = session.title ?: "",
+                                title = session.title.orEmpty(),
                                 percent = 100,
                                 sessionStatus = SessionStatus.FINISHED,
                                 files = session.files.values.toList()
                             )
-
                             PeerEventManager.onUploadProgressState(finalState)
 
                             call.respond(HttpStatusCode.OK, "Upload complete")
                         } catch (e: Exception) {
+                            Timber.e(e, "Failed to handle file upload for $fileId")
                             progressFile.status = P2PFileStatus.FAILED
 
                             val failedState = UploadProgressState(
-                                title = session.title ?: "",
+                                title = session.title.orEmpty(),
                                 percent = 0,
                                 sessionStatus = session.status,
                                 files = session.files.values.toList()
@@ -274,8 +289,6 @@ class TellaPeerToPeerServer(
                             PeerEventManager.onUploadProgressState(failedState)
 
                             call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
-                        } finally {
-                            output.close()
                         }
                     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index c40403619..21a491117 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -132,12 +132,14 @@ class FileTransferViewModel @Inject constructor(
                             fileId = progressFile.file.id,
                             transmissionId = progressFile.transmissionId.orEmpty(),
                             inputStream = inputStream,
-                            fileSize = vaultFile.size
+                            fileSize = vaultFile.size,
+                            fileName = vaultFile.name,
                         ) { written, _ ->
                             progressFile.bytesTransferred = written.toInt()
 
                             val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                            val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                            val percent =
+                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
 
                             _uploadProgress.postValue(
                                 UploadProgressState(
@@ -150,6 +152,7 @@ class FileTransferViewModel @Inject constructor(
                         }
                     }
 
+
                     progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
                     progressFile.status = P2PFileStatus.FAILED

From 9e5e81c3198167294c23d90a7ff318beb11bea0b Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 13:26:50 +0100
Subject: [PATCH 092/153] fix design

---
 .../RecipientUploadFilesFragment.kt           |  6 +--
 .../senderflow/PeerToPeerResultFragment.kt    | 38 +++++++++++--------
 .../senderflow/SenderUploadFilesFragment.kt   |  6 ++-
 .../layout/fragment_peer_to_peer_result.xml   | 20 ++++++++--
 mobile/src/main/res/values-ar/strings.xml     |  1 +
 mobile/src/main/res/values-be/strings.xml     |  1 +
 mobile/src/main/res/values-blk/strings.xml    |  1 +
 mobile/src/main/res/values-bn/strings.xml     |  1 +
 mobile/src/main/res/values-es-rCU/strings.xml |  1 +
 mobile/src/main/res/values-es/strings.xml     |  1 +
 mobile/src/main/res/values-fa-rIR/strings.xml |  1 +
 mobile/src/main/res/values-fr/strings.xml     |  1 +
 mobile/src/main/res/values-hdpi/strings.xml   |  1 +
 mobile/src/main/res/values-in/strings.xml     |  1 +
 mobile/src/main/res/values-kac/strings.xml    |  1 +
 mobile/src/main/res/values-kn/strings.xml     |  1 +
 mobile/src/main/res/values-ksw/strings.xml    |  1 +
 mobile/src/main/res/values-ku/strings.xml     |  1 +
 mobile/src/main/res/values-mdpi/strings.xml   |  1 +
 mobile/src/main/res/values-ml/strings.xml     |  1 +
 mobile/src/main/res/values-my/strings.xml     |  1 +
 mobile/src/main/res/values-ndc/strings.xml    |  1 +
 mobile/src/main/res/values-pt-rMZ/strings.xml |  1 +
 mobile/src/main/res/values-pt/strings.xml     |  1 +
 mobile/src/main/res/values-ru/strings.xml     |  1 +
 mobile/src/main/res/values-sn-rZW/strings.xml |  1 +
 .../src/main/res/values-sw600dp/strings.xml   |  1 +
 mobile/src/main/res/values-ta/strings.xml     |  1 +
 mobile/src/main/res/values-tr/strings.xml     |  1 +
 mobile/src/main/res/values-ts/strings.xml     |  1 +
 mobile/src/main/res/values-v21/strings.xml    |  1 +
 mobile/src/main/res/values-v26/strings.xml    |  1 +
 mobile/src/main/res/values-vi/strings.xml     |  1 +
 mobile/src/main/res/values-w820dp/strings.xml |  1 +
 mobile/src/main/res/values-xhdpi/strings.xml  |  1 +
 mobile/src/main/res/values-xxhdpi/strings.xml |  1 +
 mobile/src/main/res/values/strings.xml        |  1 +
 37 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 8671ea911..8875b6c8e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -42,10 +42,7 @@ class RecipientUploadFilesFragment :
                 getString(R.string.action_continue).uppercase(),
                 getString(R.string.stop).uppercase(),
                 {},
-                {
-                    PeerToPeerFlags.cancelled = true
-                    baseActivity.finish()
-                })
+                {})
         }
     }
 
@@ -75,6 +72,7 @@ class RecipientUploadFilesFragment :
             val allSaved = state.files.all { it.status == P2PFileStatus.SAVED }
 
             if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
+                viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
                 navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
             }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
index 14bc6dd98..38838976b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -45,22 +45,27 @@ class PeerToPeerResultFragment :
     }
 
     private fun setupTexts() {
+        binding.toolbar.setStartTextTitle( getString(if (allFilesTransferred) R.string.success_title else R.string.result))
         binding.tileTv.text =
             getString(if (allFilesTransferred) R.string.success_title else R.string.failure_title)
         binding.descriptionTv.text = computeSubtitle()
     }
 
     private fun setupButton() {
-        if (!noFilesTransferred) {
-            binding.viewFilesBtn.apply {
+        binding.toolbar.backClickListener = { baseActivity.finish() }
+
+        binding.viewFilesBtn.apply {
+            val isRecipient = viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT
+
+            if (!noFilesTransferred && isRecipient) {
                 setText(getString(R.string.view_files_action))
                 visibility = View.VISIBLE
                 setOnClickListener {
                     baseActivity.finish()
                 }
+            } else {
+                visibility = View.GONE
             }
-        } else {
-            binding.viewFilesBtn.visibility = View.GONE
         }
     }
 
@@ -69,31 +74,34 @@ class PeerToPeerResultFragment :
         val successCount = transferredFiles?.count { it.status == successStatus } ?: 0
         val failureCount = total - successCount
 
-        return when (successCount) {
-            total -> {
+        return when {
+            // Case 1: All successful
+            successCount == total -> {
                 val resId = if (viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
                     R.plurals.success_file_received_from_sender
                 else
                     R.plurals.success_file_sent_to_recipient
 
-                return resources.getQuantityString(resId, total, total)
+                resources.getQuantityString(resId, total, total)
             }
-            0 -> {
-                baseActivity.resources.getQuantityString(
-                    R.plurals.failure_file_received_expl,
-                    failureCount,
-                    failureCount
-                )
+
+            // Case 2: All failed
+            failureCount == total -> {
+                resources.getQuantityString(R.plurals.failure_file_received_expl, failureCount, failureCount)
             }
+
+            //Case 3: Partial success
             else -> {
                 getString(R.string.partial_success_summary, successCount, failureCount)
             }
         }
     }
 
-
     private val successStatus: P2PFileStatus
-        get() = P2PFileStatus.FINISHED
+        get() = if (viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
+            P2PFileStatus.SAVED
+        else
+            P2PFileStatus.FINISHED
 
     private val allFilesTransferred: Boolean
         get() = transferredFiles?.all { it.status == successStatus } == true
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index b3bf9cf62..714914a18 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -9,6 +9,7 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.PeerToPeerFlags
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.FileTransferViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
@@ -34,7 +35,9 @@ class SenderUploadFilesFragment :
                 getString(R.string.action_continue).uppercase(),
                 getString(R.string.stop).uppercase(),
                 {},
-                {})
+                {
+                    PeerToPeerFlags.cancelled = true
+                    baseActivity.finish()})
         }
     }
 
@@ -62,6 +65,7 @@ class SenderUploadFilesFragment :
             val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
 
             if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
+                viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
                 navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
             }
         }
diff --git a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
index 4f0dfdc52..69f403c3d 100644
--- a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
+++ b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
@@ -6,11 +6,24 @@
     android:layout_height="match_parent"
     android:background="@color/space_cadet">
 
+    <org.hzontal.shared_ui.appbar.ToolbarComponent
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:arrowBackIcon="@drawable/ic_close_white_24dp"
+        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:rightIconContentDescription="@string/action_save"
+        app:startTitle="@string/result" />
     <ImageView
         android:id="@+id/setupImgV"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/checked_circle"
+        android:src="@drawable/checked_circle"
         android:contentDescription="@string/Server_Connect_Icon"
         app:layout_constraintBottom_toTopOf="@+id/tileTv"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,9 +59,10 @@
         android:layout_height="54dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:layout_marginTop="50dp"
-        android:backgroundTint="@color/tigers_eye"
+        android:background="@drawable/bg_round_orange_btn"
+        app:text_color="@color/btn_dark_letter"
         android:text="@string/view_files"
-        app:check_state="false"
+        app:check_state="true"
         app:text_all_caps="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/mobile/src/main/res/values-ar/strings.xml b/mobile/src/main/res/values-ar/strings.xml
index 93f33d150..06beb646a 100644
--- a/mobile/src/main/res/values-ar/strings.xml
+++ b/mobile/src/main/res/values-ar/strings.xml
@@ -1008,4 +1008,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-be/strings.xml b/mobile/src/main/res/values-be/strings.xml
index 518ba5415..68684d12d 100644
--- a/mobile/src/main/res/values-be/strings.xml
+++ b/mobile/src/main/res/values-be/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-blk/strings.xml b/mobile/src/main/res/values-blk/strings.xml
index 2b61d7cbb..e0665a540 100644
--- a/mobile/src/main/res/values-blk/strings.xml
+++ b/mobile/src/main/res/values-blk/strings.xml
@@ -147,4 +147,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-bn/strings.xml b/mobile/src/main/res/values-bn/strings.xml
index bd0343d1f..0e1291b6c 100644
--- a/mobile/src/main/res/values-bn/strings.xml
+++ b/mobile/src/main/res/values-bn/strings.xml
@@ -989,4 +989,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
  <string name="stop">stop</string>
  <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-es-rCU/strings.xml b/mobile/src/main/res/values-es-rCU/strings.xml
index cd106a53b..6f183ee10 100644
--- a/mobile/src/main/res/values-es-rCU/strings.xml
+++ b/mobile/src/main/res/values-es-rCU/strings.xml
@@ -1010,4 +1010,5 @@ Would you like to share analytics with the Tella team?</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
index cefdf9d3c..a73257849 100644
--- a/mobile/src/main/res/values-es/strings.xml
+++ b/mobile/src/main/res/values-es/strings.xml
@@ -993,4 +993,5 @@ Este feedback es anónimo, así que asegúrate de incluir tu información de con
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-fa-rIR/strings.xml b/mobile/src/main/res/values-fa-rIR/strings.xml
index 007e9d94c..099535ea8 100644
--- a/mobile/src/main/res/values-fa-rIR/strings.xml
+++ b/mobile/src/main/res/values-fa-rIR/strings.xml
@@ -1006,4 +1006,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index fd663c7ad..82aec3814 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -1003,4 +1003,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-hdpi/strings.xml b/mobile/src/main/res/values-hdpi/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-hdpi/strings.xml
+++ b/mobile/src/main/res/values-hdpi/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-in/strings.xml b/mobile/src/main/res/values-in/strings.xml
index 118dc2fde..35237194d 100644
--- a/mobile/src/main/res/values-in/strings.xml
+++ b/mobile/src/main/res/values-in/strings.xml
@@ -991,4 +991,5 @@ Apakah Anda ingin membagikan analitik kepada tim Tella?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-kac/strings.xml b/mobile/src/main/res/values-kac/strings.xml
index e815c91e3..ff3501b33 100644
--- a/mobile/src/main/res/values-kac/strings.xml
+++ b/mobile/src/main/res/values-kac/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-kn/strings.xml b/mobile/src/main/res/values-kn/strings.xml
index 394aec790..b7dfb1364 100644
--- a/mobile/src/main/res/values-kn/strings.xml
+++ b/mobile/src/main/res/values-kn/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-ksw/strings.xml b/mobile/src/main/res/values-ksw/strings.xml
index 5e5da015c..1a860c1fc 100644
--- a/mobile/src/main/res/values-ksw/strings.xml
+++ b/mobile/src/main/res/values-ksw/strings.xml
@@ -992,4 +992,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-ku/strings.xml b/mobile/src/main/res/values-ku/strings.xml
index 2ce58bf9e..aae143962 100644
--- a/mobile/src/main/res/values-ku/strings.xml
+++ b/mobile/src/main/res/values-ku/strings.xml
@@ -1004,4 +1004,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-mdpi/strings.xml b/mobile/src/main/res/values-mdpi/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-mdpi/strings.xml
+++ b/mobile/src/main/res/values-mdpi/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ml/strings.xml b/mobile/src/main/res/values-ml/strings.xml
index 80b92b4a4..25280c351 100644
--- a/mobile/src/main/res/values-ml/strings.xml
+++ b/mobile/src/main/res/values-ml/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-my/strings.xml b/mobile/src/main/res/values-my/strings.xml
index dfc48aaa0..ae8269652 100644
--- a/mobile/src/main/res/values-my/strings.xml
+++ b/mobile/src/main/res/values-my/strings.xml
@@ -992,4 +992,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-ndc/strings.xml b/mobile/src/main/res/values-ndc/strings.xml
index 4e11f421f..0e446405f 100644
--- a/mobile/src/main/res/values-ndc/strings.xml
+++ b/mobile/src/main/res/values-ndc/strings.xml
@@ -983,4 +983,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
   <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt-rMZ/strings.xml b/mobile/src/main/res/values-pt-rMZ/strings.xml
index 7afe2f38e..d1bf6fbc9 100644
--- a/mobile/src/main/res/values-pt-rMZ/strings.xml
+++ b/mobile/src/main/res/values-pt-rMZ/strings.xml
@@ -995,4 +995,5 @@ Gostaria de partilhar dados com a equipa do Tella?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-pt/strings.xml b/mobile/src/main/res/values-pt/strings.xml
index 27a723c2c..0ca40a0c6 100644
--- a/mobile/src/main/res/values-pt/strings.xml
+++ b/mobile/src/main/res/values-pt/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index c6b174590..c272b7088 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1019,4 +1019,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-sn-rZW/strings.xml b/mobile/src/main/res/values-sn-rZW/strings.xml
index 33bcc3d08..0bbd521b4 100644
--- a/mobile/src/main/res/values-sn-rZW/strings.xml
+++ b/mobile/src/main/res/values-sn-rZW/strings.xml
@@ -983,4 +983,5 @@ Wainda kupaurirana maonere no chikwatha Tella?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-sw600dp/strings.xml b/mobile/src/main/res/values-sw600dp/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-sw600dp/strings.xml
+++ b/mobile/src/main/res/values-sw600dp/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-ta/strings.xml b/mobile/src/main/res/values-ta/strings.xml
index 5f1987688..efbb9ddaf 100644
--- a/mobile/src/main/res/values-ta/strings.xml
+++ b/mobile/src/main/res/values-ta/strings.xml
@@ -1009,4 +1009,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-tr/strings.xml b/mobile/src/main/res/values-tr/strings.xml
index 55637b0ff..1d2ea6062 100644
--- a/mobile/src/main/res/values-tr/strings.xml
+++ b/mobile/src/main/res/values-tr/strings.xml
@@ -989,4 +989,5 @@ Tella ekibiyle analizleri paylaşmak ister misiniz?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-ts/strings.xml b/mobile/src/main/res/values-ts/strings.xml
index d6c91c436..4799ecfcd 100644
--- a/mobile/src/main/res/values-ts/strings.xml
+++ b/mobile/src/main/res/values-ts/strings.xml
@@ -979,4 +979,5 @@ yi fanele ku ku nyika vutshokotshoko bya servhidor.</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-v21/strings.xml
+++ b/mobile/src/main/res/values-v21/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-v26/strings.xml b/mobile/src/main/res/values-v26/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-v26/strings.xml
+++ b/mobile/src/main/res/values-v26/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-vi/strings.xml b/mobile/src/main/res/values-vi/strings.xml
index 81fb3af01..6afc1a592 100644
--- a/mobile/src/main/res/values-vi/strings.xml
+++ b/mobile/src/main/res/values-vi/strings.xml
@@ -999,4 +999,5 @@ Would you like to share analytics with the Tella team?</string>
     <string name="stop_sharing_files">Stop sharing files?</string>
   <string name="stop">stop</string>
   <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
diff --git a/mobile/src/main/res/values-w820dp/strings.xml b/mobile/src/main/res/values-w820dp/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-w820dp/strings.xml
+++ b/mobile/src/main/res/values-w820dp/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xhdpi/strings.xml b/mobile/src/main/res/values-xhdpi/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-xhdpi/strings.xml
+++ b/mobile/src/main/res/values-xhdpi/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-xxhdpi/strings.xml b/mobile/src/main/res/values-xxhdpi/strings.xml
index dd1a6f2a8..8cb033bc7 100644
--- a/mobile/src/main/res/values-xxhdpi/strings.xml
+++ b/mobile/src/main/res/values-xxhdpi/strings.xml
@@ -6,4 +6,5 @@
     <string name="stop_sharing_files">Stop sharing files?</string>
     <string name="stop">stop</string>
     <string name="view_files">VIEW FILES</string>
+    <string name="result">result</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index f1b66bebf..76b652cfc 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1081,5 +1081,6 @@ You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
 
   <string name="view_files_action">View Files</string>
   <string name="view_files">VIEW FILES</string>
+  <string name="result">Results</string>
 
 </resources>

From 4dd1f1a395b5c27ec144013d3ab6cf84461ac498 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 17 Jul 2025 14:11:12 +0100
Subject: [PATCH 093/153] add action

---
 .../peertopeer/receipentflow/RecipientUploadFilesFragment.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 8875b6c8e..d6d6442a7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -42,7 +42,8 @@ class RecipientUploadFilesFragment :
                 getString(R.string.action_continue).uppercase(),
                 getString(R.string.stop).uppercase(),
                 {},
-                {})
+                {   viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+                    navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()})
         }
     }
 

From f5a16889d60bf51540cd81e2bedd8f6a9a21ebe9 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 17 Jul 2025 14:12:36 +0100
Subject: [PATCH 094/153] send octet stream

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 18 ++---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 75 ++++++++-----------
 2 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index d287d089c..811ccc360 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -203,25 +203,17 @@ class TellaPeerToPeerClient @Inject constructor() {
         onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
 
+        Timber.d("session id from the client+$sessionId")
         val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
-        val client = getClientWithFingerprintValidation(expectedFingerprint)
 
-        // Progress-aware RequestBody for the actual file content
-        val fileBody = ProgressRequestBody(inputStream, fileSize, onProgress)
+        val client = getClientWithFingerprintValidation(expectedFingerprint)
 
-        // Multipart body
-        val multipartBody = MultipartBody.Builder()
-            .setType(MultipartBody.FORM)
-            .addFormDataPart(
-                "file", // form field name
-                fileName, // filename
-                fileBody // content
-            )
-            .build()
+        val requestBody = ProgressRequestBody(inputStream, fileSize, onProgress)
 
         val request = Request.Builder()
             .url(url)
-            .put(multipartBody)
+            .put(requestBody)
+            .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
             .build()
 
         return@withContext try {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index ff7ca4e9e..c43e084f1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -1,9 +1,6 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
 import io.ktor.http.HttpStatusCode
-import io.ktor.http.content.PartData
-import io.ktor.http.content.forEachPart
-import io.ktor.http.content.streamProvider
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.call
 import io.ktor.server.application.install
@@ -14,7 +11,6 @@ import io.ktor.server.engine.sslConnector
 import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.request.receive
-import io.ktor.server.request.receiveMultipart
 import io.ktor.server.request.receiveStream
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondText
@@ -205,7 +201,7 @@ class TellaPeerToPeerServer(
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
 
-                        Timber.d("session id from the server: $sessionId")
+                        Timber.d("session id from the server +$sessionId")
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
@@ -224,64 +220,53 @@ class TellaPeerToPeerServer(
                             return@put
                         }
 
+                        val tmpFile = File.createTempFile(fileId, ".tmp")
+                        val output = tmpFile.outputStream().buffered()
+
                         try {
-                            val multipart = call.receiveMultipart()
+                            val input = call.receiveStream().buffered()
+                            val totalSize = session.files.values.sumOf { it.file.size }
                             var bytesRead = 0L
-                            val tmpFile = File.createTempFile(fileId, ".tmp")
-                            val output = tmpFile.outputStream().buffered()
-
-                            multipart.forEachPart { part ->
-                                if (part is PartData.FileItem) {
-                                    val input = part.streamProvider().buffered()
-                                    val buffer = ByteArray(8192)
-
-                                    while (true) {
-                                        val read = input.read(buffer)
-                                        if (read == -1) break
-                                        output.write(buffer, 0, read)
-                                        bytesRead += read
-                                        progressFile.bytesTransferred = bytesRead.toInt()
-
-                                        // Update progress
-                                        val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
-                                        val totalSize = session.files.values.sumOf { it.file.size }
-                                        val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
-
-                                        val state = UploadProgressState(
-                                            title = session.title.orEmpty(),
-                                            percent = percent,
-                                            sessionStatus = session.status,
-                                            files = session.files.values.toList()
-                                        )
-                                        PeerEventManager.onUploadProgressState(state)
-                                    }
-
-                                    input.close()
-                                    part.dispose()
-                                } else {
-                                    part.dispose()
-                                }
+                            val buffer = ByteArray(8192)
+
+                            while (true) {
+                                val read = input.read(buffer)
+                                if (read == -1) break
+                                output.write(buffer, 0, read)
+                                bytesRead += read
+                                progressFile.bytesTransferred = bytesRead.toInt()
+
+                                // Optional: update session progress percent
+                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
+                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+
+                                val state = UploadProgressState(
+                                    title = session.title ?: "",
+                                    percent = percent,
+                                    sessionStatus = session.status,
+                                    files = session.files.values.toList()
+                                )
+                                PeerEventManager.onUploadProgressState(state)
                             }
 
-                            output.close()
                             progressFile.status = P2PFileStatus.FINISHED
                             progressFile.path = tmpFile.path
 
                             val finalState = UploadProgressState(
-                                title = session.title.orEmpty(),
+                                title = session.title ?: "",
                                 percent = 100,
                                 sessionStatus = SessionStatus.FINISHED,
                                 files = session.files.values.toList()
                             )
+
                             PeerEventManager.onUploadProgressState(finalState)
 
                             call.respond(HttpStatusCode.OK, "Upload complete")
                         } catch (e: Exception) {
-                            Timber.e(e, "Failed to handle file upload for $fileId")
                             progressFile.status = P2PFileStatus.FAILED
 
                             val failedState = UploadProgressState(
-                                title = session.title.orEmpty(),
+                                title = session.title ?: "",
                                 percent = 0,
                                 sessionStatus = session.status,
                                 files = session.files.values.toList()
@@ -289,6 +274,8 @@ class TellaPeerToPeerServer(
                             PeerEventManager.onUploadProgressState(failedState)
 
                             call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
+                        } finally {
+                            output.close()
                         }
                     }
 

From c5138b8fb9e6bca82fc9f5f9ed5bdffa9762b436 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Mon, 21 Jul 2025 13:52:27 +0100
Subject: [PATCH 095/153] add collapsable view

---
 .../res/layout/connect_hotspot_layout.xml     | 26 ++++----
 mobile/src/main/res/values/strings.xml        | 10 ++-
 .../textviews/CollapsibleTextView.kt          | 66 +++++++++++++++++++
 .../src/main/res/drawable/right_icon.xml      | 10 +++
 .../main/res/layout/view_collapsible_text.xml | 44 +++++++++++++
 shared-ui/src/main/res/values/attrs.xml       |  6 ++
 6 files changed, 145 insertions(+), 17 deletions(-)
 create mode 100644 shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
 create mode 100644 shared-ui/src/main/res/drawable/right_icon.xml
 create mode 100644 shared-ui/src/main/res/layout/view_collapsible_text.xml

diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
index 40dd27594..6aeb8f75d 100644
--- a/mobile/src/main/res/layout/connect_hotspot_layout.xml
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -14,12 +14,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-    <org.hzontal.shared_ui.appbar.ToolbarComponent
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
-        app:startTitle="@string/wifi" />
+        <org.hzontal.shared_ui.appbar.ToolbarComponent
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+            app:startTitle="@string/wifi" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView
@@ -64,28 +64,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
 
-    <TextView
+    <org.hzontal.shared_ui.textviews.CollapsibleTextView
         android:id="@+id/tipsTextView"
-        style="@style/Tella_Main_White_Text.Meduim"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        android:background="@drawable/bg_home_btn"
-        android:backgroundTint="@color/wa_white_8"
         android:paddingVertical="@dimen/activity_horizontal_margin"
-        android:paddingStart="@dimen/activity_horizontal_margin"
-        android:text="@string/tips_to_connect"
+        app:collapsibleBody="@string/tips_to_connect_body"
+        app:collapsibleTitle="@string/tips_to_connect_title"
+        app:defaultExpanded="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/titleDescTextView" />
 
+
     <View
         android:id="@+id/separator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:background="@color/wa_white_20"
         app:layout_constraintTop_toBottomOf="@id/tipsTextView" />
 
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 76b652cfc..b71458e32 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1020,9 +1020,13 @@ Would you like to share analytics with the Tella team?</string>
   <string name="wifi">Wi-Fi</string>
   <string name="get_connected">Get connected</string>
   <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
-  <string name="tips_to_connect">Tips to connect\n1. The Wi-Fi network does not need to be \nconnected to the internet.\n2.
-You can create your own Wi-Fi network\n using your phone’s hotspot feature.\n
-3. Disable any VPN connections.</string>
+  <string name="tips_to_connect_title">Tips to connect</string>
+  <string name="tips_to_connect_body">
+    1. The Wi-Fi network does not need to be connected to the internet.\n
+    2. You can create your own Wi-Fi network using your phone’s hotspot feature.\n
+    3. Disable any VPN connections.
+</string>
+
   <string name="current_wifi_network">Current Wifi network</string>
   <string name="same_wifi_text">Yes, we are on the same Wi-Fi network</string>
     <string name="NearBySharing">Nearby sharing</string>
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
new file mode 100644
index 000000000..ccf292f82
--- /dev/null
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
@@ -0,0 +1,66 @@
+package org.hzontal.shared_ui.textviews
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import org.hzontal.shared_ui.R
+
+class CollapsibleTextView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    private val titleText: TextView
+    private val collapsibleText: TextView
+    private val arrowIcon: ImageView
+    private var isExpanded = false
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_collapsible_text, this, true)
+
+        orientation = VERTICAL
+
+        titleText = findViewById(R.id.titleText)
+        collapsibleText = findViewById(R.id.collapsibleText)
+        arrowIcon = findViewById(R.id.arrowIcon)
+
+        attrs?.let {
+            val typedArray = context.obtainStyledAttributes(it, R.styleable.CollapsibleTextView, 0, 0)
+            val title = typedArray.getString(R.styleable.CollapsibleTextView_collapsibleTitle)
+            val body = typedArray.getString(R.styleable.CollapsibleTextView_collapsibleBody)
+            val expandedByDefault = typedArray.getBoolean(R.styleable.CollapsibleTextView_defaultExpanded, false)
+            typedArray.recycle()
+
+            titleText.text = title
+            collapsibleText.text = body
+            isExpanded = expandedByDefault
+            collapsibleText.visibility = if (isExpanded) View.VISIBLE else View.GONE
+            arrowIcon.rotation = if (isExpanded) 180f else 0f
+        }
+
+        findViewById<View>(R.id.header).setOnClickListener {
+            toggleText()
+        }
+    }
+
+
+    private fun toggleText() {
+        isExpanded = !isExpanded
+        collapsibleText.visibility = if (isExpanded) View.VISIBLE else View.GONE
+        val rotation = if (isExpanded) 180f else 0f
+        arrowIcon.animate().rotation(rotation).start()
+    }
+
+    fun setTitle(text: String) {
+        titleText.text = text
+    }
+
+    fun setContent(text: String) {
+        collapsibleText.text = text
+    }
+}
diff --git a/shared-ui/src/main/res/drawable/right_icon.xml b/shared-ui/src/main/res/drawable/right_icon.xml
new file mode 100644
index 000000000..0faeef7cf
--- /dev/null
+++ b/shared-ui/src/main/res/drawable/right_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M18.831,16.781C18.44,17.177 17.801,17.177 17.409,16.782L12,11.319L6.592,16.782C6.2,17.177 5.561,17.177 5.17,16.781L4.695,16.3C4.31,15.91 4.31,15.284 4.695,14.894L11.289,8.22C11.681,7.824 12.32,7.824 12.712,8.22L19.306,14.894C19.691,15.284 19.691,15.91 19.306,16.3L18.831,16.781Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/shared-ui/src/main/res/layout/view_collapsible_text.xml b/shared-ui/src/main/res/layout/view_collapsible_text.xml
new file mode 100644
index 000000000..3697d290e
--- /dev/null
+++ b/shared-ui/src/main/res/layout/view_collapsible_text.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/collapsibleRoot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_horizontal_margin"
+        android:background="@drawable/bg_dual_text_check"
+        android:animateLayoutChanges="true">
+
+        <RelativeLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/titleText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Tella_Main_White_Text.Meduim"
+                tools:text="Tips to connect" />
+
+            <ImageView
+                android:id="@+id/arrowIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:src="@drawable/right_icon"
+                android:contentDescription="Toggle" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/collapsibleText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            style="@style/Tella_Main_White_Text.Small"
+            android:layout_marginTop="8dp" />
+    </LinearLayout>
+</merge>
diff --git a/shared-ui/src/main/res/values/attrs.xml b/shared-ui/src/main/res/values/attrs.xml
index b5051fd84..03c401889 100644
--- a/shared-ui/src/main/res/values/attrs.xml
+++ b/shared-ui/src/main/res/values/attrs.xml
@@ -133,4 +133,10 @@
     <declare-styleable name="ViewPagerComponent">
         <attr name="tabTitles" format="reference" />
     </declare-styleable>
+
+    <declare-styleable name="CollapsibleTextView">
+        <attr name="collapsibleTitle" format="string" />
+        <attr name="collapsibleBody" format="string" />
+        <attr name="defaultExpanded" format="boolean" />
+    </declare-styleable>
 </resources>
\ No newline at end of file

From d08df400165a13247c5a33e167d06dbc6a135a3f Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 22 Jul 2025 08:24:04 +0100
Subject: [PATCH 096/153] Fix sender/receiver manual verification design

---
 .../RecipientVerificationFragment.kt          |    7 +-
 .../senderflow/SenderVerificationFragment.kt  |   23 +-
 .../layout/connect_manually_verification.xml  |   42 +-
 mobile/src/main/res/values/strings.xml        | 2062 +++++++++--------
 .../shared_ui/submission/SubmittingItem.kt    |   10 +-
 .../textviews/CollapsibleTextView.kt          |    1 -
 6 files changed, 1060 insertions(+), 1085 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index efa933f27..da42ca43a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -53,17 +53,12 @@ class RecipientVerificationFragment :
                 viewModel.incomingRequest.collect { request ->
                     if (request != null) {
                         confirmAndConnectBtn.isEnabled = true
-                        confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
+                        confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
                         confirmAndConnectBtn.setOnClickListener {
                             viewModel.onUserConfirmedRegistration(request.registrationId)
                         }
-                        discardBtn.setOnClickListener {
-                            viewModel.onUserRejectedRegistration(request.registrationId)
-                            navigateBackAndStopServer()
-                        }
                     } else {
                         confirmAndConnectBtn.isEnabled = false
-                        confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange16_btn)
                         confirmAndConnectBtn.setOnClickListener(null)
                     }
                 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index c4edc90f5..f06bb26c7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -29,10 +29,8 @@ class SenderVerificationFragment :
     }
 
     private fun initView() {
-        binding.confirmAndConnectBtn.setBackgroundResource(R.drawable.bg_round_orange_btn)
-        binding.titleDescTextView.text = getString(R.string.make_sure_sequence_matches_recipient)
-        binding.warningTextView.text = getString(R.string.sequence_mismatch_warning_recipient)
-
+        binding.warningTextView.text = getString(R.string.hash_sender_description)
+        binding.confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
     }
 
     private fun initListeners() {
@@ -40,6 +38,7 @@ class SenderVerificationFragment :
         binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
 
         binding.confirmAndConnectBtn.setOnClickListener {
+            binding.confirmAndConnectBtn.setText(getString(R.string.waiting_for_the_recipient))
             viewModel.startRegistration(
                 ip = viewModel.p2PState.ip,
                 port = viewModel.p2PState.port,
@@ -56,14 +55,14 @@ class SenderVerificationFragment :
     private fun initObservers() {
 
         viewModel.isManualConnection = true
-            viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
-                if (success) {
-                    findNavController().currentBackStackEntry?.savedStateHandle
-                        ?.set("registrationSuccess", true)
-                    navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
-                } else {
-                    //  handle error UI
-                }
+        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+            if (success) {
+                findNavController().currentBackStackEntry?.savedStateHandle
+                    ?.set("registrationSuccess", true)
+                navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
+            } else {
+                //  handle error UI
+            }
         }
         viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
             DialogUtils.showBottomMessage(baseActivity, message, true)
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 67f76b0d2..14ec6c9af 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -23,43 +23,12 @@
         android:layout_height="wrap_content"
         android:background="@drawable/device"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
+        app:layout_constraintBottom_toTopOf="@id/hashContentTextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintVertical_chainStyle="packed" />
 
-    <TextView
-        android:id="@+id/titleTextView"
-        style="@style/Tella_Main_White_TextExtraLargeBold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="@string/show_device_information"
-        android:textColor="@android:color/white"
-        app:layout_constraintTop_toBottomOf="@id/deviceImg"
-        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5" />
-
-    <TextView
-        android:id="@+id/titleDescTextView"
-        style="@style/Tella_Main_White_Text.Meduim"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_horizontal_small_margin"
-        android:paddingHorizontal="@dimen/activity_horizontal_margin"
-        android:gravity="start"
-        android:text="@string/make_sure_sequence_matches"
-        android:textColor="@android:color/white"
-        app:layout_constraintTop_toBottomOf="@id/titleTextView"
-        app:layout_constraintBottom_toTopOf="@+id/hashContentTextView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5" />
-
     <TextView
         android:id="@+id/hashContentTextView"
         style="@style/Tella_Main_White_Text.Meduim"
@@ -71,7 +40,7 @@
         android:padding="24dp"
         tools:text="87fd 5869 a6b3 e414 112c 1934 ca00 be77 b8e4 584c 829a 4536 490b da9a 3928 be4a"
         android:background="@drawable/bg_dual_text_check"
-        app:layout_constraintTop_toBottomOf="@id/titleDescTextView"
+        app:layout_constraintTop_toBottomOf="@id/deviceImg"
         app:layout_constraintBottom_toTopOf="@+id/warningTextView" />
 
     <TextView
@@ -82,7 +51,8 @@
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:gravity="start"
-        android:text="@string/sequence_mismatch_warning"
+        android:textAlignment="gravity"
+        android:text="@string/hash_receipient_description"
         android:textColor="@android:color/white"
         app:layout_constraintTop_toBottomOf="@id/hashContentTextView"
         app:layout_constraintBottom_toTopOf="@+id/confirmAndConnectBtn"
@@ -96,7 +66,7 @@
         android:layout_height="54dp"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:background="@drawable/bg_round_orange16_btn"
+        android:background="@drawable/bg_round_orange_btn"
         app:text_color="@color/btn_dark_letter"
         app:text_all_caps="true"
         app:check_state="false"
@@ -104,7 +74,7 @@
         app:layout_constraintBottom_toTopOf="@+id/discardBtn"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:text="@string/confirm_and_connect" />
+        app:text="@string/waiting_for_the_sender" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
         android:id="@+id/discardBtn"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index b71458e32..472ed4472 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1,1090 +1,1102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="app_name">Tella</string>
-  <string name="collect.blank_action_update.form">Update</string>
-  <string name="settings.about_app.bar">About &amp; Help</string>
-  <string name="collect.form_exit.unsaved_dialog.title">Exit form?</string>
-  <string name="verification_prompt_dialog_title">Enable GPS?</string>
-  <string name="collect_tab.title_blank">Blank</string>
-  <string name="action_cancel">cancel</string>
-  <string name="settings_menu.item_contact">Contact us</string>
-  <string name="collect_dialog.text_download.progress">Downloading the form</string>
-  <string name="collect_toast_download.completed">Download completed</string>
-  <string name="action_delete">delete</string>
-  <string name="collect.draft_tab.title">Draft</string>
-  <string name="collect.blank_action_download.form">Download</string>
-  <string name="settings_text_empty.field">This field cannot be empty.</string>
-  <string name="home_toast_back.exit">Tap the \"Back\" button again to exit the app</string>
-  <string name="settings.docu_toast_fail.load.list.connected.servers">There was an error loading the list of servers. Please try again</string>
-  <string name="settings.docu_toast_fail.create.server">There was an error creating the server settings. Please try again</string>
-  <string name="settings.docu_toast_fail.update.server">There was an error updating the server settings. Please try again</string>
-  <string name="settings.docu_toast_fail.delete.server">There was an error deleting the server settings. Please try again</string>
-  <string name="settings.about_list.item_faq">FAQ</string>
-  <string name="action_ok">OK</string>
-  <string name="collect.form_toast_validation.error">This response is invalid</string>
-  <string name="collect.form_error_response.mandatory">This response is mandatory.</string>
-  <string name="homescreen_heading_quick.delete">Quick Delete
+    <string name="app_name">Tella</string>
+    <string name="collect.blank_action_update.form">Update</string>
+    <string name="settings.about_app.bar">About &amp; Help</string>
+    <string name="collect.form_exit.unsaved_dialog.title">Exit form?</string>
+    <string name="verification_prompt_dialog_title">Enable GPS?</string>
+    <string name="collect_tab.title_blank">Blank</string>
+    <string name="action_cancel">cancel</string>
+    <string name="settings_menu.item_contact">Contact us</string>
+    <string name="collect_dialog.text_download.progress">Downloading the form</string>
+    <string name="collect_toast_download.completed">Download completed</string>
+    <string name="action_delete">delete</string>
+    <string name="collect.draft_tab.title">Draft</string>
+    <string name="collect.blank_action_download.form">Download</string>
+    <string name="settings_text_empty.field">This field cannot be empty.</string>
+    <string name="home_toast_back.exit">Tap the \"Back\" button again to exit the app</string>
+    <string name="settings.docu_toast_fail.load.list.connected.servers">There was an error loading the list of servers. Please try again</string>
+    <string name="settings.docu_toast_fail.create.server">There was an error creating the server settings. Please try again</string>
+    <string name="settings.docu_toast_fail.update.server">There was an error updating the server settings. Please try again</string>
+    <string name="settings.docu_toast_fail.delete.server">There was an error deleting the server settings. Please try again</string>
+    <string name="settings.about_list.item_faq">FAQ</string>
+    <string name="action_ok">OK</string>
+    <string name="collect.form_toast_validation.error">This response is invalid</string>
+    <string name="collect.form_error_response.mandatory">This response is mandatory.</string>
+    <string name="homescreen_heading_quick.delete">Quick Delete
 mode activation</string>
-  <string name="settings.about_list.item_privacy.policy">Privacy policy</string>
-  <string name="recorder_toast_fail.recording">There was an error recording the audio. Please try again</string>
-  <string name="recorder_content.desc_blinking.red.dot">Recording audio</string>
-  <string name="action_remove">Remove</string>
-  <string name="settings_app.bar">Settings</string>
-  <string name="action_save">Save</string>
-  <string name="lock_dialog.expl_save.pattern">Saving your lock pattern</string>
-  <string name="lock_dialog.expl_unlock.app">Unlocking Tella</string>
-  <string name="action_skip">Skip</string>
-  <string name="settings.docu_delete.server_dialog.expl">If you delete this server, all draft and submitted forms will be deleted from your device. Delete anyway?</string>
-  <string name="settings.docu_toast_server.deleted">Server deleted</string>
-  <string name="settings.docu_toast_server.created">Server created</string>
-  <string name="settings.docu_toast_server.updated">Server updated</string>
-  <string name="settings.docu_dialog.title_server.settings">Server settings</string>
-  <string name="settings.docu_field_server.name">Server name</string>
-  <string name="settings.docu_field_server.url">Server URL</string>
-  <string name="collect.sent_tab.title">Submitted</string>
-  <string name="home_expl_cancel.quick.delete">Tap anywhere to cancel</string>
-  <string name="recorder_app.bar">Recorder</string>
-  <string name="settings.docu_field_username">Username</string>
-  <string name="collect.draft_meta_date.updated">Updated: %1$s</string>
-  <string name="settings.about_app.version">Version</string>
-  <string name="collect_toast_draft.saved">Draft saved</string>
-  <string name="collect_toast_fail.sending.form">There was an error submitting the form. Please try again</string>
-  <string name="collect_toast_fail.form.submission.generic">There was an error submitting the form: %s</string>
-  <string name="collect.form_toast_validation.generic.error">There were validation errors in some answers</string>
-  <string name="permission_dialog.expl_GPS">In order to make your files verifiable, Tella needs to record your location and needs permission to access your GPS.</string>
-  <string name="collect.form_action_select.time">Select time</string>
-  <string name="collect.form_action_select.date">Select date</string>
-  <string name="collect_dialog.expl_downloading.blank.forms">Downloading forms</string>
-  <string name="collect.blank_toast_fail.updating.form.list">There was an error updating the list of forms. Please try again</string>
-  <string name="collect_toast_fail.parsing.form">There was an error displaying this form. Please try again</string>
-  <string name="collect.end_action_save.send.later">Save form</string>
-  <string name="collect_action.desc_save.form">Save form</string>
-  <string name="collect.end_action.desc_save.send.later">Save form</string>
-  <string name="action.desc_confirm">Confirm</string>
-  <string name="collect.form_action_previous.section">Previous</string>
-  <string name="collect.form_action_next.section">Next</string>
-  <string name="action_stop">Stop</string>
-  <string name="action_play">Play</string>
-  <string name="action_record">Record</string>
-  <string name="play.audio_app.bar">Play Audio</string>
-  <string name="collect_dialog.text_delete.sent.form">Are you sure you want to delete this form from your device? Note that because it was already submitted, the data will remain on your organization\'s server.</string>
-  <string name="collect_dialog.text_delete.draft.form">Are you sure you want to delete this draft form?</string>
-  <string name="collect_toast_form.deleted">The form was deleted</string>
-  <string name="settings.lang_select.expl_default">Keep Tella in the same language as my device</string>
-  <string name="settings.lang_select_default">Default</string>
-  <string name="settings.lang_app.bar">Language</string>
-  <string name="action_share">Share</string>
-  <string name="collect_toast_fail.submission.unauthorized">You do not have permission to submit this form. If you think this is a mistake, please contact your organization</string>
-  <string name="gallery_toast_fail.importing.file">There was an error importing the file. Please try again</string>
-  <string name="collect.end_heading">End of the form</string>
-  <string name="collect.end_toast_notification.form.not.sent.no.connection">You’re not connected to the internet. Try again when connected</string>
-  <string name="collect.sent_dialog.expl_discard.unsent.form">Parts or all of the form wasn\'t sent. Are you sure you want to discard it?</string>
-  <string name="action_discard">Discard</string>
-  <string name="collect.end_action_submit">Submit</string>
-  <string name="gallery_toast_fail.exporting.to.device">There was an error exporting the files. Please try again</string>
-  <string name="permission_dialog.expl_device.storage">In order to export files, Tella needs permission to write on the device\'s storage.</string>
-  <string name="gallery_toast_fail.deleting.files">There was an error deleting the files. Please try again.</string>
-  <plurals name="gallery_toast_files.exported">
-    <item quantity="one">%1$d file saved to the device</item>
-    <item quantity="other">%1$d files saved to the device</item>
-  </plurals>
-  <string name="gallery_delete.files_dialog.title">Delete file?</string>
-  <string name="gallery_delete.files_dialog.expl">The selected file will be permanently deleted from your gallery.</string>
-  <string name="gallery_save.to.device_dialog.title">Save to device gallery?</string>
-  <string name="gallery_save.to.device_dialog.expl">This will make your file accessible from outside Tella, in your device\'s gallery and by other apps.</string>
-  <string name="gallery_dialog.expl_encrypting">Encrypting</string>
-  <string name="gallery_save.to.device_dialog.progress.expl">Decrypting</string>
-  <string name="gallery_toast_fail.import">There was an error opening the gallery to import the files. Please try again</string>
-  <string name="gallery_toast_fail.saving.file">There was an error saving the file. Please try again</string>
-  <string name="collect_toast_fail.attaching.file.to.form">There was an error attaching the file. Please try again</string>
-  <string name="collect_toast_fail.fetch.form.from.server.unknown.error">There was an error downloading the form. Please try again</string>
-  <string name="collect_toast_fail.fetch.form.from.server.display.error">There was an error downloading the form: %s</string>
-  <string name="collect_toast_reason.fail.fetch.form.from.server">The form could not be found. It may have been deleted from your organization\'s server</string>
-  <string name="gallery_heading_files.from.Tella.gallery">Tella Gallery</string>
-  <string name="settings_select_general">General</string>
-  <string name="collect.form_exit_dialog.expl">Your draft will be lost.</string>
-  <string name="collect.form_exit_dialog.action_save.exit">SAVE AND EXIT</string>
-  <string name="collect.form_exit_dialog.action_exit.anyway">EXIT ANYWAY</string>
-  <string name="settings.docu_error_not.valid.URL">This is not a valid URL.</string>
-  <string name="home_action.label_quick.delete">Delete</string>
-  <string name="gallery_subheading_sort.by">Sort by</string>
-  <string name="gallery_list.item_newest.to.oldest">Newest to oldest</string>
-  <string name="gallery_list.item_oldest.to.newest">Oldest to newest</string>
-  <string name="action_exit">Exit</string>
-  <string name="settings.prot_select_camouflage">Camouflage</string>
-  <string name="settings.docu_error_wrong.credentials">The username or password is incorrect.</string>
-  <string name="settings.docu_error_domain.doesnt.exit">The server URL is incorrect.</string>
-  <string name="settings.docu_error_unknown.connection.error">There was an error trying to connect to the server.</string>
-  <string name="settings.docu_error_no.internet">You’re not connected to the internet. Try again when connected.</string>
-  <string name="settings.docu_dialog.action_try.again.connecting">Try again</string>
-  <string name="settings.about_select_tutorial">Tutorial</string>
-  <string name="settings.camo_expl">Select a custom icon and name to better hide Tella on your device. Note that the Tella icon will remain visible from the Android settings.</string>
-  <string name="gallery_action.desc_save.to.device">Save to device</string>
-  <string name="settings.docu_verification_action">Verification mode</string>
-  <string name="settings.docu_verification_action.expl">Makes your media files verifiable by collecting information about your device and location.</string>
-  <string name="collect_no.form_heading">Easy data collection</string>
-  <string name="collect_expl_not.connected.to.server">To receive forms and submit data, you must first connect to a compatible server. Ask your organization for the server information and <a href="tella_scheme://open.collect.manage.servers.activity">set up the server here</a>.</string>
-  <string name="collect.sent_expl_no.forms">There are no submitted forms to display.</string>
-  <string name="collect.blank_expl_no.forms">There are no forms to display. Tap the refresh button to check if there are forms available on the servers you\'re connected to.</string>
-  <string name="settings.camo_heading">Select a different name and logo</string>
-  <string name="gallery_expl_empty">There are no files to show. Tap the + button to import files.</string>
-  <string name="collect.blank_toast_not.connected">You’re not connected to the internet. Try again when connected</string>
-  <string name="settings.gen_crash.reports_action">Share crash reports</string>
-  <string name="settings.gen_crash.reports_action.expl">Crash reports help us improve Tella. They are automatically sent and include data such as device model and Android version.</string>
-  <string name="collect.form_dialog.action_add.group">Add</string>
-  <string name="collect.form_dialog.title_add.additional.group">Add another \"%s\"?</string>
-  <string name="collect.form_dialog.action_add.first.group">Add \"%s\"?</string>
-  <string name="collect.form_dialog.expl_add.additional.group">You will be able to answer all the questions in \"%s\" again.</string>
-  <string name="collect.form_dialog.expl_add.first.group">You will be able to answer all the questions in \"%s\".</string>
-  <string name="collect.form_dialog.action_dont.add.group">Do not add</string>
-  <string name="collect.form_select.attachment_app.bar">Select file</string>
-  <string name="collect.form_geopoint_app.bar">Record position</string>
-  <string name="collect.form_geopoint_marker_content.desc">Position recorded</string>
-  <string name="collect.form_geopoint_meta_latitude">Latitude: %1$s</string>
-  <string name="collect.form_geopoint_meta_longitude">Longitude: %1$s</string>
-  <string name="collect.form_geopoint_meta_altitude">Altitude: %1$s m</string>
-  <string name="collect.form_geopoint_meta_accuracy">Accuracy: %1$s m</string>
-  <string name="collect.form_attachment_meta_file.name">File name: %s</string>
-  <string name="collect.form_meta_file.size">File size: %s</string>
-  <string name="collect.form_toast_fail.load.attachment">There was an error loading the attachment. Please try again</string>
-  <string name="collect.form_geopoint_banner_touch.map.select.location">Touch anywhere for 3 seconds to record position.</string>
-  <string name="gallery_action.desc_file.metadata">Verification information</string>
-  <string name="verification.info_app.bar">Verification information</string>
-  <string name="verification.info_field_filename">File name</string>
-  <string name="verification.info_field_file.path">File path</string>
-  <string name="verification.info_field_file.modified">File modified</string>
-  <string name="verification.info_field_hash">File hash</string>
-  <string name="verification.info_field_manufacturer">Manufacturer</string>
-  <string name="verification.info_field_hardware">Hardware</string>
-  <string name="verification.info_field_device.id">Device ID</string>
-  <string name="verification.info_field_screen.size">Screen size</string>
-  <string name="verification.info_field_language">Language</string>
-  <string name="verification.info_field_locale">Locale</string>
-  <string name="verification.info_field_connection.status">Connection status</string>
-  <string name="verification.info_field_network.type">Network type</string>
-  <string name="verification.info_field_wifi.mac">Wi-Fi MAC</string>
-  <string name="verification.info_field_ipv4">IPv4</string>
-  <string name="verification.info_field_ipv6">IPv6</string>
-  <string name="verification.collecting_list.item_location">Location</string>
-  <string name="verification.info_field_location">Location</string>
-  <string name="verification.info_field_location.provider">Location provider</string>
-  <string name="verification.info_field_location.speed">Location speed</string>
-  <string name="verification.info_field_cell.towers">Cell info</string>
-  <string name="settings.camo_calculator2">Calculator</string>
-  <string name="verification.info_subheading_file.metadata">File</string>
-  <string name="verification.info_subheading_device.metadata">Device</string>
-  <string name="verification.info_subheading_context.metadata">Context</string>
-  <string name="verification.info_field_metadata.not.available">Not Available</string>
-  <string name="verification.info_field_latitude">Latitude:</string>
-  <string name="verification.info_field_longitude">Longitude:</string>
-  <string name="verification.info_field_altitude">Altitude:</string>
-  <string name="verification.info_field_accuracy">Accuracy:</string>
-  <string name="verification.info_field_location.time">Time:</string>
-  <string name="collect.form_ranking_action_select.answer">Select an answer</string>
-  <string name="collect.form_ranking_action_clear.selection">Clear selection</string>
-  <string name="collect.form_signature_app.bar">Draw your signature</string>
-  <string name="collect.form_signature_action">Sign here</string>
-  <string name="collect.form_signature_action_clear.signature">Clear signature</string>
-  <string name="collect.form_signature_toast_fail.saving">There was an error saving the signature. Please try again</string>
-  <string name="collect.form_acknowledge_select.expl">OK. Please continue.</string>
-  <plurals name="collect.end_meta_number.of.elements">
-    <item quantity="one">%d file</item>
-    <item quantity="other">%d files</item>
-  </plurals>
-  <string name="action_learn.more">Learn more</string>
-  <string name="settings.servers_add.server_dialog.title">Add server</string>
-  <string name="settings.prot_select_delete.forms">Delete draft and submitted forms</string>
-  <string name="settings.prot_select_delete.servers">Delete server settings</string>
-  <string name="settings.prot_select_delete.app">Delete Tella</string>
-  <string name="collect.sent_action_edit.to.resend">Edit to resend</string>
-  <string name="collect_toast_form.submitted">Form submitted</string>
-  <string name="collect.end_heading_confirmation.form.submitted">Form submitted</string>
-  <string name="settings.docu_add.server_field_password">Password</string>
-  <string name="settings.camo_error_fail.retrieve.app.name">App</string>
-  <string name="collect.end_item_form.data">Form responses</string>
-  <string name="collect_toast_fail.loading.form.instance">There was an error loading the form. Please try again</string>
-  <string name="collect_toast_fail.connection.too.weak">Your internet connection is too weak to send the form. Please try again</string>
-  <string name="gallery_toast_file.encrypted">File encrypted</string>
-  <string name="settings.docu_toast_disconnect.servers.delete">All forms and servers have been deleted</string>
-  <string name="collect.help_expl_not.connected.to.server">To receive forms and submit data, you must first connect to a server. Ask your organization for the server information and set up the server.</string>
-  <string name="collect.help_expl_odk">If you would like to create your own forms, <a href="https://hzontal.org/contact/">contact us</a> or use <a href="https://opendatakit.org/help/help-for-hire/">any service based on the Open Data Kit (ODK)</a></string>
-  <string name="collect.help_expl_no.internet">If you are not connected to the Internet, you can still fill forms. The data will be submitted as soon as you get online.</string>
-  <string name="collect_toast_fail.data.too.large">Your form cannot be submitted because the attachments are too large. Please attach smaller files</string>
-  <string name="collect.end_heading_submitting">Submitting</string>
-  <string name="collect.end_exit_dialog.expl">If you exit now, the submission will be stopped but you will be able to submit the remaining files later.</string>
-  <string name="collect.end_subheading.expl_unchecked.items">Unchecked items will be saved for later sending.</string>
-  <string name="collect_toast_form.saved.for.later.submission">Form saved for later submission</string>
-  <string name="collect.blank_action_unpin">Unpin from the top</string>
-  <string name="collect.blank_action_pin">Pin to the top</string>
-  <string name="verification.prompt_dialog.expl">Verification mode is ON but GPS is OFF. Turn ON GPS in order to record the position of your evidence.</string>
-  <string name="verification.prompt_action_ignore">Ignore</string>
-  <string name="verification.prompt_action_enable.GPS">Turn on GPS</string>
-  <string name="collect.blank_dialog.expl_updating.form.definitions">Updating the list of forms…</string>
-  <string name="collect.blank_toast_refresh.canceled">Update canceled</string>
-  <string name="collect.blank_toast_form.definition.updated">Update completed</string>
-  <string name="verification.share_dialog.title">Do you want to include verification information?</string>
-  <string name="verification.share_dialog.expl">One or several selected files contain verification data, including device, network and geolocation information. Only share if this will not put you at risk.</string>
-  <string name="verification.share_select_media.and.verification">Share files + verification information</string>
-  <string name="verification.share_select_only.media">Share files only</string>
-  <string name="verification.info_wifi">Wi-Fi info</string>
-  <string name="verification.collecting_list.item_device">Device identification</string>
-  <string name="verification.collecting_list.item_network">Network information</string>
-  <string name="verification.collecting_dialog.expl">Tella is recording information to make your file verifiable. It can take several minutes. Make sure your device\'s view of the sky is unobstructed for better results.</string>
-  <string name="verification.help.info_app.bar">Verification Help</string>
-  <string name="gallery_action.desc_metadata.help">Verification Help</string>
-  <string name="verification.info_file.path.expl">Where the file was located in the Tella directory.</string>
-  <string name="verification.info_hash.expl">A unique number to identify the file.</string>
-  <string name="verification.info_date.time.modified.expl">The date and time the file was last modified on the device.</string>
-  <string name="verification.info_manufacturer.expl">The name of the device manufacturer.</string>
-  <string name="verification.info_device.model.expl">The exact model of the device.</string>
-  <string name="verification.info_device.id.expl">A unique number identifying the Android device.</string>
-  <string name="verification.info_screen.size.expl">The exact screen size of the device.</string>
-  <string name="verification.info_language.expl">The language the device\'s operating system is set to.</string>
-  <string name="verification.info_locale.expl">The geographic region the device is set to.</string>
-  <string name="verification.info_connection.status.expl">Whether the device is connected or disconnected to the internet.</string>
-  <string name="verification.info_network.type.expl">If the device is connected to the internet, specifies whether it is to a Wi-Fi network or to a cellular network.</string>
-  <string name="verification.info_wifi.mac.expl">A unique identifier to the device\'s Wi-Fi connector.</string>
-  <string name="verification.info_ipv4.expl">A unique address identifying the device\'s internet connection.</string>
-  <string name="verification.info_ipv6.expl">A more recent identifier to a device\'s internet connection.</string>
-  <string name="verification.info_location.expl">The exact location of the device, includes latitude and longitude coordinates, altitude in meters, the accuracy of the measurement in meters, and the time of the measurement.</string>
-  <string name="verification.info_location.provider.expl">How location is determined. \"Fused\" means it\'s using a mix of methods, including GPS and network connections.</string>
-  <string name="verification.info_location.speed.expl">The speed at which the device is traveling in meters per second.</string>
-  <string name="verification.info_cell.towers.expl">The identifying numbers of all the cell towers the device is connected to.</string>
-  <string name="verification.info_wifi.expl">The name of all Wi-Fi networks in the vicinity of the device.</string>
-  <string name="collect.blank_banner_forms.updated">Some forms have been updated. Tap the update button next to the forms to get the latest version.</string>
-  <string name="settings.docu_auto.upload.server.selection_dialog.expl">Which server would you like to upload the files to?</string>
-  <string name="settings.serv_add.server.selection_dialog.title">What type of server?</string>
-  <string name="settings.docu_add.server_dialog.select_odk">Open Data Kit (ODK)</string>
-  <string name="settings.docu_add.server_dialog.expl">Select the type of server you want to connect to. If you are unsure, ask your organization.</string>
-  <string name="settings.docu_add.server_dialog.select_tus">Direct Upload</string>
-  <string name="play.audio_action.expl_plus15s">+15s</string>
-  <string name="play.audio_action.expl_minus15s">-15s</string>
-  <string name="recorder_meta_space.available.days">%1$d days %2$d hours (%3$s) left</string>
-  <string name="recorder_meta_space.available.hours">%1$d hours %2$d min (%3$s) left</string>
-  <string name="camera_video.resolution_dialog.title">Select video resolution</string>
-  <string name="camera_video.resolution_dialog.expl">Higher resolution means that the video will be of higher quality but the file size will also be larger.</string>
-  <string name="camera_video.resolution_select_highest">Highest possible</string>
-  <string name="camera_video.resolution_select_1080p">High (1080p)</string>
-  <string name="camera_video.resolution_select_720p">Medium (720p)</string>
-  <string name="camera_video.resolution_select_480p">Low (480p)</string>
-  <string name="settings.docu_auto.upload_action.expl">Tella will upload your photos, videos, or audio recordings to the server as soon as they are recorded or imported into Tella.</string>
-  <string name="settings.docu_auto.delete_action">Auto-delete</string>
-  <string name="settings.docu_choose.auto.upload.server_dialog.expl">Which server would you like to auto-upload the files to?</string>
-  <string name="settings.docu_error_must.select.auto.upload.server">You must select a server.</string>
-  <string name="camera_tab.title_video">Video</string>
-  <string name="camera_tab.title_photo">Photo</string>
-  <string name="action_upload">Upload</string>
-  <string name="collect.blank_action.desc_more.options">More options</string>
-  <string name="action_next">Next</string>
-  <string name="meter">%f m</string>
-  <string name="meter_per_second">%f m/s</string>
-  <string name="tella">Tella</string>
-  <string name="intro_document_protect">Document &amp; Protect</string>
-  <string name="onboard_setup_lock">How would you like to lock Tella?</string>
-  <string name="onboard_password">Password</string>
-  <string name="onboard_password_description">The most secure option</string>
-  <string name="onboard_pin">PIN</string>
-  <string name="onboard_pin_description">Moderately secure</string>
-  <string name="onboard_pattern">Pattern</string>
-  <string name="onboard_pattern_description">The least secure option</string>
-  <string name="settings.sec_app.bar">Security</string>
-  <string name="settings.select_security">Security</string>
-  <string name="settings.select_lock_timeout">Lock Timeout</string>
-  <string name="settings.sec_camera.mute_switch">Camera silent mode</string>
-  <string name="settings.sec_camera.mute_expl">Turn off the camera shutter sound to draw less attention when taking photos.</string>
-  <string name="settings.sec_quick.delete_switch">Quick delete</string>
-  <string name="settings.sec_quick.delete_expl">Shows a sliding button on the homescreen to quickly exit Tella in emergency situations.</string>
-  <string name="settings.servers.title_server.settings">Servers</string>
-  <string name="settings.servers.add_server.expl">Connect to servers to collect and send data to your organization</string>
-  <string name="settings.servers_auto.upload_action">Auto-upload to server</string>
-  <string name="settings.servers_auto.upload_action.expl">Upload your files to your Reports server as soon as they are captured (photos, videos, or audio recordings) or imported into Tella.</string>
-  <string name="settings.servers_auto.delete_action.expl">If activated, Tella will automatically delete the files uploaded as soon as the upload is complete.</string>
-  <string name="settings.servers_auto.upload.server.selection">Server for auto-upload</string>
-  <string name="settings.servers_add.server.forms">FORMS</string>
-  <string name="settings.servers_add.server.reports">REPORTS</string>
-  <string name="settings.servers_choose.auto.upload.server_dialog.title">Select auto-upload server</string>
-  <string name="settings.servers_enable_auto_upload_dialog.title">Enable auto-upload?</string>
-  <string name="settings.servers_enable_auto_upload_dialog.expl">Your photos, videos, and audio files will be automatically uploaded as soon as they are recorded, and any file will be automatically uploaded when you import it into Tella.</string>
-  <string name="settings.servers_disable_auto_upload_dialog.title">Disable auto-upload?</string>
-  <string name="settings.servers_disable_auto_upload_dialog.expl">Your files will no longer be automatically uploaded to the server.</string>
-  <string name="settings.servers_disable_auto_delete_dialog.title">Disable auto-delete?</string>
-  <string name="settings.servers_disable_auto_delete_dialog.expl">Your files will no longer be automatically deleted once the upload is complete.</string>
-  <string name="action_enable">Enable</string>
-  <string name="action_disable">Disable</string>
-  <string name="settings.servers_delete.server_dialog.title">Delete \"%1$s\" server?</string>
-  <string name="action_edit">Edit</string>
-  <string name="settings.server_add.server_dialog_advanced">Advanced</string>
-  <string name="settings.docu_error_auth.required">Authentication required</string>
-  <string name="settings.sec_lock_timeout_immediately">Immediately</string>
-  <string name="settings.sec_lock_timeout_1min">1 minute</string>
-  <string name="settings.sec_lock_timeout_5min">5 minutes</string>
-  <string name="settings.sec_lock_timeout_30min">30 minutes</string>
-  <string name="settings.sec_lock_timeout_1hour">1 hour</string>
-  <string name="settings.sec_lock_timeout_desc">Decide how long it takes for Tella to lock</string>
-  <string name="settings.prot_select_delete.vault">Delete files</string>
-  <string name="settings.sec_delete.vault_tooltip">Delete all the files stored in Tella.</string>
-  <string name="settings.sec_delete.forms_tooltip">Delete all draft and submitted forms.</string>
-  <string name="settings.sec_delete.servers_tooltip">Delete your connections to servers and all forms associated with them.</string>
-  <string name="settings.sec_delete.app_tooltip">Delete the app and all the data it contains. You will be asked “Do you want to uninstall this app?” Unless you confirm, Tella will not be deleted.</string>
-  <string name="settings.sec_bypass_switch_title">Bypass censorship</string>
-  <string name="settings.sec_bypass_switch_expl">Overcome attempts to block Tella in your region. Note that enabling this will make it slower to send data to the servers.</string>
-  <string name="settings.servers_add_camouflage.subtitle">Your app is currently camouflaged
+    <string name="settings.about_list.item_privacy.policy">Privacy policy</string>
+    <string name="recorder_toast_fail.recording">There was an error recording the audio. Please try again</string>
+    <string name="recorder_content.desc_blinking.red.dot">Recording audio</string>
+    <string name="action_remove">Remove</string>
+    <string name="settings_app.bar">Settings</string>
+    <string name="action_save">Save</string>
+    <string name="lock_dialog.expl_save.pattern">Saving your lock pattern</string>
+    <string name="lock_dialog.expl_unlock.app">Unlocking Tella</string>
+    <string name="action_skip">Skip</string>
+    <string name="settings.docu_delete.server_dialog.expl">If you delete this server, all draft and submitted forms will be deleted from your device. Delete anyway?</string>
+    <string name="settings.docu_toast_server.deleted">Server deleted</string>
+    <string name="settings.docu_toast_server.created">Server created</string>
+    <string name="settings.docu_toast_server.updated">Server updated</string>
+    <string name="settings.docu_dialog.title_server.settings">Server settings</string>
+    <string name="settings.docu_field_server.name">Server name</string>
+    <string name="settings.docu_field_server.url">Server URL</string>
+    <string name="collect.sent_tab.title">Submitted</string>
+    <string name="home_expl_cancel.quick.delete">Tap anywhere to cancel</string>
+    <string name="recorder_app.bar">Recorder</string>
+    <string name="settings.docu_field_username">Username</string>
+    <string name="collect.draft_meta_date.updated">Updated: %1$s</string>
+    <string name="settings.about_app.version">Version</string>
+    <string name="collect_toast_draft.saved">Draft saved</string>
+    <string name="collect_toast_fail.sending.form">There was an error submitting the form. Please try again</string>
+    <string name="collect_toast_fail.form.submission.generic">There was an error submitting the form: %s</string>
+    <string name="collect.form_toast_validation.generic.error">There were validation errors in some answers</string>
+    <string name="permission_dialog.expl_GPS">In order to make your files verifiable, Tella needs to record your location and needs permission to access your GPS.</string>
+    <string name="collect.form_action_select.time">Select time</string>
+    <string name="collect.form_action_select.date">Select date</string>
+    <string name="collect_dialog.expl_downloading.blank.forms">Downloading forms</string>
+    <string name="collect.blank_toast_fail.updating.form.list">There was an error updating the list of forms. Please try again</string>
+    <string name="collect_toast_fail.parsing.form">There was an error displaying this form. Please try again</string>
+    <string name="collect.end_action_save.send.later">Save form</string>
+    <string name="collect_action.desc_save.form">Save form</string>
+    <string name="collect.end_action.desc_save.send.later">Save form</string>
+    <string name="action.desc_confirm">Confirm</string>
+    <string name="collect.form_action_previous.section">Previous</string>
+    <string name="collect.form_action_next.section">Next</string>
+    <string name="action_stop">Stop</string>
+    <string name="action_play">Play</string>
+    <string name="action_record">Record</string>
+    <string name="play.audio_app.bar">Play Audio</string>
+    <string name="collect_dialog.text_delete.sent.form">Are you sure you want to delete this form from your device? Note that because it was already submitted, the data will remain on your organization\'s server.</string>
+    <string name="collect_dialog.text_delete.draft.form">Are you sure you want to delete this draft form?</string>
+    <string name="collect_toast_form.deleted">The form was deleted</string>
+    <string name="settings.lang_select.expl_default">Keep Tella in the same language as my device</string>
+    <string name="settings.lang_select_default">Default</string>
+    <string name="settings.lang_app.bar">Language</string>
+    <string name="action_share">Share</string>
+    <string name="collect_toast_fail.submission.unauthorized">You do not have permission to submit this form. If you think this is a mistake, please contact your organization</string>
+    <string name="gallery_toast_fail.importing.file">There was an error importing the file. Please try again</string>
+    <string name="collect.end_heading">End of the form</string>
+    <string name="collect.end_toast_notification.form.not.sent.no.connection">You’re not connected to the internet. Try again when connected</string>
+    <string name="collect.sent_dialog.expl_discard.unsent.form">Parts or all of the form wasn\'t sent. Are you sure you want to discard it?</string>
+    <string name="action_discard">Discard</string>
+    <string name="collect.end_action_submit">Submit</string>
+    <string name="gallery_toast_fail.exporting.to.device">There was an error exporting the files. Please try again</string>
+    <string name="permission_dialog.expl_device.storage">In order to export files, Tella needs permission to write on the device\'s storage.</string>
+    <string name="gallery_toast_fail.deleting.files">There was an error deleting the files. Please try again.</string>
+    <plurals name="gallery_toast_files.exported">
+        <item quantity="one">%1$d file saved to the device</item>
+        <item quantity="other">%1$d files saved to the device</item>
+    </plurals>
+    <string name="gallery_delete.files_dialog.title">Delete file?</string>
+    <string name="gallery_delete.files_dialog.expl">The selected file will be permanently deleted from your gallery.</string>
+    <string name="gallery_save.to.device_dialog.title">Save to device gallery?</string>
+    <string name="gallery_save.to.device_dialog.expl">This will make your file accessible from outside Tella, in your device\'s gallery and by other apps.</string>
+    <string name="gallery_dialog.expl_encrypting">Encrypting</string>
+    <string name="gallery_save.to.device_dialog.progress.expl">Decrypting</string>
+    <string name="gallery_toast_fail.import">There was an error opening the gallery to import the files. Please try again</string>
+    <string name="gallery_toast_fail.saving.file">There was an error saving the file. Please try again</string>
+    <string name="collect_toast_fail.attaching.file.to.form">There was an error attaching the file. Please try again</string>
+    <string name="collect_toast_fail.fetch.form.from.server.unknown.error">There was an error downloading the form. Please try again</string>
+    <string name="collect_toast_fail.fetch.form.from.server.display.error">There was an error downloading the form: %s</string>
+    <string name="collect_toast_reason.fail.fetch.form.from.server">The form could not be found. It may have been deleted from your organization\'s server</string>
+    <string name="gallery_heading_files.from.Tella.gallery">Tella Gallery</string>
+    <string name="settings_select_general">General</string>
+    <string name="collect.form_exit_dialog.expl">Your draft will be lost.</string>
+    <string name="collect.form_exit_dialog.action_save.exit">SAVE AND EXIT</string>
+    <string name="collect.form_exit_dialog.action_exit.anyway">EXIT ANYWAY</string>
+    <string name="settings.docu_error_not.valid.URL">This is not a valid URL.</string>
+    <string name="home_action.label_quick.delete">Delete</string>
+    <string name="gallery_subheading_sort.by">Sort by</string>
+    <string name="gallery_list.item_newest.to.oldest">Newest to oldest</string>
+    <string name="gallery_list.item_oldest.to.newest">Oldest to newest</string>
+    <string name="action_exit">Exit</string>
+    <string name="settings.prot_select_camouflage">Camouflage</string>
+    <string name="settings.docu_error_wrong.credentials">The username or password is incorrect.</string>
+    <string name="settings.docu_error_domain.doesnt.exit">The server URL is incorrect.</string>
+    <string name="settings.docu_error_unknown.connection.error">There was an error trying to connect to the server.</string>
+    <string name="settings.docu_error_no.internet">You’re not connected to the internet. Try again when connected.</string>
+    <string name="settings.docu_dialog.action_try.again.connecting">Try again</string>
+    <string name="settings.about_select_tutorial">Tutorial</string>
+    <string name="settings.camo_expl">Select a custom icon and name to better hide Tella on your device. Note that the Tella icon will remain visible from the Android settings.</string>
+    <string name="gallery_action.desc_save.to.device">Save to device</string>
+    <string name="settings.docu_verification_action">Verification mode</string>
+    <string name="settings.docu_verification_action.expl">Makes your media files verifiable by collecting information about your device and location.</string>
+    <string name="collect_no.form_heading">Easy data collection</string>
+    <string name="collect_expl_not.connected.to.server">To receive forms and submit data, you must first connect to a compatible server. Ask your organization for the server information and <a href="tella_scheme://open.collect.manage.servers.activity">set up the server here</a>.</string>
+    <string name="collect.sent_expl_no.forms">There are no submitted forms to display.</string>
+    <string name="collect.blank_expl_no.forms">There are no forms to display. Tap the refresh button to check if there are forms available on the servers you\'re connected to.</string>
+    <string name="settings.camo_heading">Select a different name and logo</string>
+    <string name="gallery_expl_empty">There are no files to show. Tap the + button to import files.</string>
+    <string name="collect.blank_toast_not.connected">You’re not connected to the internet. Try again when connected</string>
+    <string name="settings.gen_crash.reports_action">Share crash reports</string>
+    <string name="settings.gen_crash.reports_action.expl">Crash reports help us improve Tella. They are automatically sent and include data such as device model and Android version.</string>
+    <string name="collect.form_dialog.action_add.group">Add</string>
+    <string name="collect.form_dialog.title_add.additional.group">Add another \"%s\"?</string>
+    <string name="collect.form_dialog.action_add.first.group">Add \"%s\"?</string>
+    <string name="collect.form_dialog.expl_add.additional.group">You will be able to answer all the questions in \"%s\" again.</string>
+    <string name="collect.form_dialog.expl_add.first.group">You will be able to answer all the questions in \"%s\".</string>
+    <string name="collect.form_dialog.action_dont.add.group">Do not add</string>
+    <string name="collect.form_select.attachment_app.bar">Select file</string>
+    <string name="collect.form_geopoint_app.bar">Record position</string>
+    <string name="collect.form_geopoint_marker_content.desc">Position recorded</string>
+    <string name="collect.form_geopoint_meta_latitude">Latitude: %1$s</string>
+    <string name="collect.form_geopoint_meta_longitude">Longitude: %1$s</string>
+    <string name="collect.form_geopoint_meta_altitude">Altitude: %1$s m</string>
+    <string name="collect.form_geopoint_meta_accuracy">Accuracy: %1$s m</string>
+    <string name="collect.form_attachment_meta_file.name">File name: %s</string>
+    <string name="collect.form_meta_file.size">File size: %s</string>
+    <string name="collect.form_toast_fail.load.attachment">There was an error loading the attachment. Please try again</string>
+    <string name="collect.form_geopoint_banner_touch.map.select.location">Touch anywhere for 3 seconds to record position.</string>
+    <string name="gallery_action.desc_file.metadata">Verification information</string>
+    <string name="verification.info_app.bar">Verification information</string>
+    <string name="verification.info_field_filename">File name</string>
+    <string name="verification.info_field_file.path">File path</string>
+    <string name="verification.info_field_file.modified">File modified</string>
+    <string name="verification.info_field_hash">File hash</string>
+    <string name="verification.info_field_manufacturer">Manufacturer</string>
+    <string name="verification.info_field_hardware">Hardware</string>
+    <string name="verification.info_field_device.id">Device ID</string>
+    <string name="verification.info_field_screen.size">Screen size</string>
+    <string name="verification.info_field_language">Language</string>
+    <string name="verification.info_field_locale">Locale</string>
+    <string name="verification.info_field_connection.status">Connection status</string>
+    <string name="verification.info_field_network.type">Network type</string>
+    <string name="verification.info_field_wifi.mac">Wi-Fi MAC</string>
+    <string name="verification.info_field_ipv4">IPv4</string>
+    <string name="verification.info_field_ipv6">IPv6</string>
+    <string name="verification.collecting_list.item_location">Location</string>
+    <string name="verification.info_field_location">Location</string>
+    <string name="verification.info_field_location.provider">Location provider</string>
+    <string name="verification.info_field_location.speed">Location speed</string>
+    <string name="verification.info_field_cell.towers">Cell info</string>
+    <string name="settings.camo_calculator2">Calculator</string>
+    <string name="verification.info_subheading_file.metadata">File</string>
+    <string name="verification.info_subheading_device.metadata">Device</string>
+    <string name="verification.info_subheading_context.metadata">Context</string>
+    <string name="verification.info_field_metadata.not.available">Not Available</string>
+    <string name="verification.info_field_latitude">Latitude:</string>
+    <string name="verification.info_field_longitude">Longitude:</string>
+    <string name="verification.info_field_altitude">Altitude:</string>
+    <string name="verification.info_field_accuracy">Accuracy:</string>
+    <string name="verification.info_field_location.time">Time:</string>
+    <string name="collect.form_ranking_action_select.answer">Select an answer</string>
+    <string name="collect.form_ranking_action_clear.selection">Clear selection</string>
+    <string name="collect.form_signature_app.bar">Draw your signature</string>
+    <string name="collect.form_signature_action">Sign here</string>
+    <string name="collect.form_signature_action_clear.signature">Clear signature</string>
+    <string name="collect.form_signature_toast_fail.saving">There was an error saving the signature. Please try again</string>
+    <string name="collect.form_acknowledge_select.expl">OK. Please continue.</string>
+    <plurals name="collect.end_meta_number.of.elements">
+        <item quantity="one">%d file</item>
+        <item quantity="other">%d files</item>
+    </plurals>
+    <string name="action_learn.more">Learn more</string>
+    <string name="settings.servers_add.server_dialog.title">Add server</string>
+    <string name="settings.prot_select_delete.forms">Delete draft and submitted forms</string>
+    <string name="settings.prot_select_delete.servers">Delete server settings</string>
+    <string name="settings.prot_select_delete.app">Delete Tella</string>
+    <string name="collect.sent_action_edit.to.resend">Edit to resend</string>
+    <string name="collect_toast_form.submitted">Form submitted</string>
+    <string name="collect.end_heading_confirmation.form.submitted">Form submitted</string>
+    <string name="settings.docu_add.server_field_password">Password</string>
+    <string name="settings.camo_error_fail.retrieve.app.name">App</string>
+    <string name="collect.end_item_form.data">Form responses</string>
+    <string name="collect_toast_fail.loading.form.instance">There was an error loading the form. Please try again</string>
+    <string name="collect_toast_fail.connection.too.weak">Your internet connection is too weak to send the form. Please try again</string>
+    <string name="gallery_toast_file.encrypted">File encrypted</string>
+    <string name="settings.docu_toast_disconnect.servers.delete">All forms and servers have been deleted</string>
+    <string name="collect.help_expl_not.connected.to.server">To receive forms and submit data, you must first connect to a server. Ask your organization for the server information and set up the server.</string>
+    <string name="collect.help_expl_odk">If you would like to create your own forms, <a href="https://hzontal.org/contact/">contact us</a> or use <a href="https://opendatakit.org/help/help-for-hire/">any service based on the Open Data Kit (ODK)</a></string>
+    <string name="collect.help_expl_no.internet">If you are not connected to the Internet, you can still fill forms. The data will be submitted as soon as you get online.</string>
+    <string name="collect_toast_fail.data.too.large">Your form cannot be submitted because the attachments are too large. Please attach smaller files</string>
+    <string name="collect.end_heading_submitting">Submitting</string>
+    <string name="collect.end_exit_dialog.expl">If you exit now, the submission will be stopped but you will be able to submit the remaining files later.</string>
+    <string name="collect.end_subheading.expl_unchecked.items">Unchecked items will be saved for later sending.</string>
+    <string name="collect_toast_form.saved.for.later.submission">Form saved for later submission</string>
+    <string name="collect.blank_action_unpin">Unpin from the top</string>
+    <string name="collect.blank_action_pin">Pin to the top</string>
+    <string name="verification.prompt_dialog.expl">Verification mode is ON but GPS is OFF. Turn ON GPS in order to record the position of your evidence.</string>
+    <string name="verification.prompt_action_ignore">Ignore</string>
+    <string name="verification.prompt_action_enable.GPS">Turn on GPS</string>
+    <string name="collect.blank_dialog.expl_updating.form.definitions">Updating the list of forms…</string>
+    <string name="collect.blank_toast_refresh.canceled">Update canceled</string>
+    <string name="collect.blank_toast_form.definition.updated">Update completed</string>
+    <string name="verification.share_dialog.title">Do you want to include verification information?</string>
+    <string name="verification.share_dialog.expl">One or several selected files contain verification data, including device, network and geolocation information. Only share if this will not put you at risk.</string>
+    <string name="verification.share_select_media.and.verification">Share files + verification information</string>
+    <string name="verification.share_select_only.media">Share files only</string>
+    <string name="verification.info_wifi">Wi-Fi info</string>
+    <string name="verification.collecting_list.item_device">Device identification</string>
+    <string name="verification.collecting_list.item_network">Network information</string>
+    <string name="verification.collecting_dialog.expl">Tella is recording information to make your file verifiable. It can take several minutes. Make sure your device\'s view of the sky is unobstructed for better results.</string>
+    <string name="verification.help.info_app.bar">Verification Help</string>
+    <string name="gallery_action.desc_metadata.help">Verification Help</string>
+    <string name="verification.info_file.path.expl">Where the file was located in the Tella directory.</string>
+    <string name="verification.info_hash.expl">A unique number to identify the file.</string>
+    <string name="verification.info_date.time.modified.expl">The date and time the file was last modified on the device.</string>
+    <string name="verification.info_manufacturer.expl">The name of the device manufacturer.</string>
+    <string name="verification.info_device.model.expl">The exact model of the device.</string>
+    <string name="verification.info_device.id.expl">A unique number identifying the Android device.</string>
+    <string name="verification.info_screen.size.expl">The exact screen size of the device.</string>
+    <string name="verification.info_language.expl">The language the device\'s operating system is set to.</string>
+    <string name="verification.info_locale.expl">The geographic region the device is set to.</string>
+    <string name="verification.info_connection.status.expl">Whether the device is connected or disconnected to the internet.</string>
+    <string name="verification.info_network.type.expl">If the device is connected to the internet, specifies whether it is to a Wi-Fi network or to a cellular network.</string>
+    <string name="verification.info_wifi.mac.expl">A unique identifier to the device\'s Wi-Fi connector.</string>
+    <string name="verification.info_ipv4.expl">A unique address identifying the device\'s internet connection.</string>
+    <string name="verification.info_ipv6.expl">A more recent identifier to a device\'s internet connection.</string>
+    <string name="verification.info_location.expl">The exact location of the device, includes latitude and longitude coordinates, altitude in meters, the accuracy of the measurement in meters, and the time of the measurement.</string>
+    <string name="verification.info_location.provider.expl">How location is determined. \"Fused\" means it\'s using a mix of methods, including GPS and network connections.</string>
+    <string name="verification.info_location.speed.expl">The speed at which the device is traveling in meters per second.</string>
+    <string name="verification.info_cell.towers.expl">The identifying numbers of all the cell towers the device is connected to.</string>
+    <string name="verification.info_wifi.expl">The name of all Wi-Fi networks in the vicinity of the device.</string>
+    <string name="collect.blank_banner_forms.updated">Some forms have been updated. Tap the update button next to the forms to get the latest version.</string>
+    <string name="settings.docu_auto.upload.server.selection_dialog.expl">Which server would you like to upload the files to?</string>
+    <string name="settings.serv_add.server.selection_dialog.title">What type of server?</string>
+    <string name="settings.docu_add.server_dialog.select_odk">Open Data Kit (ODK)</string>
+    <string name="settings.docu_add.server_dialog.expl">Select the type of server you want to connect to. If you are unsure, ask your organization.</string>
+    <string name="settings.docu_add.server_dialog.select_tus">Direct Upload</string>
+    <string name="play.audio_action.expl_plus15s">+15s</string>
+    <string name="play.audio_action.expl_minus15s">-15s</string>
+    <string name="recorder_meta_space.available.days">%1$d days %2$d hours (%3$s) left</string>
+    <string name="recorder_meta_space.available.hours">%1$d hours %2$d min (%3$s) left</string>
+    <string name="camera_video.resolution_dialog.title">Select video resolution</string>
+    <string name="camera_video.resolution_dialog.expl">Higher resolution means that the video will be of higher quality but the file size will also be larger.</string>
+    <string name="camera_video.resolution_select_highest">Highest possible</string>
+    <string name="camera_video.resolution_select_1080p">High (1080p)</string>
+    <string name="camera_video.resolution_select_720p">Medium (720p)</string>
+    <string name="camera_video.resolution_select_480p">Low (480p)</string>
+    <string name="settings.docu_auto.upload_action.expl">Tella will upload your photos, videos, or audio recordings to the server as soon as they are recorded or imported into Tella.</string>
+    <string name="settings.docu_auto.delete_action">Auto-delete</string>
+    <string name="settings.docu_choose.auto.upload.server_dialog.expl">Which server would you like to auto-upload the files to?</string>
+    <string name="settings.docu_error_must.select.auto.upload.server">You must select a server.</string>
+    <string name="camera_tab.title_video">Video</string>
+    <string name="camera_tab.title_photo">Photo</string>
+    <string name="action_upload">Upload</string>
+    <string name="collect.blank_action.desc_more.options">More options</string>
+    <string name="action_next">Next</string>
+    <string name="meter">%f m</string>
+    <string name="meter_per_second">%f m/s</string>
+    <string name="tella">Tella</string>
+    <string name="intro_document_protect">Document &amp; Protect</string>
+    <string name="onboard_setup_lock">How would you like to lock Tella?</string>
+    <string name="onboard_password">Password</string>
+    <string name="onboard_password_description">The most secure option</string>
+    <string name="onboard_pin">PIN</string>
+    <string name="onboard_pin_description">Moderately secure</string>
+    <string name="onboard_pattern">Pattern</string>
+    <string name="onboard_pattern_description">The least secure option</string>
+    <string name="settings.sec_app.bar">Security</string>
+    <string name="settings.select_security">Security</string>
+    <string name="settings.select_lock_timeout">Lock Timeout</string>
+    <string name="settings.sec_camera.mute_switch">Camera silent mode</string>
+    <string name="settings.sec_camera.mute_expl">Turn off the camera shutter sound to draw less attention when taking photos.</string>
+    <string name="settings.sec_quick.delete_switch">Quick delete</string>
+    <string name="settings.sec_quick.delete_expl">Shows a sliding button on the homescreen to quickly exit Tella in emergency situations.</string>
+    <string name="settings.servers.title_server.settings">Servers</string>
+    <string name="settings.servers.add_server.expl">Connect to servers to collect and send data to your organization</string>
+    <string name="settings.servers_auto.upload_action">Auto-upload to server</string>
+    <string name="settings.servers_auto.upload_action.expl">Upload your files to your Reports server as soon as they are captured (photos, videos, or audio recordings) or imported into Tella.</string>
+    <string name="settings.servers_auto.delete_action.expl">If activated, Tella will automatically delete the files uploaded as soon as the upload is complete.</string>
+    <string name="settings.servers_auto.upload.server.selection">Server for auto-upload</string>
+    <string name="settings.servers_add.server.forms">FORMS</string>
+    <string name="settings.servers_add.server.reports">REPORTS</string>
+    <string name="settings.servers_choose.auto.upload.server_dialog.title">Select auto-upload server</string>
+    <string name="settings.servers_enable_auto_upload_dialog.title">Enable auto-upload?</string>
+    <string name="settings.servers_enable_auto_upload_dialog.expl">Your photos, videos, and audio files will be automatically uploaded as soon as they are recorded, and any file will be automatically uploaded when you import it into Tella.</string>
+    <string name="settings.servers_disable_auto_upload_dialog.title">Disable auto-upload?</string>
+    <string name="settings.servers_disable_auto_upload_dialog.expl">Your files will no longer be automatically uploaded to the server.</string>
+    <string name="settings.servers_disable_auto_delete_dialog.title">Disable auto-delete?</string>
+    <string name="settings.servers_disable_auto_delete_dialog.expl">Your files will no longer be automatically deleted once the upload is complete.</string>
+    <string name="action_enable">Enable</string>
+    <string name="action_disable">Disable</string>
+    <string name="settings.servers_delete.server_dialog.title">Delete \"%1$s\" server?</string>
+    <string name="action_edit">Edit</string>
+    <string name="settings.server_add.server_dialog_advanced">Advanced</string>
+    <string name="settings.docu_error_auth.required">Authentication required</string>
+    <string name="settings.sec_lock_timeout_immediately">Immediately</string>
+    <string name="settings.sec_lock_timeout_1min">1 minute</string>
+    <string name="settings.sec_lock_timeout_5min">5 minutes</string>
+    <string name="settings.sec_lock_timeout_30min">30 minutes</string>
+    <string name="settings.sec_lock_timeout_1hour">1 hour</string>
+    <string name="settings.sec_lock_timeout_desc">Decide how long it takes for Tella to lock</string>
+    <string name="settings.prot_select_delete.vault">Delete files</string>
+    <string name="settings.sec_delete.vault_tooltip">Delete all the files stored in Tella.</string>
+    <string name="settings.sec_delete.forms_tooltip">Delete all draft and submitted forms.</string>
+    <string name="settings.sec_delete.servers_tooltip">Delete your connections to servers and all forms associated with them.</string>
+    <string name="settings.sec_delete.app_tooltip">Delete the app and all the data it contains. You will be asked “Do you want to uninstall this app?” Unless you confirm, Tella will not be deleted.</string>
+    <string name="settings.sec_bypass_switch_title">Bypass censorship</string>
+    <string name="settings.sec_bypass_switch_expl">Overcome attempts to block Tella in your region. Note that enabling this will make it slower to send data to the servers.</string>
+    <string name="settings.servers_add_camouflage.subtitle">Your app is currently camouflaged
  with a Calculator app</string>
-  <string name="settings.servers_change.camouflage.method">CHANGE CAMOUFLAGE METHOD</string>
-  <string name="settings.servers_remove.camouflage.method">REMOVE CAMOUFLAGE</string>
-  <string name="settings.servers_hide_tella_title">Hide Tella</string>
-  <string name="settings.servers_hide_tella_desc">Select your preferred method of hiding Tella</string>
-  <string name="settings.servers_setup_camouflage_title">Set Up Camouflage</string>
-  <string name="settings.servers_setup_camouflage_description">There are two camouflage options available. The first one is quicker but less secure; the second one is less convenient but more secure.</string>
-  <string name="settings.servers_setup_change_camouflage_title">CHANGE NAME &amp; ICON</string>
-  <string name="settings.servers_setup_change_camouflage_subtitle">Tella will appear on the home screen with a different app name and icon</string>
-  <string name="settings.servers_setup_hide_behind_camouflage_title">hide behind a real app</string>
-  <string name="settings.servers_setup_hide_behind_camouflage_subtitle">The most secure option: Camouflage Tella behind an actual functioning app</string>
-  <string name="settings.servers_setup_change_name_icon_title">CHANGE NAME AND ICON</string>
-  <string name="settings.servers_setup_change_name_icon_subtitle"><b>Less secure:</b> Tella will appear on the home screen with a different app name and icon. Tapping on the new icon opens the actual Tella.</string>
-  <string name="settings.servers_setup_hide_behind_calculator_title">hide behind a calculator app</string>
-  <string name="settings.servers_setup_hide_behind_calculator_subtitle"><b>More secure:</b> Camouflage Tella behind an actual functioning calculator app. Input your PIN on the calculator to unlock Tella.</string>
-  <string name="settings.servers_setup_hide_behind_calculator_not_possible">The Calculator camouflage is only possible if you
+    <string name="settings.servers_change.camouflage.method">CHANGE CAMOUFLAGE METHOD</string>
+    <string name="settings.servers_remove.camouflage.method">REMOVE CAMOUFLAGE</string>
+    <string name="settings.servers_hide_tella_title">Hide Tella</string>
+    <string name="settings.servers_hide_tella_desc">Select your preferred method of hiding Tella</string>
+    <string name="settings.servers_setup_camouflage_title">Set Up Camouflage</string>
+    <string name="settings.servers_setup_camouflage_description">There are two camouflage options available. The first one is quicker but less secure; the second one is less convenient but more secure.</string>
+    <string name="settings.servers_setup_change_camouflage_title">CHANGE NAME &amp; ICON</string>
+    <string name="settings.servers_setup_change_camouflage_subtitle">Tella will appear on the home screen with a different app name and icon</string>
+    <string name="settings.servers_setup_hide_behind_camouflage_title">hide behind a real app</string>
+    <string name="settings.servers_setup_hide_behind_camouflage_subtitle">The most secure option: Camouflage Tella behind an actual functioning app</string>
+    <string name="settings.servers_setup_change_name_icon_title">CHANGE NAME AND ICON</string>
+    <string name="settings.servers_setup_change_name_icon_subtitle"><b>Less secure:</b> Tella will appear on the home screen with a different app name and icon. Tapping on the new icon opens the actual Tella.</string>
+    <string name="settings.servers_setup_hide_behind_calculator_title">hide behind a calculator app</string>
+    <string name="settings.servers_setup_hide_behind_calculator_subtitle"><b>More secure:</b> Camouflage Tella behind an actual functioning calculator app. Input your PIN on the calculator to unlock Tella.</string>
+    <string name="settings.servers_setup_hide_behind_calculator_not_possible">The Calculator camouflage is only possible if you
  use a PIN lock.<font color="#D6933B"><b> Change lock here</b></font></string>
-  <string name="settings.sec_change_lock_type_warning">If you change your lock method, Camouflage will be disabled</string>
-  <string name="action_continue">Continue</string>
-  <string name="settings.camo_icamera">iCamera</string>
-  <string name="settings.camo_selfie_cam">Selfie Cam</string>
-  <string name="settings.camo_snap_camera">Snap Camera</string>
-  <string name="settings.camo_calculate">Calculate</string>
-  <string name="settings.camo_calculator_plus">Calculator Plus</string>
-  <string name="settings.camo_icalculator">iCalculator</string>
-  <string name="settings.camo_weather">Weather</string>
-  <string name="settings.camo_easyweather">EasyWeather</string>
-  <string name="settings.camo_sunnyday">SunnyDay</string>
-  <string name="settings.camo_gamestation">GameStation</string>
-  <string name="settings.camo_playnow">PlayNow</string>
-  <string name="settings.camo_jeweldash">Jewel Dash</string>
-  <string name="settings.camo_time">Time</string>
-  <string name="settings.camo_stopwatch">StopWatch</string>
-  <string name="fragment_mic">Microphone</string>
-  <string name="mic_recording">Recording</string>
-  <string name="mic_rename_recording">Rename recording</string>
-  <string name="recorder_toast_recording.saved">The audio recording was saved to your Tella files</string>
-  <string name="onboard.intro_title">Welcome to Tella</string>
-  <string name="onboard.intro_get_started">Get started</string>
-  <string name="onboard.title_camera">Camera</string>
-  <string name="onboard.expl_camera">Take photos and videos directly in Tella. These files are automatically encrypted and saved in Tella, and will not be visible from your phone’s regular gallery.</string>
-  <string name="onboard.title_recorder">Recorder</string>
-  <string name="onboard.expl_recorder">Record interviews or any sound around you with Tella’s voice recorder.  The audio files are automatically encrypted and saved in Tella’s hidden folder.</string>
-  <string name="onboard.title_files">Encrypted files &amp; folders</string>
-  <string name="onboard.expl_files">Securely store and organize all your files. As long as Tella is locked, your files and folders will remain inaccessible to someone seizing or searching the device.</string>
-  <string name="onboard.title_lock_finish">Lock</string>
-  <string name="onboard.expl_lock_finish">Your lock is set up! You can change it anytime in Settings.</string>
-  <string name="onboard.title_all_done">You’re all done!</string>
-  <string name="onboard.expl_all_done">You can go to Tella now, or continue customizing Tella to set up advanced settings.</string>
-  <string name="onboard.go_btn_all_done">Go to Tella</string>
-  <string name="onboard.advanced_btn_all_done">Advanced settings</string>
-  <string name="onboard.title_share_data">Share data you collect</string>
-  <string name="onboard.expl_share_data">If you work with an organization, connect to the organization’s server to send files and data with them. Your organization should provide you with the server details.</string>
-  <string name="onboard.connect_btn_share_data">Connect to server</string>
-  <string name="onboard.continue_btn_share_data">Continue without
+    <string name="settings.sec_change_lock_type_warning">If you change your lock method, Camouflage will be disabled</string>
+    <string name="action_continue">Continue</string>
+    <string name="settings.camo_icamera">iCamera</string>
+    <string name="settings.camo_selfie_cam">Selfie Cam</string>
+    <string name="settings.camo_snap_camera">Snap Camera</string>
+    <string name="settings.camo_calculate">Calculate</string>
+    <string name="settings.camo_calculator_plus">Calculator Plus</string>
+    <string name="settings.camo_icalculator">iCalculator</string>
+    <string name="settings.camo_weather">Weather</string>
+    <string name="settings.camo_easyweather">EasyWeather</string>
+    <string name="settings.camo_sunnyday">SunnyDay</string>
+    <string name="settings.camo_gamestation">GameStation</string>
+    <string name="settings.camo_playnow">PlayNow</string>
+    <string name="settings.camo_jeweldash">Jewel Dash</string>
+    <string name="settings.camo_time">Time</string>
+    <string name="settings.camo_stopwatch">StopWatch</string>
+    <string name="fragment_mic">Microphone</string>
+    <string name="mic_recording">Recording</string>
+    <string name="mic_rename_recording">Rename recording</string>
+    <string name="recorder_toast_recording.saved">The audio recording was saved to your Tella files</string>
+    <string name="onboard.intro_title">Welcome to Tella</string>
+    <string name="onboard.intro_get_started">Get started</string>
+    <string name="onboard.title_camera">Camera</string>
+    <string name="onboard.expl_camera">Take photos and videos directly in Tella. These files are automatically encrypted and saved in Tella, and will not be visible from your phone’s regular gallery.</string>
+    <string name="onboard.title_recorder">Recorder</string>
+    <string name="onboard.expl_recorder">Record interviews or any sound around you with Tella’s voice recorder.  The audio files are automatically encrypted and saved in Tella’s hidden folder.</string>
+    <string name="onboard.title_files">Encrypted files &amp; folders</string>
+    <string name="onboard.expl_files">Securely store and organize all your files. As long as Tella is locked, your files and folders will remain inaccessible to someone seizing or searching the device.</string>
+    <string name="onboard.title_lock_finish">Lock</string>
+    <string name="onboard.expl_lock_finish">Your lock is set up! You can change it anytime in Settings.</string>
+    <string name="onboard.title_all_done">You’re all done!</string>
+    <string name="onboard.expl_all_done">You can go to Tella now, or continue customizing Tella to set up advanced settings.</string>
+    <string name="onboard.go_btn_all_done">Go to Tella</string>
+    <string name="onboard.advanced_btn_all_done">Advanced settings</string>
+    <string name="onboard.title_share_data">Share data you collect</string>
+    <string name="onboard.expl_share_data">If you work with an organization, connect to the organization’s server to send files and data with them. Your organization should provide you with the server details.</string>
+    <string name="onboard.connect_btn_share_data">Connect to server</string>
+    <string name="onboard.continue_btn_share_data">Continue without
 connecting to a server</string>
-  <string name="onboard.expl_hide_tella">To make it harder to find on your device, you can hide Tella by changing the way it looks on your homescreen.</string>
-  <string name="onboard.default_btn_title_hide_tella">KEEP tella’s default look</string>
-  <string name="onboard.default_btn_subtitle_hide_tella">Tella remains visible on the home screen</string>
-  <string name="onboard.title_advanced_complete">Advanced customization complete!</string>
-  <string name="onboard.expl_advanced_complete">You can always continue changing your preferences in Settings.</string>
-  <string name="onboard.title_connected_server">Connected to server</string>
-  <string name="onboard.expl_connected_server">You have successfully connected Tella to the server and will be able to share your data.</string>
-  <string name="onboard.expl_hide_tella_set">Your camouflage is set up! You can change it anytime in Settings.</string>
-  <string name="onboard.hide_behind_calculator_not_possible">The Calculator camouflage is only possible if you use a PIN lock.</string>
-  <string name="onboard.calculator_button">Select calculator</string>
-  <string name="onboard.calculator_expl">Tella will be hidden behind a functional Calculator app. Unlock Tella by entering your PIN on the calculator followed by =</string>
-  <string name="settings.general_recent_files_switch_title">Recent files</string>
-  <string name="settings.general_recent_files_switch_expl">Show previews of and a shortcut to your recent files on Tella’s homescreen.</string>
-  <string name="settings.general_favorite_forms_switch_title">Favorite forms</string>
-  <string name="settings.general_favorite_forms_switch_expl">Show shortcuts to your favorite forms on Tella’s homescreen.</string>
-  <string name="settings.sec_confirm_camouflage_title">Exit Tella to enable camouflage?</string>
-  <string name="settings.sec_confirm_camouflage_desc">To re-open Tella, look for the %s app icon among your apps.</string>
-  <string name="settings.sec_confirm_calc_camouflage_desc">To re-open Tella, look for the Calculator app icon among your apps. Unlock Tella by entering your PIN in the Calculator followed by “=”. </string>
-  <string name="settings.sec_confirm_exit_tella">Exit Tella</string>
-  <string name="Home_BottomNav_Home">Home</string>
-  <string name="Home_BottomNav_Rec">Rec</string>
-  <string name="Home_BottomNav_Camera">Camera</string>
-  <string name="Home_BottomNav_Forms">Forms</string>
-  <string name="Home_BottomNav_Reports">Reports</string>
-  <string name="Vault_Move_AppBar">Move \"%s\"</string>
-  <string name="Vault_CreateFolder_SheetAction">Create</string>
-  <string name="ServerSettings_ServerName_ToolTip">Give your server a name to recognize it if you add more servers later. It could be the organization’s name, the project’s name, etc.</string>
-  <plurals name="Vault_Importing_SheetProgress">
-    <item quantity="one">%s file imported</item>
-    <item quantity="other">%s files imported</item>
-  </plurals>
-  <string name="Vault_Importing_SheetTitle">Importing and encrypting</string>
-  <string name="Rec_Exit_SheetTitle">Save recording?</string>
-  <string name="Rec_Exit_SheetText">Your recording is not saved. Would you like to save it before exiting?</string>
-  <string name="Vault_AudioRecordings_AppBar">Audio recordings</string>
-  <string name="Vault_Encryting_SheetText">%d% complete</string>
-  <string name="Vault_Encrypting_Cancel_SheetTitle">Cancel encryption and delete file?</string>
-  <string name="Vault_Encrypting_Cancel_SheetText">If you cancel, your file will be lost</string>
-  <string name="Vault_Encrypting_Cancel_SheetAction_Resume">RESUME ENCRYPTION</string>
-  <string name="Vault_Encrypting_Cancel_SheetAction_Delete">DELETE FILE</string>
-  <string name="SettingSec_ChangeLock_WarningCalc_SheetTitle">Change lock method and remove camouflage?</string>
-  <string name="SettingSec_ChangeLock_WarningCalc_SheetText">Your current Calculator camouflage is only compatible with a PIN lock. If you change your lock method, Tella will no longer be camouflaged and will be visible on your phone’s homescreen.</string>
-  <string name="SettingSec_ChangeLock_WarningCalc_SheetAction_Remove">REMOVE CAMOUFLAGE</string>
-  <string name="SettingsCamo_EnterLock_Password">Enter your password to change your camouflage method</string>
-  <string name="settings.gen_select_about">About &amp; Help</string>
-  <string name="settings.gen_select_language">Language</string>
-  <string name="home_action.desc_quick.exit">Exit</string>
-  <string name="settings.camo_camera4">Camera</string>
-  <string name="settings.camo_camera3">CameraPro</string>
-  <string name="settings.camo_camera2">SuperCam</string>
-  <string name="settings.camo_camera1">EasyCam</string>
-  <string name="settings.camo_weather3">Weather now</string>
-  <string name="settings.camo_weather2">Local weather</string>
-  <string name="settings.camo_weather1">Weather</string>
-  <string name="settings.docu_add.server_dialog.select_tella_web">Tella Web</string>
-  <string name="settings.docu_add.server_dialog.select_tella_uwazi">Uwazi</string>
-  <string name="collect.outbox_tab.title">Outbox</string>
-  <string name="Collect_RemoveForm_SheetTitle">Remove form?</string>
-  <string name="fragment_uwazi">Uwazi</string>
-  <string name="Uwazi_Dowload_Temapltes_Header_Title">Download templates</string>
-  <string name="Uwazi_RemoveTemplate_SheetTitle">Remove from device</string>
-  <string name="Uwazi_Action_FillEntity">Create an entity</string>
-  <string name="Uwazi_Action_RemoveTemplate">Delete Template</string>
-  <string name="Uwazi_Subtitle_RemoveTemplate">Are you sure you want to remove this template? </string>
-  <string name="UWAZI_Language_Header_Title">Uwazi language</string>
-  <string name="Uwazi_Language_Screen_Description">This Uwazi collection is available in several languages. Please select the language in which you would like to download templates. </string>
-  <string name="Uwazi_General_Favorite_Template_Switch_Expl">Show shortcuts to your favorite templates on Tella’s homescreen.</string>
-  <string name="Uwazi_General_Favorite_Template_Switch_Title">Favorite templates</string>
-  <string name="Uwazi_Templates_Empty_Description">Your have no saved templates. Tap the “+”
+    <string name="onboard.expl_hide_tella">To make it harder to find on your device, you can hide Tella by changing the way it looks on your homescreen.</string>
+    <string name="onboard.default_btn_title_hide_tella">KEEP tella’s default look</string>
+    <string name="onboard.default_btn_subtitle_hide_tella">Tella remains visible on the home screen</string>
+    <string name="onboard.title_advanced_complete">Advanced customization complete!</string>
+    <string name="onboard.expl_advanced_complete">You can always continue changing your preferences in Settings.</string>
+    <string name="onboard.title_connected_server">Connected to server</string>
+    <string name="onboard.expl_connected_server">You have successfully connected Tella to the server and will be able to share your data.</string>
+    <string name="onboard.expl_hide_tella_set">Your camouflage is set up! You can change it anytime in Settings.</string>
+    <string name="onboard.hide_behind_calculator_not_possible">The Calculator camouflage is only possible if you use a PIN lock.</string>
+    <string name="onboard.calculator_button">Select calculator</string>
+    <string name="onboard.calculator_expl">Tella will be hidden behind a functional Calculator app. Unlock Tella by entering your PIN on the calculator followed by =</string>
+    <string name="settings.general_recent_files_switch_title">Recent files</string>
+    <string name="settings.general_recent_files_switch_expl">Show previews of and a shortcut to your recent files on Tella’s homescreen.</string>
+    <string name="settings.general_favorite_forms_switch_title">Favorite forms</string>
+    <string name="settings.general_favorite_forms_switch_expl">Show shortcuts to your favorite forms on Tella’s homescreen.</string>
+    <string name="settings.sec_confirm_camouflage_title">Exit Tella to enable camouflage?</string>
+    <string name="settings.sec_confirm_camouflage_desc">To re-open Tella, look for the %s app icon among your apps.</string>
+    <string name="settings.sec_confirm_calc_camouflage_desc">To re-open Tella, look for the Calculator app icon among your apps. Unlock Tella by entering your PIN in the Calculator followed by “=”. </string>
+    <string name="settings.sec_confirm_exit_tella">Exit Tella</string>
+    <string name="Home_BottomNav_Home">Home</string>
+    <string name="Home_BottomNav_Rec">Rec</string>
+    <string name="Home_BottomNav_Camera">Camera</string>
+    <string name="Home_BottomNav_Forms">Forms</string>
+    <string name="Home_BottomNav_Reports">Reports</string>
+    <string name="Vault_Move_AppBar">Move \"%s\"</string>
+    <string name="Vault_CreateFolder_SheetAction">Create</string>
+    <string name="ServerSettings_ServerName_ToolTip">Give your server a name to recognize it if you add more servers later. It could be the organization’s name, the project’s name, etc.</string>
+    <plurals name="Vault_Importing_SheetProgress">
+        <item quantity="one">%s file imported</item>
+        <item quantity="other">%s files imported</item>
+    </plurals>
+    <string name="Vault_Importing_SheetTitle">Importing and encrypting</string>
+    <string name="Rec_Exit_SheetTitle">Save recording?</string>
+    <string name="Rec_Exit_SheetText">Your recording is not saved. Would you like to save it before exiting?</string>
+    <string name="Vault_AudioRecordings_AppBar">Audio recordings</string>
+    <string name="Vault_Encryting_SheetText">%d% complete</string>
+    <string name="Vault_Encrypting_Cancel_SheetTitle">Cancel encryption and delete file?</string>
+    <string name="Vault_Encrypting_Cancel_SheetText">If you cancel, your file will be lost</string>
+    <string name="Vault_Encrypting_Cancel_SheetAction_Resume">RESUME ENCRYPTION</string>
+    <string name="Vault_Encrypting_Cancel_SheetAction_Delete">DELETE FILE</string>
+    <string name="SettingSec_ChangeLock_WarningCalc_SheetTitle">Change lock method and remove camouflage?</string>
+    <string name="SettingSec_ChangeLock_WarningCalc_SheetText">Your current Calculator camouflage is only compatible with a PIN lock. If you change your lock method, Tella will no longer be camouflaged and will be visible on your phone’s homescreen.</string>
+    <string name="SettingSec_ChangeLock_WarningCalc_SheetAction_Remove">REMOVE CAMOUFLAGE</string>
+    <string name="SettingsCamo_EnterLock_Password">Enter your password to change your camouflage method</string>
+    <string name="settings.gen_select_about">About &amp; Help</string>
+    <string name="settings.gen_select_language">Language</string>
+    <string name="home_action.desc_quick.exit">Exit</string>
+    <string name="settings.camo_camera4">Camera</string>
+    <string name="settings.camo_camera3">CameraPro</string>
+    <string name="settings.camo_camera2">SuperCam</string>
+    <string name="settings.camo_camera1">EasyCam</string>
+    <string name="settings.camo_weather3">Weather now</string>
+    <string name="settings.camo_weather2">Local weather</string>
+    <string name="settings.camo_weather1">Weather</string>
+    <string name="settings.docu_add.server_dialog.select_tella_web">Tella Web</string>
+    <string name="settings.docu_add.server_dialog.select_tella_uwazi">Uwazi</string>
+    <string name="collect.outbox_tab.title">Outbox</string>
+    <string name="Collect_RemoveForm_SheetTitle">Remove form?</string>
+    <string name="fragment_uwazi">Uwazi</string>
+    <string name="Uwazi_Dowload_Temapltes_Header_Title">Download templates</string>
+    <string name="Uwazi_RemoveTemplate_SheetTitle">Remove from device</string>
+    <string name="Uwazi_Action_FillEntity">Create an entity</string>
+    <string name="Uwazi_Action_RemoveTemplate">Delete Template</string>
+    <string name="Uwazi_Subtitle_RemoveTemplate">Are you sure you want to remove this template? </string>
+    <string name="UWAZI_Language_Header_Title">Uwazi language</string>
+    <string name="Uwazi_Language_Screen_Description">This Uwazi collection is available in several languages. Please select the language in which you would like to download templates. </string>
+    <string name="Uwazi_General_Favorite_Template_Switch_Expl">Show shortcuts to your favorite templates on Tella’s homescreen.</string>
+    <string name="Uwazi_General_Favorite_Template_Switch_Title">Favorite templates</string>
+    <string name="Uwazi_Templates_Empty_Description">Your have no saved templates. Tap the “+”
 button to add a new template.</string>
-  <string name="Uwazi_Submitted_Entities_Empty_Description">You have no submitted entities.</string>
-  <string name="Uwazi_Outbox_Entities_Empty_Description">Your Outbox is currently empty. Entities
+    <string name="Uwazi_Submitted_Entities_Empty_Description">You have no submitted entities.</string>
+    <string name="Uwazi_Outbox_Entities_Empty_Description">Your Outbox is currently empty. Entities
  that are ready to send will appear here.</string>
-  <string name="Uwazi_Draft_Entities_Empty_Description">You have no draft entities.</string>
-  <string name="Uwazi_Action_Save_Draft">Save draft</string>
-  <string name="Uwazi_Subtitle_RemoveDraft">Are you sure you want to remove this draft?</string>
-  <string name="Uwazi_Form_MediaHeader">Attached file</string>
-  <string name="Uwazi_EntryInstance_SavedInfo">Entity is saved as draft.</string>
-  <string name="Uwazi_Action_EditDraft">Edit draft</string>
-  <string name="Uwazi_Action_RemoveDraft">Remove draft</string>
-  <string name="Uwazi_Submitted_Entity_Header_Title">Summary</string>
-  <string name="Uwazi_Action_ViewEntity">View entity</string>
-  <string name="Uwazi_Action_DeleteEntity">Delete entity</string>
-  <string name="Uwazi_WidgetSubtitle_DateFrom">From</string>
-  <string name="Uwazi_WidgetSubtitle_DateTo">To</string>
-  <string name="Uwazi_WidgetSubtitle_Label">Label</string>
-  <string name="Uwazi_WidgetSubtitle_URL">URL</string>
-  <string name="Uwazi_Info_NotValidURL">This is not a valid Url</string>
-  <string name="Uwazi_Subtitle_MarkdownSupported">markdown supported</string>
-  <string name="Uwazi_Entry_Validation_MandatoryFields">You must fill in the mandatory fields</string>
-  <string name="Uwazi_Entry_Validation_MandatoryTitle">You must fill in the title</string>
-  <string name="Uwazi_Submit_Later">Submit later</string>
-  <string name="Uwazi_WidgetMultiDate_AddDate">Add another date</string>
-  <string name="Uwazi_WidgetMultiDate_AddDateRange">Add another date range</string>
-  <string name="Uwazi_WidgetDateRange_Constraint">The second date in the range must be after the first</string>
-  <string name="Uwazi_MiltiFileWidget_AddMoreFiles">Add more files</string>
-  <string name="Uwazi_MiltiFileWidget_Show">Show Files</string>
-  <string name="Uwazi_MiltiFileWidget_Hide">Hide Files</string>
-  <string name="Uwazi_MiltiFileWidget_Help">Select as many files as you wish</string>
-  <string name="Uwazi_WidgetMedia_Select_Text">Select audio or video file</string>
-  <string name="Uwazi_WidgetMedia_Select_Photos_Text">Select photos</string>
-  <string name="Uwazi_WidgetMedia_Description_Text">Attach a video or audio file</string>
-  <string name="Uwazi_WidgetImage_Select_Text">Select image file</string>
-  <string name="Uwazi_WidgetImage_Select_Description_Text">Attach an image file</string>
-  <string name="Uwazi_WidgetMedia_Take_Video">Take video with camera</string>
-  <string name="Uwazi_WidgetMedia_Take_Photo">Take photo with camera</string>
-  <string name="Uwazi_WidgetMedia_Select_From_Tella">Select from Tella files</string>
-  <string name="Uwazi_WidgetMedia_Select_From_Device">Select from your device</string>
-  <string name="Uwazi_Widget_Sheet_Description">Choose how you want to add files</string>
-  <string name="Uwazi_Entity_Error_Response_Mandatory">This field is mandatory.</string>
-  <string name="Uwazi_Server_Title">Server : </string>
-  <string name="Uwazi_Template_Title">Template : </string>
-  <plurals name="Uwazi_MiltiFileWidget_FilesAttached">
-    <item quantity="one">%1$d file attached</item>
-    <item quantity="other">%1$d files attached</item>
-  </plurals>
-  <string name="Uwazi_MiltiFileWidget_SelectFiles">Select files</string>
-  <string name="Uwazi_MiltiFileWidget_SelectPdfFiles">Select PDF files</string>
-  <string name="Uwazi_MiltiFileWidget_PrimaryDocuments">Primary documents</string>
-  <string name="Uwazi_MiltiFileWidget_AttachMenyPdfFiles">Attach as many PDF files as you wish</string>
-  <string name="Uwazi_MiltiFileWidget_ChooseHowToAddPdfFiles">Choose how you want to add PDF files</string>
-  <string name="Uwazi_MiltiFileWidget_SupportingFiles">Supporting files</string>
-  <string name="Uwazi_Drafts_Header_Text">These are entities you have not submitted.
+    <string name="Uwazi_Draft_Entities_Empty_Description">You have no draft entities.</string>
+    <string name="Uwazi_Action_Save_Draft">Save draft</string>
+    <string name="Uwazi_Subtitle_RemoveDraft">Are you sure you want to remove this draft?</string>
+    <string name="Uwazi_Form_MediaHeader">Attached file</string>
+    <string name="Uwazi_EntryInstance_SavedInfo">Entity is saved as draft.</string>
+    <string name="Uwazi_Action_EditDraft">Edit draft</string>
+    <string name="Uwazi_Action_RemoveDraft">Remove draft</string>
+    <string name="Uwazi_Submitted_Entity_Header_Title">Summary</string>
+    <string name="Uwazi_Action_ViewEntity">View entity</string>
+    <string name="Uwazi_Action_DeleteEntity">Delete entity</string>
+    <string name="Uwazi_WidgetSubtitle_DateFrom">From</string>
+    <string name="Uwazi_WidgetSubtitle_DateTo">To</string>
+    <string name="Uwazi_WidgetSubtitle_Label">Label</string>
+    <string name="Uwazi_WidgetSubtitle_URL">URL</string>
+    <string name="Uwazi_Info_NotValidURL">This is not a valid Url</string>
+    <string name="Uwazi_Subtitle_MarkdownSupported">markdown supported</string>
+    <string name="Uwazi_Entry_Validation_MandatoryFields">You must fill in the mandatory fields</string>
+    <string name="Uwazi_Entry_Validation_MandatoryTitle">You must fill in the title</string>
+    <string name="Uwazi_Submit_Later">Submit later</string>
+    <string name="Uwazi_WidgetMultiDate_AddDate">Add another date</string>
+    <string name="Uwazi_WidgetMultiDate_AddDateRange">Add another date range</string>
+    <string name="Uwazi_WidgetDateRange_Constraint">The second date in the range must be after the first</string>
+    <string name="Uwazi_MiltiFileWidget_AddMoreFiles">Add more files</string>
+    <string name="Uwazi_MiltiFileWidget_Show">Show Files</string>
+    <string name="Uwazi_MiltiFileWidget_Hide">Hide Files</string>
+    <string name="Uwazi_MiltiFileWidget_Help">Select as many files as you wish</string>
+    <string name="Uwazi_WidgetMedia_Select_Text">Select audio or video file</string>
+    <string name="Uwazi_WidgetMedia_Select_Photos_Text">Select photos</string>
+    <string name="Uwazi_WidgetMedia_Description_Text">Attach a video or audio file</string>
+    <string name="Uwazi_WidgetImage_Select_Text">Select image file</string>
+    <string name="Uwazi_WidgetImage_Select_Description_Text">Attach an image file</string>
+    <string name="Uwazi_WidgetMedia_Take_Video">Take video with camera</string>
+    <string name="Uwazi_WidgetMedia_Take_Photo">Take photo with camera</string>
+    <string name="Uwazi_WidgetMedia_Select_From_Tella">Select from Tella files</string>
+    <string name="Uwazi_WidgetMedia_Select_From_Device">Select from your device</string>
+    <string name="Uwazi_Widget_Sheet_Description">Choose how you want to add files</string>
+    <string name="Uwazi_Entity_Error_Response_Mandatory">This field is mandatory.</string>
+    <string name="Uwazi_Server_Title">Server : </string>
+    <string name="Uwazi_Template_Title">Template : </string>
+    <plurals name="Uwazi_MiltiFileWidget_FilesAttached">
+        <item quantity="one">%1$d file attached</item>
+        <item quantity="other">%1$d files attached</item>
+    </plurals>
+    <string name="Uwazi_MiltiFileWidget_SelectFiles">Select files</string>
+    <string name="Uwazi_MiltiFileWidget_SelectPdfFiles">Select PDF files</string>
+    <string name="Uwazi_MiltiFileWidget_PrimaryDocuments">Primary documents</string>
+    <string name="Uwazi_MiltiFileWidget_AttachMenyPdfFiles">Attach as many PDF files as you wish</string>
+    <string name="Uwazi_MiltiFileWidget_ChooseHowToAddPdfFiles">Choose how you want to add PDF files</string>
+    <string name="Uwazi_MiltiFileWidget_SupportingFiles">Supporting files</string>
+    <string name="Uwazi_Drafts_Header_Text">These are entities you have not submitted.
 
  Tap on an entity to continue working on it.</string>
-  <string name="Uwazi_Outbox_Header_Text">These are entities ready to send or partially sent.</string>
-  <string name="Uwazi_Submitted_Header_Text">These are entities that you have submitted.</string>
-  <string name="Uwazi_MiltiFileWidget_ChooseHowToAddFiles">Choose how you want to add files</string>
-  <string-array name="Uwazi_Language_Array">
-    <item>English</item>
-    <item>عربي</item>
-    <item>Français</item>
-  </string-array>
-  <string-array name="Uwazi_Language_Array_Translated">
-    <item>English</item>
-    <item>Arabic</item>
-    <item>French</item>
-  </string-array>
-  <string name="Collect_Action_FillForm">Fill form</string>
-  <string name="Collect_Subtitle_RemoveForm">Are you sure you want to remove \"%1$s\"? </string>
-  <string name="Util_ellapsedTime_Year">More than a year ago</string>
-  <plurals name="Util_ellapsedTime_Months">
-    <item quantity="one">A month ago</item>
-    <item quantity="other">%d months ago</item>
-  </plurals>
-  <plurals name="Util_ellapsedTime_Weeks">
-    <item quantity="one">A week ago</item>
-    <item quantity="other">%d weeks ago</item>
-  </plurals>
-  <plurals name="Util_ellapsedTime_Days">
-    <item quantity="one">One day ago</item>
-    <item quantity="other">%d days ago</item>
-  </plurals>
-  <plurals name="Util_ellapsedTime_Hours">
-    <item quantity="one">An hour ago</item>
-    <item quantity="other">%d hours ago</item>
-  </plurals>
-  <plurals name="Util_ellapsedTime_Minutes">
-    <item quantity="one">A minute ago</item>
-    <item quantity="other">%d minutes ago</item>
-  </plurals>
-  <string name="Util_ellapsedTime_Seconds">A few seconds ago</string>
-  <string name="Donwload_Templates_Title_Description">These are the templates available on the Uwazi instances you are connected to.</string>
-  <string name="Uwazi_Templates_HeaderMessage">These are Uwazi templates you can fill out.</string>
-  <string name="Vault_Filter_Name">Name</string>
-  <string name="Server_Url_Screen_Title">Enter the server URL</string>
-  <string name="Login_Type_Screen_Title">Log in if you have a username and password, or use the server\'s public access.</string>
-  <string name="Login_Text">Log in</string>
-  <string name="Public_Login_Text">Public access</string>
-  <string name="Two_Factor_Authentication_Description">This Uwazi instance requires two-step verification. Enter here the 6-digit code from your authenticator app.</string>
-  <string name="Two_Factor_Authentication_Screen_Tile">Two-step verification</string>
-  <string name="Authentication_Code">Verification code</string>
-  <string name="Inavlid_Token_Msg_Error">The verification code is Invalid or expired. Please try again.</string>
-  <string name="Connected_Successfuly_Text">You have successfully connected to the server and will be able to share your data.</string>
-  <string name="Login_To_Access_Text">Log in to access the server</string>
-  <string name="action_yes">yes</string>
-  <string name="Collect_WidgetVideo_Select_Text">Select video file</string>
-  <string name="Collect_WidgetAudio_Select_Text">Select audio file</string>
-  <string name="Collect_MediaWidget_Attach_Photo">Attach photo</string>
-  <string name="Collect_MediaWidget_Attach_Video">Attach video</string>
-  <string name="Collect_MediaWidget_AttachAudioRecording">Attach audio recording</string>
-  <string name="Uwazi_Templates_TabTitle">Templates</string>
-  <string name="action_no">no</string>
-  <string name="Vault_Items">items</string>
-  <string name="Vault_DeleteFile_SheetTitle">Delete file?</string>
-  <string name="Vault_deleteFile_SheetDesc">The selected file will be permanently deleted from Tella.</string>
-  <string name="Uwazi_Info_UrlLabelEmpty">The URL label is empty.</string>
-  <string name="Collect_EndSubtitleExpl_UncheckedItems">Uncheck attachments to send them later. You can complete the submission from your Outbox.</string>
-  <string name="Collect_DialogExpl_ExitingStopSubmission">Exiting will stop the submission of your form. You will be able to resume the submission later from your Outbox.</string>
-  <string name="Collect_DialogTitle_StopExit">Stop and exit?</string>
-  <string name="Collect_DialogAction_KeepSubmitting">Keep submitting</string>
-  <string name="Collect_DialogAction_StopAndExit">Stop and exit</string>
-  <string name="Collect_DialogInfo_FormSubmissionStopped">Your form submission has been stopped. You can resume it from the Outbox.</string>
-  <string name="action_view">View</string>
-  <string name="SettingsCamo_Dialog_TimeoutTitle">Tella is shutting down …</string>
-  <string name="SettingsCamo_Dialog_TimeoutDesc">Please wait. You will return to your device\'s home screen in a few seconds.</string>
-  <string name="SettingsCamo_Dialog_RemovingCamouflage">Removing camouflage …</string>
-  <string name="Collect_DeleteForm_SheetTitle">Delete form?</string>
-  <string name="Collect_DeleteDraftForm_SheetTitle">Delete draft?</string>
-  <string name="Collect_DeleteDraftForm_SheetExpl">Are you sure you want to delete this draft?</string>
-  <string name="Collect_DeleteForm_SheetExpl">Are you sure you want to delete this form?</string>
-  <string name="Uwazi_Dialog_Draft_Title">Exit entity?</string>
-  <string name="Verification_Label_meter">%f m</string>
-  <string name="Verification_Label_MeterPerSecond">%f m/s</string>
-  <string name="settings_sec_security_screen">Screen security</string>
-  <string name="settings_sec_security_screen_expl">Block screenshots and screen recordings inside Tella and screen preview in the list of recent apps</string>
-  <string name="settings.serv_add.server.selection_dialog.description">If you are not sure, please ask your
+    <string name="Uwazi_Outbox_Header_Text">These are entities ready to send or partially sent.</string>
+    <string name="Uwazi_Submitted_Header_Text">These are entities that you have submitted.</string>
+    <string name="Uwazi_MiltiFileWidget_ChooseHowToAddFiles">Choose how you want to add files</string>
+    <string-array name="Uwazi_Language_Array">
+        <item>English</item>
+        <item>عربي</item>
+        <item>Français</item>
+    </string-array>
+    <string-array name="Uwazi_Language_Array_Translated">
+        <item>English</item>
+        <item>Arabic</item>
+        <item>French</item>
+    </string-array>
+    <string name="Collect_Action_FillForm">Fill form</string>
+    <string name="Collect_Subtitle_RemoveForm">Are you sure you want to remove \"%1$s\"? </string>
+    <string name="Util_ellapsedTime_Year">More than a year ago</string>
+    <plurals name="Util_ellapsedTime_Months">
+        <item quantity="one">A month ago</item>
+        <item quantity="other">%d months ago</item>
+    </plurals>
+    <plurals name="Util_ellapsedTime_Weeks">
+        <item quantity="one">A week ago</item>
+        <item quantity="other">%d weeks ago</item>
+    </plurals>
+    <plurals name="Util_ellapsedTime_Days">
+        <item quantity="one">One day ago</item>
+        <item quantity="other">%d days ago</item>
+    </plurals>
+    <plurals name="Util_ellapsedTime_Hours">
+        <item quantity="one">An hour ago</item>
+        <item quantity="other">%d hours ago</item>
+    </plurals>
+    <plurals name="Util_ellapsedTime_Minutes">
+        <item quantity="one">A minute ago</item>
+        <item quantity="other">%d minutes ago</item>
+    </plurals>
+    <string name="Util_ellapsedTime_Seconds">A few seconds ago</string>
+    <string name="Donwload_Templates_Title_Description">These are the templates available on the Uwazi instances you are connected to.</string>
+    <string name="Uwazi_Templates_HeaderMessage">These are Uwazi templates you can fill out.</string>
+    <string name="Vault_Filter_Name">Name</string>
+    <string name="Server_Url_Screen_Title">Enter the server URL</string>
+    <string name="Login_Type_Screen_Title">Log in if you have a username and password, or use the server\'s public access.</string>
+    <string name="Login_Text">Log in</string>
+    <string name="Public_Login_Text">Public access</string>
+    <string name="Two_Factor_Authentication_Description">This Uwazi instance requires two-step verification. Enter here the 6-digit code from your authenticator app.</string>
+    <string name="Two_Factor_Authentication_Screen_Tile">Two-step verification</string>
+    <string name="Authentication_Code">Verification code</string>
+    <string name="Inavlid_Token_Msg_Error">The verification code is Invalid or expired. Please try again.</string>
+    <string name="Connected_Successfuly_Text">You have successfully connected to the server and will be able to share your data.</string>
+    <string name="Login_To_Access_Text">Log in to access the server</string>
+    <string name="action_yes">yes</string>
+    <string name="Collect_WidgetVideo_Select_Text">Select video file</string>
+    <string name="Collect_WidgetAudio_Select_Text">Select audio file</string>
+    <string name="Collect_MediaWidget_Attach_Photo">Attach photo</string>
+    <string name="Collect_MediaWidget_Attach_Video">Attach video</string>
+    <string name="Collect_MediaWidget_AttachAudioRecording">Attach audio recording</string>
+    <string name="Uwazi_Templates_TabTitle">Templates</string>
+    <string name="action_no">no</string>
+    <string name="Vault_Items">items</string>
+    <string name="Vault_DeleteFile_SheetTitle">Delete file?</string>
+    <string name="Vault_deleteFile_SheetDesc">The selected file will be permanently deleted from Tella.</string>
+    <string name="Uwazi_Info_UrlLabelEmpty">The URL label is empty.</string>
+    <string name="Collect_EndSubtitleExpl_UncheckedItems">Uncheck attachments to send them later. You can complete the submission from your Outbox.</string>
+    <string name="Collect_DialogExpl_ExitingStopSubmission">Exiting will stop the submission of your form. You will be able to resume the submission later from your Outbox.</string>
+    <string name="Collect_DialogTitle_StopExit">Stop and exit?</string>
+    <string name="Collect_DialogAction_KeepSubmitting">Keep submitting</string>
+    <string name="Collect_DialogAction_StopAndExit">Stop and exit</string>
+    <string name="Collect_DialogInfo_FormSubmissionStopped">Your form submission has been stopped. You can resume it from the Outbox.</string>
+    <string name="action_view">View</string>
+    <string name="SettingsCamo_Dialog_TimeoutTitle">Tella is shutting down …</string>
+    <string name="SettingsCamo_Dialog_TimeoutDesc">Please wait. You will return to your device\'s home screen in a few seconds.</string>
+    <string name="SettingsCamo_Dialog_RemovingCamouflage">Removing camouflage …</string>
+    <string name="Collect_DeleteForm_SheetTitle">Delete form?</string>
+    <string name="Collect_DeleteDraftForm_SheetTitle">Delete draft?</string>
+    <string name="Collect_DeleteDraftForm_SheetExpl">Are you sure you want to delete this draft?</string>
+    <string name="Collect_DeleteForm_SheetExpl">Are you sure you want to delete this form?</string>
+    <string name="Uwazi_Dialog_Draft_Title">Exit entity?</string>
+    <string name="Verification_Label_meter">%f m</string>
+    <string name="Verification_Label_MeterPerSecond">%f m/s</string>
+    <string name="settings_sec_security_screen">Screen security</string>
+    <string name="settings_sec_security_screen_expl">Block screenshots and screen recordings inside Tella and screen preview in the list of recent apps</string>
+    <string name="settings.serv_add.server.selection_dialog.description">If you are not sure, please ask your
  organization.</string>
-  <string name="Timeout_Warning_Title">Warning</string>
-  <string name="Timeout_Warning_Description">To perform this action, Tella will remain unlocked for 3 minutes.</string>
-  <string name="Home_BottomNav_Uwazi">Uwazi</string>
-  <string name="onboard_setup_text">How would you like to set up Tella?</string>
-  <string name="onboard_full_setup">FULL SETUP</string>
-  <string name="onboard_quick_setup">QUICK SETUP</string>
-  <string name="onboard_setup_explore_custom">Explore and fully customize the app</string>
-  <string name="onboard_setup_start">Set the lock and get started immediately</string>
-  <string name="onboard_setup_customization">Have a customization code/file?</string>
-  <string name="settings.camo_clock">Clock</string>
-  <string name="onboard.intro_organization_code">I have a code from my organization</string>
-  <string name="onboard.customization_title">Customization</string>
-  <string name="onboard.customization_subtitle">Enter your customization code</string>
-  <string name="onboard.customization_expl">Your organization may provide a code for you to set up Tella according to their settings.</string>
-  <string name="upload_toast_fail.finding.metadata.to.upload">There was an error locating the file\'s verification information. Please try again</string>
-  <string name="upload_toast.fail.finding.file.to.upload">There was an error locating the file to upload. Please try again</string>
-  <string name="gallery_app.bar">Gallery</string>
-  <string name="home_gallery.button">Gallery</string>
-  <string name="onboarding_action_create.pattern">Create pattern</string>
-  <string name="permission_dialog.expl_mic">In order to record audio, Tella needs permission to access your microphone.</string>
-  <string name="home_action.expl_camera">Tap anywhere to open the camera</string>
-  <string name="gallery_toast_file.imported.from.device">The file was added to your gallery</string>
-  <string name="permission_dialog.expl_camera.mic">In order to capture photo, video, and audio files, Tella needs access to your camera and microphone.</string>
-  <string name="permission_dialog.expl_camera">In order to take photos and videos, Tella needs permission to access your camera.</string>
-  <string name="gallery_subheading_show">Show</string>
-  <string name="gallery_list.item_show.all.files">All</string>
-  <string name="gallery_list.items_show.only.photos">Photos</string>
-  <string name="gallery_list.items_show.only.videos">Videos</string>
-  <string name="gallery_list.items_show.only.audio">Audio recordings</string>
-  <string name="onboard.camo_heading">Camouflage</string>
-  <string name="settings.camo_calculator1">Easy Math</string>
-  <string name="settings.docu_dialog.action_hide">Hide</string>
-  <string name="settings.docu_auto.upload.server.selection_select">Server</string>
-  <string name="upload_dialog.title_select.server">Server selection</string>
-  <string name="settings.docu_connect.to.servers_enable_action">Connect to servers</string>
-  <string name="settings.docu_connect.to.servers_enable_action.expl">Manage your connection to servers to send data.</string>
-  <string name="settings.docu_disable.servers_dialog.title">Disconnect servers</string>
-  <string name="settings.docu_connect.to.servers_disable_dialog.expl">Would you like to delete your server connections altogether, or simply hide them? Hiding will keep server information in memory so that you can easily reconnect and submit data to the servers.</string>
-  <string name="settings.docu_delete.auto.server_dialog.expl">If you delete this server, your files will no longer be auto-uploaded.</string>
-  <string name="settings.docu_auto.upload_action">Auto-upload</string>
-  <string name="settings.docu_auto.delete_action.expl">Tella will automatically delete the files from your device as soon as they are uploaded to the server.</string>
-  <string name="settings.docu_delete.upload.server_dialog.expl">You will no longer be able to upload files to this server.</string>
-  <plurals name="upload.main_meta_number.of.files">
-    <item quantity="one">One file</item>
-    <item quantity="other">%d files</item>
-  </plurals>
-  <string name="upload.main_meta_number.of.files_with_average" formatted="false">%d/%d MB uploaded</string>
-  <plurals name="upload.main_meta_number.of.files.uploaded">
-    <item quantity="one">%d file uploaded</item>
-    <item quantity="other">%d files uploaded</item>
-  </plurals>
-  <plurals name="upload.main_meta_minutes.left">
-    <item quantity="one">%d minute left</item>
-    <item quantity="other">%d minutes left</item>
-  </plurals>
-  <string name="settings.select_customization">Customization</string>
-  <string name="Uwazi_Send_Header_Title">End of entity</string>
-  <string name="Uwazi_Send_Entity_Title">End of entity</string>
-  <string name="action_yes_in">YES, I’M IN!</string>
-  <string name="clean_insights.signed_for_days">You have signed up to share your data.</string>
-  <string name="Javarosa_Upgrade_Warning_Description">We upgraded some of Tella libraries and we\'d need to re-download all forms.</string>
-  <string name="Javarosa_Upgrade_Toast">Please wait while we update Forms.</string>
-  <string name="Settings_Reports_Choose_Credentials">Do you have a username and password?</string>
-  <string name="Server_Connect_Icon">server connect image</string>
-  <string name="Login_To_Access_Project_Text">Log in to access the project</string>
-  <string name="Settings_Reports_Connected_To_Project">Connected to project</string>
-  <string name="Settings_Reports_Advanced_Success_Title">Advanced settings complete</string>
-  <string name="Settings_Reports_Advanced_Success_Description">You can always change your Reports preferences in the Tella Settings.</string>
-  <string name="Settings_Reports_Go_To_Reports">GO TO REPORTS</string>
-  <string name="Settings_reports_Go_To_Advanced_Settings">Advanced settings</string>
-  <string name="Setting_Reports_Share_Information_Title">Share verification information</string>
-  <string name="Setting_Reports_Share_Information_Description">Include information about your device and location when sending reports, to make your files verifiable. </string>
-  <string name="Setting_Reports_Background_Upload">Background upload</string>
-  <string name="Setting_Reports_Background_Upload_Description">Continue uploading reports while doing other tasks or if you exit Tella.
+    <string name="Timeout_Warning_Title">Warning</string>
+    <string name="Timeout_Warning_Description">To perform this action, Tella will remain unlocked for 3 minutes.</string>
+    <string name="Home_BottomNav_Uwazi">Uwazi</string>
+    <string name="onboard_setup_text">How would you like to set up Tella?</string>
+    <string name="onboard_full_setup">FULL SETUP</string>
+    <string name="onboard_quick_setup">QUICK SETUP</string>
+    <string name="onboard_setup_explore_custom">Explore and fully customize the app</string>
+    <string name="onboard_setup_start">Set the lock and get started immediately</string>
+    <string name="onboard_setup_customization">Have a customization code/file?</string>
+    <string name="settings.camo_clock">Clock</string>
+    <string name="onboard.intro_organization_code">I have a code from my organization</string>
+    <string name="onboard.customization_title">Customization</string>
+    <string name="onboard.customization_subtitle">Enter your customization code</string>
+    <string name="onboard.customization_expl">Your organization may provide a code for you to set up Tella according to their settings.</string>
+    <string name="upload_toast_fail.finding.metadata.to.upload">There was an error locating the file\'s verification information. Please try again</string>
+    <string name="upload_toast.fail.finding.file.to.upload">There was an error locating the file to upload. Please try again</string>
+    <string name="gallery_app.bar">Gallery</string>
+    <string name="home_gallery.button">Gallery</string>
+    <string name="onboarding_action_create.pattern">Create pattern</string>
+    <string name="permission_dialog.expl_mic">In order to record audio, Tella needs permission to access your microphone.</string>
+    <string name="home_action.expl_camera">Tap anywhere to open the camera</string>
+    <string name="gallery_toast_file.imported.from.device">The file was added to your gallery</string>
+    <string name="permission_dialog.expl_camera.mic">In order to capture photo, video, and audio files, Tella needs access to your camera and microphone.</string>
+    <string name="permission_dialog.expl_camera">In order to take photos and videos, Tella needs permission to access your camera.</string>
+    <string name="gallery_subheading_show">Show</string>
+    <string name="gallery_list.item_show.all.files">All</string>
+    <string name="gallery_list.items_show.only.photos">Photos</string>
+    <string name="gallery_list.items_show.only.videos">Videos</string>
+    <string name="gallery_list.items_show.only.audio">Audio recordings</string>
+    <string name="onboard.camo_heading">Camouflage</string>
+    <string name="settings.camo_calculator1">Easy Math</string>
+    <string name="settings.docu_dialog.action_hide">Hide</string>
+    <string name="settings.docu_auto.upload.server.selection_select">Server</string>
+    <string name="upload_dialog.title_select.server">Server selection</string>
+    <string name="settings.docu_connect.to.servers_enable_action">Connect to servers</string>
+    <string name="settings.docu_connect.to.servers_enable_action.expl">Manage your connection to servers to send data.</string>
+    <string name="settings.docu_disable.servers_dialog.title">Disconnect servers</string>
+    <string name="settings.docu_connect.to.servers_disable_dialog.expl">Would you like to delete your server connections altogether, or simply hide them? Hiding will keep server information in memory so that you can easily reconnect and submit data to the servers.</string>
+    <string name="settings.docu_delete.auto.server_dialog.expl">If you delete this server, your files will no longer be auto-uploaded.</string>
+    <string name="settings.docu_auto.upload_action">Auto-upload</string>
+    <string name="settings.docu_auto.delete_action.expl">Tella will automatically delete the files from your device as soon as they are uploaded to the server.</string>
+    <string name="settings.docu_delete.upload.server_dialog.expl">You will no longer be able to upload files to this server.</string>
+    <plurals name="upload.main_meta_number.of.files">
+        <item quantity="one">One file</item>
+        <item quantity="other">%d files</item>
+    </plurals>
+    <string name="upload.main_meta_number.of.files_with_average" formatted="false">%d/%d MB uploaded</string>
+    <plurals name="upload.main_meta_number.of.files.uploaded">
+        <item quantity="one">%d file uploaded</item>
+        <item quantity="other">%d files uploaded</item>
+    </plurals>
+    <plurals name="upload.main_meta_minutes.left">
+        <item quantity="one">%d minute left</item>
+        <item quantity="other">%d minutes left</item>
+    </plurals>
+    <string name="settings.select_customization">Customization</string>
+    <string name="Uwazi_Send_Header_Title">End of entity</string>
+    <string name="Uwazi_Send_Entity_Title">End of entity</string>
+    <string name="action_yes_in">YES, I’M IN!</string>
+    <string name="clean_insights.signed_for_days">You have signed up to share your data.</string>
+    <string name="Javarosa_Upgrade_Warning_Description">We upgraded some of Tella libraries and we\'d need to re-download all forms.</string>
+    <string name="Javarosa_Upgrade_Toast">Please wait while we update Forms.</string>
+    <string name="Settings_Reports_Choose_Credentials">Do you have a username and password?</string>
+    <string name="Server_Connect_Icon">server connect image</string>
+    <string name="Login_To_Access_Project_Text">Log in to access the project</string>
+    <string name="Settings_Reports_Connected_To_Project">Connected to project</string>
+    <string name="Settings_Reports_Advanced_Success_Title">Advanced settings complete</string>
+    <string name="Settings_Reports_Advanced_Success_Description">You can always change your Reports preferences in the Tella Settings.</string>
+    <string name="Settings_Reports_Go_To_Reports">GO TO REPORTS</string>
+    <string name="Settings_reports_Go_To_Advanced_Settings">Advanced settings</string>
+    <string name="Setting_Reports_Share_Information_Title">Share verification information</string>
+    <string name="Setting_Reports_Share_Information_Description">Include information about your device and location when sending reports, to make your files verifiable. </string>
+    <string name="Setting_Reports_Background_Upload">Background upload</string>
+    <string name="Setting_Reports_Background_Upload_Description">Continue uploading reports while doing other tasks or if you exit Tella.
 WARNING: If enabled, Tella will remain unlocked until all reports are fully uploaded.</string>
-  <string name="Setting_Reports_Settings_Completed">Advanced settings complete</string>
-  <string name="Setting_Reports_Settings_Completed_Description">You can always change your Reports preferences in the Tella Settings. </string>
-  <string name="Drafts_Reports_Empty_Message">Your Drafts is currently empty. Reports that you have not submitted will appear here.</string>
-  <string name="Outbox_Reports_Empty_Message">Your Outbox is currently empty. Reports that are ready to be sent will appear here.</string>
-  <string name="Submitted_Reports_Empty_Message">You have no submitted reports.</string>
-  <string name="New_Reports_Text">NEW REPORT</string>
-  <string name="Reports_Title_Screen">REPORT</string>
-  <string name="Reports_Send_To_Text">Send report to:</string>
-  <string name="Reports_Select_Your_Project">Select your project</string>
-  <string name="Reports_Select_Title">Title</string>
-  <string name="Reports_Select_Description">Description</string>
-  <string name="Reports_Attach_files_Here">Attach files here</string>
-  <string name="Connection_Title">Connections</string>
-  <string name="Reports_Saved_Draft">The report was saved as a draft</string>
-  <string name="Reports_Pause">Pause</string>
-  <string name="Reports_Resume">Resume</string>
-  <string name="File_Uploaded_on">Uploaded on</string>
-  <string name="File_Uploaded">uploaded</string>
-  <string name="Delete_Report_Confirmation">Are you sure you want to delete this report? </string>
-  <string name="Delete_Submitted_Report_Confirmation">Are you sure you want to delete this sent report from your records?</string>
-  <string name="View_Report">View</string>
-  <string name="Delete_Report">Delete</string>
-  <string name="Paused_Report">Paused</string>
-  <string name="Report_Waiting_For_Connection">Waiting for connection</string>
-  <string name="Project_Url_Screen_Title">Enter project URL</string>
-  <string name="Report_Dialog_Draft_Title">Exit report?</string>
-  <string name="Report_Server_Already_Exist_Error">You are already connected to this project. Please enter another URL.</string>
-  <string name="Report_Deleted_Confirmation"> %s has been deleted.</string>
-  <string name="Report_Save_Outbox_Confirmation">The report was saved to your Outbox. You can submit it when you are ready.</string>
-  <string name="settings.camo_micamera">MiCamera</string>
-  <string name="settings.camo_forecast">Forecast</string>
-  <string name="settings.camo_game_launcher">Game Launcher</string>
-  <string name="settings.camo_music">Music</string>
-  <string name="settings.camo_fitness_life">Fitness Life</string>
-  <string name="settings.camo_health">Health</string>
-  <string name="settings.camo_watch">Watch</string>
-  <string name="settings.camo_astrology">Astrology</string>
-  <string name="settings.camo_dictionary">Dictionary</string>
-  <string name="settings.camo_plant_care">Plant Care</string>
-  <string name="settings.camo_workout">Workout</string>
-  <string name="settings.camo_period_tracker">Period Tracker</string>
-  <string name="Setting_Reports_Background_Upload_Disabled_Description">Auto-report cannot be enabled on more than one connection. Disable auto-report elsewhere to enable it here.</string>
-  <string name="Setting_Reports_Edit_Connection">Edit connection</string>
-  <string name="Setting_Reports_Connection_Name">Connection name</string>
-  <string name="Setting_Reports_Auto_Report">Auto-report</string>
-  <string name="Setting_Reports_Auto_Report_Description">Whenever you take a photo/video/audio
+    <string name="Setting_Reports_Settings_Completed">Advanced settings complete</string>
+    <string name="Setting_Reports_Settings_Completed_Description">You can always change your Reports preferences in the Tella Settings. </string>
+    <string name="Drafts_Reports_Empty_Message">Your Drafts is currently empty. Reports that you have not submitted will appear here.</string>
+    <string name="Outbox_Reports_Empty_Message">Your Outbox is currently empty. Reports that are ready to be sent will appear here.</string>
+    <string name="Submitted_Reports_Empty_Message">You have no submitted reports.</string>
+    <string name="New_Reports_Text">NEW REPORT</string>
+    <string name="Reports_Title_Screen">REPORT</string>
+    <string name="Reports_Send_To_Text">Send report to:</string>
+    <string name="Reports_Select_Your_Project">Select your project</string>
+    <string name="Reports_Select_Title">Title</string>
+    <string name="Reports_Select_Description">Description</string>
+    <string name="Reports_Attach_files_Here">Attach files here</string>
+    <string name="Connection_Title">Connections</string>
+    <string name="Reports_Saved_Draft">The report was saved as a draft</string>
+    <string name="Reports_Pause">Pause</string>
+    <string name="Reports_Resume">Resume</string>
+    <string name="File_Uploaded_on">Uploaded on</string>
+    <string name="File_Uploaded">uploaded</string>
+    <string name="Delete_Report_Confirmation">Are you sure you want to delete this report? </string>
+    <string name="Delete_Submitted_Report_Confirmation">Are you sure you want to delete this sent report from your records?</string>
+    <string name="View_Report">View</string>
+    <string name="Delete_Report">Delete</string>
+    <string name="Paused_Report">Paused</string>
+    <string name="Report_Waiting_For_Connection">Waiting for connection</string>
+    <string name="Project_Url_Screen_Title">Enter project URL</string>
+    <string name="Report_Dialog_Draft_Title">Exit report?</string>
+    <string name="Report_Server_Already_Exist_Error">You are already connected to this project. Please enter another URL.</string>
+    <string name="Report_Deleted_Confirmation"> %s has been deleted.</string>
+    <string name="Report_Save_Outbox_Confirmation">The report was saved to your Outbox. You can submit it when you are ready.</string>
+    <string name="settings.camo_micamera">MiCamera</string>
+    <string name="settings.camo_forecast">Forecast</string>
+    <string name="settings.camo_game_launcher">Game Launcher</string>
+    <string name="settings.camo_music">Music</string>
+    <string name="settings.camo_fitness_life">Fitness Life</string>
+    <string name="settings.camo_health">Health</string>
+    <string name="settings.camo_watch">Watch</string>
+    <string name="settings.camo_astrology">Astrology</string>
+    <string name="settings.camo_dictionary">Dictionary</string>
+    <string name="settings.camo_plant_care">Plant Care</string>
+    <string name="settings.camo_workout">Workout</string>
+    <string name="settings.camo_period_tracker">Period Tracker</string>
+    <string name="Setting_Reports_Background_Upload_Disabled_Description">Auto-report cannot be enabled on more than one connection. Disable auto-report elsewhere to enable it here.</string>
+    <string name="Setting_Reports_Edit_Connection">Edit connection</string>
+    <string name="Setting_Reports_Connection_Name">Connection name</string>
+    <string name="Setting_Reports_Auto_Report">Auto-report</string>
+    <string name="Setting_Reports_Auto_Report_Description">Whenever you take a photo/video/audio
 recording in Tella, a report will automatically be
 created with the file and uploaded to this project.</string>
-  <string name="Setting_Reports_Auto_Delete">Auto-delete</string>
-  <string name="Setting_Reports_Auto_Delete_Description">Automatically delete files from your device once
+    <string name="Setting_Reports_Auto_Delete">Auto-delete</string>
+    <string name="Setting_Reports_Auto_Delete_Description">Automatically delete files from your device once
 they are uploaded to this project as a report.</string>
-  <string name="Send_Action_Label">SEND</string>
-  <string name="Modified_Label">Modified</string>
-  <string name="Snackbar_Submit_Report_Error">To submit a report, please type in a title and either add a description or attach a file.</string>
-  <string name="action_open_settings">open settings</string>
-  <string name="action_refresh">refresh</string>
-  <string name="action_check">check</string>
-  <string name="action_show_location">show location</string>
-  <string name="action_fast_rewind">fast rewind</string>
-  <string name="action_fast_forward">fast forward</string>
-  <string name="action_open_bottom_sheet">open bottom sheet</string>
-  <string name="action_add">add</string>
-  <string name="action_go_next">go next</string>
-  <string name="action_move">move </string>
-  <string name="action_favorite">favorite</string>
-  <string name="action_unfavorite">unfavorite</string>
-  <string name="action_select">select</string>
-  <string name="action_unselect">unselect</string>
-  <string name="action_show_photo">show photo</string>
-  <string name="action_help">help</string>
-  <string name="action_download">download</string>
-  <string name="action_choose_resolution">choose resolution</string>
-  <string name="action_hide_gridview">hide grid view</string>
-  <string name="action_show_gridview">show grid view</string>
-  <string name="action_switch_to_front_camera">switch to front camera</string>
-  <string name="action_switch_to_back_camera">switch to back camera</string>
-  <string name="action_disable_flash">disable flash</string>
-  <string name="action_enable_flash">enable flash</string>
-  <string name="action_open_gallery">open gallery</string>
-  <string name="action_pause">pause</string>
-  <string name="action_go_to_audio_library">Go to Audio library</string>
-  <string name="action_display_gridView">display in gridView</string>
-  <string name="action_display_list">display in list</string>
-  <string name="quick_exit_action">quick exit</string>
-  <string name="action_zoom">zoom</string>
-  <string name="action_edit_recording_name">edit recording name</string>
-  <string name="action_create_new_folder">create new folder</string>
-  <string name="action_quick_delete">quick delete</string>
-  <string name="orange_theme">orange theme</string>
-  <string name="blue_theme">blue theme</string>
-  <string name="green_theme">green theme</string>
-  <string name="yellow_theme">yellow theme</string>
-  <string name="settings.sec_keep.exif_switch">Preserve metadata when importing</string>
-  <string name="settings.sec_keep.exif_expl">Retain EXIF metadata when importing photos and videos into Tella. This includes data about when the image was created, camera settings, location and your device.</string>
-  <string name="Rename_name_Hint">Name</string>
-  <string name="action_go_to_homescreen">go to home screen</string>
-  <string name="action_show_password">show password</string>
-  <string name="action_hide_password">hide password</string>
-  <string name="action_show_pin">show pin</string>
-  <string name="action_hide_pin">hide pin</string>
-  <string name="action_go_back">go back</string>
-  <string name="Settings_show_unlock_attempts_remaining">Show unlock attempts remaining</string>
-  <string name="Settings_unlock_screen_instructions">On the unlock screen, show the remaining number of failed unlocking attempts before everything inside Tella is deleted</string>
-  <string name="Settings_Delete_After_Failed_Unlock">Delete after failed unlock</string>
-  <string name="Settings_Delete_After_Failed_Unlock_Descreption">Decide how many failed unlock attempts are allowed before everything inside Tella is deleted.</string>
-  <string name="Settings_Off_Do_Not_Delete">Off (do not delete data)</string>
-  <string name="Settings_Five_Attempts">5 attempts</string>
-  <string name="Settings_Ten_Attempts">10 attempts</string>
-  <string name="Settings_Twenty_Attempts">20 attempts</string>
-  <string name="Settings_Off">Off</string>
-  <string name="Settings_On">On</string>
-  <string name="Settings_Disabled">Disabled</string>
-  <string name="Settings_remaining_attempts_before_deletion">On the unlock screen, show the remaining number of failed unlocking attempts before everything inside Tella is deleted</string>
-  <string name="Settings_failed_unlock_message_template">Your Tella data will be deleted after %1$d failed unlock attempts</string>
-  <string name="Settings_feature_not_available_camouflage">This feature is not available with the calculator camouflage. Change your camouflage to enable this feature.</string>
-  <string name="Auto_Upload_Report">The file(s) you imported have been automatically uploaded as a report.</string>
-  <string name="Auto_Upload_Media_Report">The photo(s)/video you took has been automatically uploaded as a report.</string>
-  <string name="Auto_Upload_Recording_Report">The recording you made has been automatically uploaded as a report.</string>
-  <string name="Auto_Upload_Imported_Report_And_Deleted">The file(s) you imported have been uploaded as a report and automatically deleted.</string>
-  <string name="Auto_Upload_Media_Imported_Report_And_Deleted">"The photo/video you took has been uploaded as a report and automatically deleted."</string>
-  <string name="Auto_Upload_Recording_Imported_Report_And_Deleted">"The recording you made has been uploaded as a report and automatically deleted."</string>
-  <string name="Report_Available_in_Outbox">Your report is available in the Outbox</string>
-  <string name="Snackbar_Submit_Report_WithProject_Error">To submit a report, please select a project, type in a title and either add a description or attach a file.</string>
-  <string name="action_rotate">Rotate</string>
-  <string name="Snackbar_file_was_deleted">The file was deleted.</string>
-  <string name="Snackbar_files_were_deleted">The files were deleted.</string>
-  <string name="Snackbar_changes_were_saved">Your changes have been saved as a copy of the original file.</string>
-  <string name="Edit_Dialog_confirm_exit_title">Unsaved changes</string>
-  <string name="Edit_Dialog_confirm_exit">Your changes have not been saved. Would you like to save before exiting?</string>
-  <string name="action_exit_without_saving">EXIT WITHOUT SAVING</string>
-  <string name="incorrect_pattern">Incorrect Pattern</string>
-  <string name="Snackbar_Submit_Files_Error">To submit a report, please type in a title and attach a file.</string>
-  <string name="incorrect_pin">Incorrect Pin. 
+    <string name="Send_Action_Label">SEND</string>
+    <string name="Modified_Label">Modified</string>
+    <string name="Snackbar_Submit_Report_Error">To submit a report, please type in a title and either add a description or attach a file.</string>
+    <string name="action_open_settings">open settings</string>
+    <string name="action_refresh">refresh</string>
+    <string name="action_check">check</string>
+    <string name="action_show_location">show location</string>
+    <string name="action_fast_rewind">fast rewind</string>
+    <string name="action_fast_forward">fast forward</string>
+    <string name="action_open_bottom_sheet">open bottom sheet</string>
+    <string name="action_add">add</string>
+    <string name="action_go_next">go next</string>
+    <string name="action_move">move </string>
+    <string name="action_favorite">favorite</string>
+    <string name="action_unfavorite">unfavorite</string>
+    <string name="action_select">select</string>
+    <string name="action_unselect">unselect</string>
+    <string name="action_show_photo">show photo</string>
+    <string name="action_help">help</string>
+    <string name="action_download">download</string>
+    <string name="action_choose_resolution">choose resolution</string>
+    <string name="action_hide_gridview">hide grid view</string>
+    <string name="action_show_gridview">show grid view</string>
+    <string name="action_switch_to_front_camera">switch to front camera</string>
+    <string name="action_switch_to_back_camera">switch to back camera</string>
+    <string name="action_disable_flash">disable flash</string>
+    <string name="action_enable_flash">enable flash</string>
+    <string name="action_open_gallery">open gallery</string>
+    <string name="action_pause">pause</string>
+    <string name="action_go_to_audio_library">Go to Audio library</string>
+    <string name="action_display_gridView">display in gridView</string>
+    <string name="action_display_list">display in list</string>
+    <string name="quick_exit_action">quick exit</string>
+    <string name="action_zoom">zoom</string>
+    <string name="action_edit_recording_name">edit recording name</string>
+    <string name="action_create_new_folder">create new folder</string>
+    <string name="action_quick_delete">quick delete</string>
+    <string name="orange_theme">orange theme</string>
+    <string name="blue_theme">blue theme</string>
+    <string name="green_theme">green theme</string>
+    <string name="yellow_theme">yellow theme</string>
+    <string name="settings.sec_keep.exif_switch">Preserve metadata when importing</string>
+    <string name="settings.sec_keep.exif_expl">Retain EXIF metadata when importing photos and videos into Tella. This includes data about when the image was created, camera settings, location and your device.</string>
+    <string name="Rename_name_Hint">Name</string>
+    <string name="action_go_to_homescreen">go to home screen</string>
+    <string name="action_show_password">show password</string>
+    <string name="action_hide_password">hide password</string>
+    <string name="action_show_pin">show pin</string>
+    <string name="action_hide_pin">hide pin</string>
+    <string name="action_go_back">go back</string>
+    <string name="Settings_show_unlock_attempts_remaining">Show unlock attempts remaining</string>
+    <string name="Settings_unlock_screen_instructions">On the unlock screen, show the remaining number of failed unlocking attempts before everything inside Tella is deleted</string>
+    <string name="Settings_Delete_After_Failed_Unlock">Delete after failed unlock</string>
+    <string name="Settings_Delete_After_Failed_Unlock_Descreption">Decide how many failed unlock attempts are allowed before everything inside Tella is deleted.</string>
+    <string name="Settings_Off_Do_Not_Delete">Off (do not delete data)</string>
+    <string name="Settings_Five_Attempts">5 attempts</string>
+    <string name="Settings_Ten_Attempts">10 attempts</string>
+    <string name="Settings_Twenty_Attempts">20 attempts</string>
+    <string name="Settings_Off">Off</string>
+    <string name="Settings_On">On</string>
+    <string name="Settings_Disabled">Disabled</string>
+    <string name="Settings_remaining_attempts_before_deletion">On the unlock screen, show the remaining number of failed unlocking attempts before everything inside Tella is deleted</string>
+    <string name="Settings_failed_unlock_message_template">Your Tella data will be deleted after %1$d failed unlock attempts</string>
+    <string name="Settings_feature_not_available_camouflage">This feature is not available with the calculator camouflage. Change your camouflage to enable this feature.</string>
+    <string name="Auto_Upload_Report">The file(s) you imported have been automatically uploaded as a report.</string>
+    <string name="Auto_Upload_Media_Report">The photo(s)/video you took has been automatically uploaded as a report.</string>
+    <string name="Auto_Upload_Recording_Report">The recording you made has been automatically uploaded as a report.</string>
+    <string name="Auto_Upload_Imported_Report_And_Deleted">The file(s) you imported have been uploaded as a report and automatically deleted.</string>
+    <string name="Auto_Upload_Media_Imported_Report_And_Deleted">"The photo/video you took has been uploaded as a report and automatically deleted."</string>
+    <string name="Auto_Upload_Recording_Imported_Report_And_Deleted">"The recording you made has been uploaded as a report and automatically deleted."</string>
+    <string name="Report_Available_in_Outbox">Your report is available in the Outbox</string>
+    <string name="Snackbar_Submit_Report_WithProject_Error">To submit a report, please select a project, type in a title and either add a description or attach a file.</string>
+    <string name="action_rotate">Rotate</string>
+    <string name="Snackbar_file_was_deleted">The file was deleted.</string>
+    <string name="Snackbar_files_were_deleted">The files were deleted.</string>
+    <string name="Snackbar_changes_were_saved">Your changes have been saved as a copy of the original file.</string>
+    <string name="Edit_Dialog_confirm_exit_title">Unsaved changes</string>
+    <string name="Edit_Dialog_confirm_exit">Your changes have not been saved. Would you like to save before exiting?</string>
+    <string name="action_exit_without_saving">EXIT WITHOUT SAVING</string>
+    <string name="incorrect_pattern">Incorrect Pattern</string>
+    <string name="Snackbar_Submit_Files_Error">To submit a report, please type in a title and attach a file.</string>
+    <string name="incorrect_pin">Incorrect Pin.
 
 </string>
-  <string name="incorrect_password">Incorrect Password. 
+    <string name="incorrect_password">Incorrect Password.
 
 </string>
-  <string name="attempts_remaining_singular">You have 1 attempt remaining until
+    <string name="attempts_remaining_singular">You have 1 attempt remaining until
  everything in your Tella is deleted.</string>
-  <string name="attempts_remaining_plural">You have %1$d attempts remaining until
+    <string name="attempts_remaining_plural">You have %1$d attempts remaining until
  everything in your Tella is deleted.</string>
-  <string name="exceeded_max_attempts">You have exceeded the maximum number of
+    <string name="exceeded_max_attempts">You have exceeded the maximum number of
  incorrect login attempts. All your Tella data
  has been deleted.</string>
-  <string name="Settings_General_TextJustificationTitle">Text justification</string>
-  <string name="Settings_General_TextJustificationExpl">Align longer sections of text to the left and right margins for a neater look. If disabled, text will be left- or right-aligned to increase accessibility.</string>
-  <string name="Settings_General_TextSpacingTitle">Increase text spacing</string>
-  <string name="Settings_General_TextSpacingExpl">Increase line spacing to 150% and paragraph spacing to 225%.</string>
-  <string name="Settings_General_BottomSheetRefreshWarningTitle">Tella will now refresh</string>
-  <string name="Settings_General_BottomSheetRefreshWarningText">You will return to the previous screen in a few seconds.</string>
-  <string name="settings.feedback_enable_sharing">Enable feedback sharing</string>
-  <string name="settings.feedback_warning">WARNING: using this feature may reveal to someone observing the network that you use Tella. Only use if you feel comfortable with this risk.</string>
-  <string name="feedback_msg">Tell us if you are experiencing a bug, have a request for a new feature, or have any other feedback.
+    <string name="Settings_General_TextJustificationTitle">Text justification</string>
+    <string name="Settings_General_TextJustificationExpl">Align longer sections of text to the left and right margins for a neater look. If disabled, text will be left- or right-aligned to increase accessibility.</string>
+    <string name="Settings_General_TextSpacingTitle">Increase text spacing</string>
+    <string name="Settings_General_TextSpacingExpl">Increase line spacing to 150% and paragraph spacing to 225%.</string>
+    <string name="Settings_General_BottomSheetRefreshWarningTitle">Tella will now refresh</string>
+    <string name="Settings_General_BottomSheetRefreshWarningText">You will return to the previous screen in a few seconds.</string>
+    <string name="settings.feedback_enable_sharing">Enable feedback sharing</string>
+    <string name="settings.feedback_warning">WARNING: using this feature may reveal to someone observing the network that you use Tella. Only use if you feel comfortable with this risk.</string>
+    <string name="feedback_msg">Tell us if you are experiencing a bug, have a request for a new feature, or have any other feedback.
  This feedback is anonymous, so make sure to include contact information if you want a response from us.</string>
-  <string name="thanks_for_your_feedback">Thanks for your feedback!</string>
-  <string name="save_draft">Save draft?</string>
-  <string name="description_submit_feedback">You can come back anytime to submit your feedback.</string>
-  <string name="feedback">Feedback</string>
-  <string name="not_internet_msg">You are not connected to the internet. Your feedback will be sent automatically when you are connected.
+    <string name="thanks_for_your_feedback">Thanks for your feedback!</string>
+    <string name="save_draft">Save draft?</string>
+    <string name="description_submit_feedback">You can come back anytime to submit your feedback.</string>
+    <string name="feedback">Feedback</string>
+    <string name="not_internet_msg">You are not connected to the internet. Your feedback will be sent automatically when you are connected.
 </string>
-  <string name="feedback_title">Feedback</string>
-  <string name="feedback_sent_msg">Your feedback has been sent</string>
-  <string name="share_feedback_action">share feedback</string>
-  <string name="Forms_NoOutboxForms">Your Outbox is currently empty. Forms that are ready to send will appear here.</string>
-  <string name="Forms_NoDraftForms">You have no draft forms.</string>
-  <string name="Forms_BlankSubheadingFormsOnServers">Forms available on server</string>
-  <string name="Forms_BlankSubheadingDownloadedForms">These are empty forms you can fill out.</string>
-  <string name="background_activities">Background activities</string>
-  <string name="current_background_activities">These are the activities currently ongoing in the background.</string>
-  <string name="file_encryption_in_progress">File encryption in progress</string>
-  <string name="no_background_activity">There are currently no ongoing activities in the background.</string>
-  <string name="encryption_in_progress">File encryption in progress</string>
-  <string name="encryption_exit_prompt">There are files being encrypted in the background. Do you want to exit and lose the files?</string>
-  <string name="exit_discard_files">Exit and discard files</string>
-  <string name="exit_and_discard_files">Exit and discard files</string>
-  <string name="files_being_encrypted_message">There are files being encrypted in the background. Do you want to exit and lose the files?</string>
-  <string name="Home_BottomNav_Resources">Resources</string>
-  <string name="Resources_DownloadedTitle">Downloaded</string>
-  <string name="Resources_DownloadedEmptyMessage">You have not downloaded any resources. Tap on the “download” icon next to each resource below to get started.</string>
-  <string name="Resources_DownloadedEmptyMessage_NoAvailable">You have not downloaded any resources.</string>
-  <string name="Resources_AvailableTitle">Available for download</string>
-  <string name="Resources_AvailableInfoMessage">These are the resources available for download from your Tella Web project(s). </string>
-  <string name="Resources_AvailableEmptyMessage">There are no resources available for download from your Tella Web project(s).</string>
-  <string name="Resources_RemoveFromDownloads">Remove from downloads</string>
-  <string name="Resources_RemovedResource">\"%s\" has been removed from your downloads.</string>
-  <string name="Resources_DialogTitle_StopDownload">Stop download and exit?</string>
-  <string name="Resources_DialogMsg_StopDownload">Your download progress will be lost. You can always come back later to download the resource again.</string>
-  <string name="Resources_KeepDownloading">KEEP DOWNLOADING</string>
-  <string name="Resources_Exit">EXIT</string>
-  <string name="Error_DownloadFailed">Error: Download failed</string>
-  <string name="exit_and_discard_verification_info">Exit and discard verification information</string>
-  <string name="recording_in_progress_exit_warning">Tella is still recording information about your device and location. If you exit, your file will not be verifiable.</string>
-  <string name="exit_and_discard_info">EXIT AND DISCARD INFORMATION</string>
-  <string name="back">BACK</string>
-  <string name="encrypting">Encrypting </string>
-  <string name="Sensitive_Chnage_Title">⚠️ Sensitive changes in next release</string>
-  <string name="Sensitive_Chnage_Description">The next version of Tella (to be released on 15 July 2024) will include major technical improvements. These changes carry a small risk that some files are lost when updating to the new version.
+    <string name="feedback_title">Feedback</string>
+    <string name="feedback_sent_msg">Your feedback has been sent</string>
+    <string name="share_feedback_action">share feedback</string>
+    <string name="Forms_NoOutboxForms">Your Outbox is currently empty. Forms that are ready to send will appear here.</string>
+    <string name="Forms_NoDraftForms">You have no draft forms.</string>
+    <string name="Forms_BlankSubheadingFormsOnServers">Forms available on server</string>
+    <string name="Forms_BlankSubheadingDownloadedForms">These are empty forms you can fill out.</string>
+    <string name="background_activities">Background activities</string>
+    <string name="current_background_activities">These are the activities currently ongoing in the background.</string>
+    <string name="file_encryption_in_progress">File encryption in progress</string>
+    <string name="no_background_activity">There are currently no ongoing activities in the background.</string>
+    <string name="encryption_in_progress">File encryption in progress</string>
+    <string name="encryption_exit_prompt">There are files being encrypted in the background. Do you want to exit and lose the files?</string>
+    <string name="exit_discard_files">Exit and discard files</string>
+    <string name="exit_and_discard_files">Exit and discard files</string>
+    <string name="files_being_encrypted_message">There are files being encrypted in the background. Do you want to exit and lose the files?</string>
+    <string name="Home_BottomNav_Resources">Resources</string>
+    <string name="Resources_DownloadedTitle">Downloaded</string>
+    <string name="Resources_DownloadedEmptyMessage">You have not downloaded any resources. Tap on the “download” icon next to each resource below to get started.</string>
+    <string name="Resources_DownloadedEmptyMessage_NoAvailable">You have not downloaded any resources.</string>
+    <string name="Resources_AvailableTitle">Available for download</string>
+    <string name="Resources_AvailableInfoMessage">These are the resources available for download from your Tella Web project(s). </string>
+    <string name="Resources_AvailableEmptyMessage">There are no resources available for download from your Tella Web project(s).</string>
+    <string name="Resources_RemoveFromDownloads">Remove from downloads</string>
+    <string name="Resources_RemovedResource">\"%s\" has been removed from your downloads.</string>
+    <string name="Resources_DialogTitle_StopDownload">Stop download and exit?</string>
+    <string name="Resources_DialogMsg_StopDownload">Your download progress will be lost. You can always come back later to download the resource again.</string>
+    <string name="Resources_KeepDownloading">KEEP DOWNLOADING</string>
+    <string name="Resources_Exit">EXIT</string>
+    <string name="Error_DownloadFailed">Error: Download failed</string>
+    <string name="exit_and_discard_verification_info">Exit and discard verification information</string>
+    <string name="recording_in_progress_exit_warning">Tella is still recording information about your device and location. If you exit, your file will not be verifiable.</string>
+    <string name="exit_and_discard_info">EXIT AND DISCARD INFORMATION</string>
+    <string name="back">BACK</string>
+    <string name="encrypting">Encrypting </string>
+    <string name="Sensitive_Chnage_Title">⚠️ Sensitive changes in next release</string>
+    <string name="Sensitive_Chnage_Description">The next version of Tella (to be released on 15 July 2024) will include major technical improvements. These changes carry a small risk that some files are lost when updating to the new version.
 
  If you store sensitive files in Tella, we advise you to copy them to a safe place outside of Tella before the update.
 
  Tap ‘Learn More’ below for more information on the upcoming changes and guidance on how to export all files from Tella.</string>
-  <string name="Learn_More">LEARN MORE</string>
-  <string name="Home_BottomNav_Settings" translatable="false">Settings</string>
-  <plurals name="Uwazi_RelationShipWidget_EntitiesAttached">
-    <item quantity="one">%1$d entity selected</item>
-    <item quantity="other">%1$d entities selected</item>
-  </plurals>
-  <string name="Uwazi_RelationShipWidget_Select_Entities">Select the entities you want to connect to this property.</string>
-  <string name="Analytics_contribute_reminder_title">You are sharing data</string>
-  <string name="Analytics_contribute_reminder_description">Reminder: You are currently sharing your app’s analytics to improve Tella. Stop sharing anytime by going to Settings.</string>
-  <string name="Analytics_contribute_more_info">For more information on how we collect data,  </string>
-  <string name="Analytics_contribute_more_info2"> visit this page.</string>
-  <string name="Analytics_contribute_title">Would you like to contribute?</string>
-  <string name="Analytics_contribute_description">You can opt out anytime by going to Settings.</string>
-  <string name="Analytics_contribute_info_link">For more information on how we collect data, visit this page.</string>
-  <string name="Analytics_how_works_title">How it works</string>
-  <string name="Analytics_how_works_description">• We use DivviUp, a privacy-respecting system for analytics.
+    <string name="Learn_More">LEARN MORE</string>
+    <string name="Home_BottomNav_Settings" translatable="false">Settings</string>
+    <plurals name="Uwazi_RelationShipWidget_EntitiesAttached">
+        <item quantity="one">%1$d entity selected</item>
+        <item quantity="other">%1$d entities selected</item>
+    </plurals>
+    <string name="Uwazi_RelationShipWidget_Select_Entities">Select the entities you want to connect to this property.</string>
+    <string name="Analytics_contribute_reminder_title">You are sharing data</string>
+    <string name="Analytics_contribute_reminder_description">Reminder: You are currently sharing your app’s analytics to improve Tella. Stop sharing anytime by going to Settings.</string>
+    <string name="Analytics_contribute_more_info">For more information on how we collect data,  </string>
+    <string name="Analytics_contribute_more_info2"> visit this page.</string>
+    <string name="Analytics_contribute_title">Would you like to contribute?</string>
+    <string name="Analytics_contribute_description">You can opt out anytime by going to Settings.</string>
+    <string name="Analytics_contribute_info_link">For more information on how we collect data, visit this page.</string>
+    <string name="Analytics_how_works_title">How it works</string>
+    <string name="Analytics_how_works_description">• We use DivviUp, a privacy-respecting system for analytics.
 • We collect as little data as possible.
 • All data is anonymous and can never be linked to you.</string>
-  <string name="Analytics_questions_title">Specific questions</string>
-  <string name="Analytics_questions_description">Each study collects data about specific questions. Here’s a sample:</string>
-  <string name="Analytics_questions_examples">🔓 Opened Tella 4 times a week
+    <string name="Analytics_questions_title">Specific questions</string>
+    <string name="Analytics_questions_description">Each study collects data about specific questions. Here’s a sample:</string>
+    <string name="Analytics_questions_examples">🔓 Opened Tella 4 times a week
 💾  32 files stored in Tella
 📖  Spanish language selected
 ⚡  1 server connected
 😎 Calculator camouflage enabled</string>
-  <string name="Analytics_share_data_title">Share your data to improve Tella</string>
-  <string name="Analytics_share_data_description">By joining this study, you would help us understand which features are important to you and how you use the app.</string>
-  <string name="Analytics_respect_privacy_title">We respect your privacy</string>
-  <string name="Analytics_respect_privacy_description">• We will not access any of the files that you store in Tella or share with your organization.
+    <string name="Analytics_share_data_title">Share your data to improve Tella</string>
+    <string name="Analytics_share_data_description">By joining this study, you would help us understand which features are important to you and how you use the app.</string>
+    <string name="Analytics_respect_privacy_title">We respect your privacy</string>
+    <string name="Analytics_respect_privacy_description">• We will not access any of the files that you store in Tella or share with your organization.
 • We will <b>never</b> share your data or sell it to anyone.</string>
-  <string name="Analytics_banner_title">Share analytics to improve Tella</string>
-  <string name="Analytics_banner_improve_description">Help us understand how you use Tella. All data is anonymous and can never be linked to you.
+    <string name="Analytics_banner_title">Share analytics to improve Tella</string>
+    <string name="Analytics_banner_improve_description">Help us understand how you use Tella. All data is anonymous and can never be linked to you.
 
 Would you like to share analytics with the Tella team?</string>
-  <string name="Settings_Analytics_switch_title">Share data to improve Tella</string>
-  <string name="Settings_Analytics_switch_expl">Help us understand how you use Tella. Your data can never be linked to you.</string>
-  <string name="select_entities">Select entities</string>
-  <string name="search_for_or_select_the_entities_you_want_to_connect_to_this_property">Search for or select the entities you want to connect to this property.</string>
-  <string name="add_more_entities">Add more entities</string>
-  <string name="on_select_entities_clicked_tag" translatable="false">onSelectEntitiesClicked</string>
-  <string name="could_not_find_uwazientryfragment" translatable="false">Could not find UwaziEntryFragment</string>
-  <string name="Settings_Analytics_turn_on_dialog"> You have signed up to share analytics. You can always change this in Settings.</string>
-  <string name="Settings_Analytics_turn_off_dialog">You will not longer be sharing analytics. You can always change this in Settings.</string>
-  <string name="Migration_Failed_Title" translatable="false">Migration Failed\"</string>
-  <string name="Migration_Failed_Description" translatable="false">The database migration failed. If you have a backup of your files, please reinstall Tella and re-import your files into Tella. If you don\'t have a backup and you lost your files, do not delete Tella and contact us: contact@tella-app.org</string>
-  <string name="unlock">Unlock</string>
-  <string name="Onboard_Collect_Data">Collect data</string>
-  <string name="Onboard_Collect_Data_Exp">If you work with an organization, send
+    <string name="Settings_Analytics_switch_title">Share data to improve Tella</string>
+    <string name="Settings_Analytics_switch_expl">Help us understand how you use Tella. Your data can never be linked to you.</string>
+    <string name="select_entities">Select entities</string>
+    <string name="search_for_or_select_the_entities_you_want_to_connect_to_this_property">Search for or select the entities you want to connect to this property.</string>
+    <string name="add_more_entities">Add more entities</string>
+    <string name="on_select_entities_clicked_tag" translatable="false">onSelectEntitiesClicked</string>
+    <string name="could_not_find_uwazientryfragment" translatable="false">Could not find UwaziEntryFragment</string>
+    <string name="Settings_Analytics_turn_on_dialog"> You have signed up to share analytics. You can always change this in Settings.</string>
+    <string name="Settings_Analytics_turn_off_dialog">You will not longer be sharing analytics. You can always change this in Settings.</string>
+    <string name="Migration_Failed_Title" translatable="false">Migration Failed\"</string>
+    <string name="Migration_Failed_Description" translatable="false">The database migration failed. If you have a backup of your files, please reinstall Tella and re-import your files into Tella. If you don\'t have a backup and you lost your files, do not delete Tella and contact us: contact@tella-app.org</string>
+    <string name="unlock">Unlock</string>
+    <string name="Onboard_Collect_Data">Collect data</string>
+    <string name="Onboard_Collect_Data_Exp">If you work with an organization, send
  forms, reports, and files directly from Tella
  to your organization.</string>
-  <string name="action_flip_vertically">Flip vertically</string>
-  <string name="action_flip_horizontally">Flip horizontally</string>
-  <string name="settings.docu_add.server_dialog.select_tella_google_drive" translatable="false">Google drive</string>
-  <string name="create_new_folder">CREATE NEW FOLDER</string>
-  <string name="use_shared_drive">USE SHARED DRIVE</string>
-  <string name="go_to_google_drive">GO TO GOOGLE DRIVE</string>
-  <string name="select_google_drive">Select Google drive</string>
-  <string name="google_drive" translatable="false">Google Drive
+    <string name="action_flip_vertically">Flip vertically</string>
+    <string name="action_flip_horizontally">Flip horizontally</string>
+    <string name="settings.docu_add.server_dialog.select_tella_google_drive" translatable="false">Google drive</string>
+    <string name="create_new_folder">CREATE NEW FOLDER</string>
+    <string name="use_shared_drive">USE SHARED DRIVE</string>
+    <string name="go_to_google_drive">GO TO GOOGLE DRIVE</string>
+    <string name="select_google_drive">Select Google drive</string>
+    <string name="google_drive" translatable="false">Google Drive
 </string>
-  <string name="learn_more_about_the_types_of_drives">Learn more about the types of drives.</string>
-  <string name="description_google_drive">You can either connect to an organizational Shared Drive or create a new folder in your personal Drive.</string>
-  <string name="select_a_drive_to_connect">Select a Drive to connect to</string>
-  <string name="gdrive_documentation_url" translatable="false">https://tella-app.org/g-drive/</string>
-  <string name="settings_add.server.selection_dialog.title">What type of server would you like to connect to?</string>
-  <string name="unavailable_connections">Unavailable connections</string>
-  <string name="unavailable_connections_desc">For the following categories, only one connection can be
+    <string name="learn_more_about_the_types_of_drives">Learn more about the types of drives.</string>
+    <string name="description_google_drive">You can either connect to an organizational Shared Drive or create a new folder in your personal Drive.</string>
+    <string name="select_a_drive_to_connect">Select a Drive to connect to</string>
+    <string name="gdrive_documentation_url" translatable="false">https://tella-app.org/g-drive/</string>
+    <string name="settings_add.server.selection_dialog.title">What type of server would you like to connect to?</string>
+    <string name="unavailable_connections">Unavailable connections</string>
+    <string name="unavailable_connections_desc">For the following categories, only one connection can be
  enabled at a time. To add a new connection, please delete
  the current one by going to Connections Settings. </string>
-  <string name="no_permission_to_folder_google_drive">You do not have permission to upload to this folder.</string>
-  <string name="settings.servers.title_server.settings2">Connections</string>
-  <string name="settings.servers.add_server.expl2">If you work with an organization, connect to its
+    <string name="no_permission_to_folder_google_drive">You do not have permission to upload to this folder.</string>
+    <string name="settings.servers.title_server.settings2">Connections</string>
+    <string name="settings.servers.add_server.expl2">If you work with an organization, connect to its
  server to send files and data. Your organization
  should provide you with the server details. </string>
-  <string name="settings.docu_add.server_dialog.select_tella_dropbox" translatable="false">Dropbox</string>
-  <string name="go_to_dropbox">GO TO DROPBOX</string>
-  <string name="dropbox" translatable="false">Dropbox</string>
-  <string name="Drafts_Header_Message">These are reports you are working on.</string>
-  <string name="Outboxes_Header_Message">These reports are ready to be submitted</string>
-  <string name="Submitted_Header_Message">These are reports that you have successfully submitted.</string>
-  <string name="Connections_description">Learn more about connections here. If you
+    <string name="settings.docu_add.server_dialog.select_tella_dropbox" translatable="false">Dropbox</string>
+    <string name="go_to_dropbox">GO TO DROPBOX</string>
+    <string name="dropbox" translatable="false">Dropbox</string>
+    <string name="Drafts_Header_Message">These are reports you are working on.</string>
+    <string name="Outboxes_Header_Message">These reports are ready to be submitted</string>
+    <string name="Submitted_Header_Message">These are reports that you have successfully submitted.</string>
+    <string name="Connections_description">Learn more about connections here. If you
  work with an organization, you can ask them
  about which connection to use.</string>
-  <string name="Connections_description_selection">Learn more about connections here.</string>
-  <string name="settings.docu_add.server_dialog.select_next_cloud">Nextcloud</string>
-  <string name="NextCloud">Nextcloud</string>
-  <string name="NextCloud_Create_New_Folder">Create new folder</string>
-  <string name="NextCloud_Create_New_Folder_Description">Your reports will be uploaded to a new
+    <string name="Connections_description_selection">Learn more about connections here.</string>
+    <string name="settings.docu_add.server_dialog.select_next_cloud">Nextcloud</string>
+    <string name="NextCloud">Nextcloud</string>
+    <string name="NextCloud_Create_New_Folder">Create new folder</string>
+    <string name="NextCloud_Create_New_Folder_Description">Your reports will be uploaded to a new
  folder on your Nextcloud. Choose a name
  for this folder here.</string>
-  <string name="NextCloud_Folder_Name">Folder name</string>
-  <string name="Error_Connecting_To_Server_Msg">Error connecting to server. Please try again.</string>
-  <string name="ssl_validator_reason_cert_not_trusted" translatable="false">- The server certificate is not trusted</string>
-  <string name="ssl_validator_reason_cert_expired" translatable="false">- The server certificate expired</string>
-  <string name="ssl_validator_reason_cert_not_yet_valid" translatable="false">- The server certificate valid dates are in the future</string>
-  <string name="ssl_validator_reason_hostname_not_verified" translatable="false">- The URL does not match the hostname in the certificate</string>
-  <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
-  <string name="ssl_validator_not_saved" translatable="false">Could not save certificate</string>
-  <string name="ssl_validator_btn_details_see" translatable="false">Details</string>
-  <string name="ssl_validator_btn_details_hide" translatable="false">Hide</string>
-  <string name="ssl_validator_label_subject" translatable="false">Issued to:</string>
-  <string name="ssl_validator_label_issuer" translatable="false">Issued by:</string>
-  <string name="ssl_validator_label_CN" translatable="false">Common name:</string>
-  <string name="ssl_validator_label_O" translatable="false">Organization:</string>
-  <string name="ssl_validator_label_OU" translatable="false">Organizational unit:</string>
-  <string name="ssl_validator_label_C" translatable="false">Country:</string>
-  <string name="ssl_validator_label_ST" translatable="false">State:</string>
-  <string name="ssl_validator_label_L" translatable="false">Location:</string>
-  <string name="ssl_validator_label_validity" translatable="false">Validity:</string>
-  <string name="ssl_validator_label_validity_from" translatable="false">From:</string>
-  <string name="ssl_validator_label_validity_to" translatable="false">To:</string>
-  <string name="ssl_validator_label_signature" translatable="false">Signature:</string>
-  <string name="ssl_validator_label_signature_algorithm" translatable="false">Algorithm:</string>
-  <string name="digest_algorithm_not_available" translatable="false">This digest algorithm is not available on your phone.</string>
-  <string name="ssl_validator_label_certificate_fingerprint" translatable="false">Fingerprint:</string>
-  <string name="certificate_load_problem" translatable="false">There is a problem loading the certificate.</string>
-  <string name="ssl_validator_null_cert" translatable="false">The certificate could not be shown.</string>
-  <string name="ssl_validator_no_info_about_error" translatable="false">- No information about the error</string>
-  <string name="ssl_validator_header" translatable="false">The identity of the server could not be verified</string>
-  <string name="login_data_own_scheme" translatable="false">nc</string>
-  <string name="anonymous_account_type" translatable="false">AnonymousAccountType</string>
-  <string name="auth_unsupported_multiaccount" translatable="false">%1$s does not support multiple accounts</string>
-  <string name="go_to_nextcloud">Go to Nextcloud</string>
-  <string name="google_drive_create_folder_description">Your reports will be uploaded to a new folder on your Google Drive. Choose a name for this folder here.</string>
-  <string name="folder_name">Folder name</string>
-  <string name="Folder_Empty_Error">Folder name cannot be empty</string>
-  <string name="file_name_taken">File name taken. Please use a different one.</string>
-  <string name="folder_exist_error">Folder name is already taken. Please use a different one.</string>
-  <string name="nextcloud_file_size_limit">For the moment, only files smaller than 20MB can be submitted to the Nextcloud server.</string>
-  <string name="invalid_url">Invalid URL</string>
-  <string name="delete_report">Delete report?</string>
-  <string name="report_submitted_msg">Your report has successfully been submitted.</string>
-  <string name="Collect_MediaWidget_Attach_File">Attach file</string>
-  <string name="form_successfully_submitted">%1$s successfully submitted</string>
+    <string name="NextCloud_Folder_Name">Folder name</string>
+    <string name="Error_Connecting_To_Server_Msg">Error connecting to server. Please try again.</string>
+    <string name="ssl_validator_reason_cert_not_trusted" translatable="false">- The server certificate is not trusted</string>
+    <string name="ssl_validator_reason_cert_expired" translatable="false">- The server certificate expired</string>
+    <string name="ssl_validator_reason_cert_not_yet_valid" translatable="false">- The server certificate valid dates are in the future</string>
+    <string name="ssl_validator_reason_hostname_not_verified" translatable="false">- The URL does not match the hostname in the certificate</string>
+    <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
+    <string name="ssl_validator_not_saved" translatable="false">Could not save certificate</string>
+    <string name="ssl_validator_btn_details_see" translatable="false">Details</string>
+    <string name="ssl_validator_btn_details_hide" translatable="false">Hide</string>
+    <string name="ssl_validator_label_subject" translatable="false">Issued to:</string>
+    <string name="ssl_validator_label_issuer" translatable="false">Issued by:</string>
+    <string name="ssl_validator_label_CN" translatable="false">Common name:</string>
+    <string name="ssl_validator_label_O" translatable="false">Organization:</string>
+    <string name="ssl_validator_label_OU" translatable="false">Organizational unit:</string>
+    <string name="ssl_validator_label_C" translatable="false">Country:</string>
+    <string name="ssl_validator_label_ST" translatable="false">State:</string>
+    <string name="ssl_validator_label_L" translatable="false">Location:</string>
+    <string name="ssl_validator_label_validity" translatable="false">Validity:</string>
+    <string name="ssl_validator_label_validity_from" translatable="false">From:</string>
+    <string name="ssl_validator_label_validity_to" translatable="false">To:</string>
+    <string name="ssl_validator_label_signature" translatable="false">Signature:</string>
+    <string name="ssl_validator_label_signature_algorithm" translatable="false">Algorithm:</string>
+    <string name="digest_algorithm_not_available" translatable="false">This digest algorithm is not available on your phone.</string>
+    <string name="ssl_validator_label_certificate_fingerprint" translatable="false">Fingerprint:</string>
+    <string name="certificate_load_problem" translatable="false">There is a problem loading the certificate.</string>
+    <string name="ssl_validator_null_cert" translatable="false">The certificate could not be shown.</string>
+    <string name="ssl_validator_no_info_about_error" translatable="false">- No information about the error</string>
+    <string name="ssl_validator_header" translatable="false">The identity of the server could not be verified</string>
+    <string name="login_data_own_scheme" translatable="false">nc</string>
+    <string name="anonymous_account_type" translatable="false">AnonymousAccountType</string>
+    <string name="auth_unsupported_multiaccount" translatable="false">%1$s does not support multiple accounts</string>
+    <string name="go_to_nextcloud">Go to Nextcloud</string>
+    <string name="google_drive_create_folder_description">Your reports will be uploaded to a new folder on your Google Drive. Choose a name for this folder here.</string>
+    <string name="folder_name">Folder name</string>
+    <string name="Folder_Empty_Error">Folder name cannot be empty</string>
+    <string name="file_name_taken">File name taken. Please use a different one.</string>
+    <string name="folder_exist_error">Folder name is already taken. Please use a different one.</string>
+    <string name="nextcloud_file_size_limit">For the moment, only files smaller than 20MB can be submitted to the Nextcloud server.</string>
+    <string name="invalid_url">Invalid URL</string>
+    <string name="delete_report">Delete report?</string>
+    <string name="report_submitted_msg">Your report has successfully been submitted.</string>
+    <string name="Collect_MediaWidget_Attach_File">Attach file</string>
+    <string name="form_successfully_submitted">%1$s successfully submitted</string>
     <string name="connect_to_device">Connect to device</string>
-  <string name="qr_code_sender_instruction">Show this QR code for the\n sender to scan</string>
-  <string name="qr_code_scan_instruction">Scan the recipient’s QR code</string>
-  <string name="qr_code_issue_prompt">Having trouble with the QR code?</string>
-  <string name="connect_manually">Connect manually</string>
-  <string name="show_device_information">Show your device information </string>
-  <string name="device_connection_instructions">The sender needs to input the following to\n connect to your device.</string>
-  <string name="connect_code">Connect code</string>
-  <string name="pin">PIN</string>
-  <string name="port">Port</string>
-  <string name="verification">Verification</string>
-  <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
-  <string name="sequence_mismatch_warning">If the sequence on your device does not match the sequence on the sender’s device, the connection may not be secure and should be discarded.</string>
-  <string name="confirm_and_connect">Confirm and connect</string>
-  <string name="wifi">Wi-Fi</string>
-  <string name="get_connected">Get connected</string>
-  <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
-  <string name="tips_to_connect_title">Tips to connect</string>
-  <string name="tips_to_connect_body">
+    <string name="qr_code_sender_instruction">Show this QR code for the\n sender to scan</string>
+    <string name="qr_code_scan_instruction">Scan the recipient’s QR code</string>
+    <string name="qr_code_issue_prompt">Having trouble with the QR code?</string>
+    <string name="connect_manually">Connect manually</string>
+    <string name="show_device_information">Show your device information </string>
+    <string name="device_connection_instructions">The sender needs to input the following to\n connect to your device.</string>
+    <string name="connect_code">Connect code</string>
+    <string name="pin">PIN</string>
+    <string name="port">Port</string>
+    <string name="verification">Verification</string>
+    <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
+    <string name="sequence_mismatch_warning">If the sequence on your device does not match the sequence on the sender’s device, the connection may not be secure and should be discarded.</string>
+    <string name="confirm_and_connect">Confirm and connect</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="get_connected">Get connected</string>
+    <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
+    <string name="tips_to_connect_title">Tips to connect</string>
+    <string name="tips_to_connect_body">
     1. The Wi-Fi network does not need to be connected to the internet.\n
     2. You can create your own Wi-Fi network using your phone’s hotspot feature.\n
     3. Disable any VPN connections.
 </string>
 
-  <string name="current_wifi_network">Current Wifi network</string>
-  <string name="same_wifi_text">Yes, we are on the same Wi-Fi network</string>
+    <string name="current_wifi_network">Current Wifi network</string>
+    <string name="same_wifi_text">Yes, we are on the same Wi-Fi network</string>
     <string name="NearBySharing">Nearby sharing</string>
-  <string name="share_files_description">
+    <string name="share_files_description">
     Share files with nearby devices without an Internet connection\n  1. Both devices must be connected to the same Wifi network\n  2. Make sure you trust the person you are sharing files with
 </string>
-  <string name="send_files">Send files</string>
-  <string name="receive_files">Receive files</string>
-  <string name="learn_more_about_nearby_sharing">Learn more about nearby sharing</string>
-  <string name="nearby_sharing">Nearby sharing</string>
-  <string name="how_it_works">How it works</string>
-  <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
-  <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
-  <string name="make_sure_sequence_matches">Make sure that this sequence matches what is shown on the sender’s device.</string>
-  <string name="make_sure_sequence_matches_recipient">Make sure that this sequence matches what is shown on the recipient’s device.</string>
-  <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
-  <string name="discard_and_start_over">Discard and start over</string>
+    <string name="send_files">Send files</string>
+    <string name="receive_files">Receive files</string>
+    <string name="learn_more_about_nearby_sharing">Learn more about nearby sharing</string>
+    <string name="nearby_sharing">Nearby sharing</string>
+    <string name="how_it_works">How it works</string>
+    <string name="peerToPeer_documentation_url" translatable="false">https://tella-app.org/nearby-sharing/</string>
+    <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
+    <string name="make_sure_sequence_matches">Make sure that this sequence matches what is shown on the sender’s device.</string>
+    <string name="make_sure_sequence_matches_recipient">Make sure that this sequence matches what is shown on the recipient’s device.</string>
+    <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
+    <string name="discard_and_start_over">Discard and start over</string>
     <string name="waiting_for_the_sender_to_share_files">Waiting for the sender to share files</string>
-  <string name="prepare_upload_message">The sender is trying to send you %1$d files</string>
-  <string name="waiting_for_the_recipient_to_accept_files">Waiting for the recipient to accept files</string>
-  <string name="accept">ACCEPT</string>
-  <string name="reject">REJECT</string>
-  <string name="exit_nearby_sharing">Exit nearby sharing?</string>
-  <string name="your_progress_will_be_lost">Your progress will be lost.</string>
-  <string name="ip_address">IP address</string>
-  <string name="sender_files_rejected">Sender\'s files rejected.</string>
-  <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
-  <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
-  <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
-  <string name="sending_files">Sending files</string>
-  <string name="send_files_title">Send files</string>
-  <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
-  <string name="failed_to_open_location_settings">Failed to open location settings.</string>
-  <string name="try_again">Try again</string>
-  <string name="stop_sharing_files">Stop sharing files?</string>
-  <string name="nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred">Nearby sharing will be stopped. The recipient will not have access to files that were not fully transferred.</string>
-  <string name="stop">stop</string>
-  <string name="success_title">Success</string>
-  <string name="failure_title">Something went wrong</string>
+    <string name="prepare_upload_message">The sender is trying to send you %1$d files</string>
+    <string name="waiting_for_the_recipient_to_accept_files">Waiting for the recipient to accept files</string>
+    <string name="accept">ACCEPT</string>
+    <string name="reject">REJECT</string>
+    <string name="exit_nearby_sharing">Exit nearby sharing?</string>
+    <string name="your_progress_will_be_lost">Your progress will be lost.</string>
+    <string name="ip_address">IP address</string>
+    <string name="sender_files_rejected">Sender\'s files rejected.</string>
+    <string name="the_receiver_accepted_the_files_transfer">"The receiver accepted the files transfer "</string>
+    <string name="recipient_rejected_the_files">Recipient rejected the files.</string>
+    <string name="receiving_and_encrypting_files">Receiving and encrypting files</string>
+    <string name="sending_files">Sending files</string>
+    <string name="send_files_title">Send files</string>
+    <string name="location_permission_is_required_to_get_wifi_ssid">Location permission is required to get WiFi SSID.</string>
+    <string name="failed_to_open_location_settings">Failed to open location settings.</string>
+    <string name="try_again">Try again</string>
+    <string name="stop_sharing_files">Stop sharing files?</string>
+    <string name="nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred">Nearby sharing will be stopped. The recipient will not have access to files that were not fully transferred.</string>
+    <string name="stop">stop</string>
+    <string name="success_title">Success</string>
+    <string name="failure_title">Something went wrong</string>
 
-  <plurals name="success_file_received_from_sender">
-    <item quantity="one">You have successfully received %1$d file from the sender.</item>
-    <item quantity="other">You have successfully received %1$d files from the sender.</item>
-  </plurals>
+    <plurals name="success_file_received_from_sender">
+        <item quantity="one">You have successfully received %1$d file from the sender.</item>
+        <item quantity="other">You have successfully received %1$d files from the sender.</item>
+    </plurals>
 
-  <plurals name="success_file_sent_to_recipient">
-    <item quantity="one">You have successfully sent %1$d file to the recipient.</item>
-    <item quantity="other">You have successfully sent %1$d files to the recipient.</item>
-  </plurals>
+    <plurals name="success_file_sent_to_recipient">
+        <item quantity="one">You have successfully sent %1$d file to the recipient.</item>
+        <item quantity="other">You have successfully sent %1$d files to the recipient.</item>
+    </plurals>
 
-  <string name="partial_success_summary">Only %1$d files were received. %2$d files were not received.</string>
-  <plurals name="failure_file_received_expl">
-    <item quantity="one">0 files were received. %1$d file was not received.</item>
-    <item quantity="other">0 files were received. %1$d files were not received.</item>
-  </plurals>
+    <string name="partial_success_summary">Only %1$d files were received. %2$d files were not received.</string>
+    <plurals name="failure_file_received_expl">
+        <item quantity="one">0 files were received. %1$d file was not received.</item>
+        <item quantity="other">0 files were received. %1$d files were not received.</item>
+    </plurals>
 
-  <string name="view_files_action">View Files</string>
-  <string name="view_files">VIEW FILES</string>
-  <string name="result">Results</string>
+    <string name="view_files_action">View Files</string>
+    <string name="view_files">VIEW FILES</string>
+    <string name="result">Results</string>
+    <string name="hash_receipient_description">1. \tMake sure that this sequence matches what\n \t\t\tis shown on the sender’s device.\n
+2. \tThe sender needs to confirm the\n   \t\t\tconnection first. \n
+3.  \tAfter that, you will be able to confirm the\n \t\t\tconnection and start sharing files \n\n
+
+    If the sequence on your device does not match \nthe sequence on the sender’s device, the\n connection may not be secure and should be\n discarded.
+  </string>
+  <string name="waiting_for_the_sender">Waiting for sender …</string>
+  <string name="waiting_for_the_recipient">Waiting for recipient …</string>
+
+  <string name="hash_sender_description">
+1.\tMake sure that this sequence matches what\n \t\tis shown on the recipient’s device.\n2.\tYou need to confirm the connection first.\n3.\tAfter that, the recipient will be able to\n \t\tconfirm the connection and start receiving\n\t\tfiles.\n\nIf the sequence on your device does not match the sequence on the sender’s device,\nthe connection may not be secure and should be discarded.
+</string>
 
 </resources>
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/submission/SubmittingItem.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/submission/SubmittingItem.kt
index 228594d7a..100239fcc 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/submission/SubmittingItem.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/submission/SubmittingItem.kt
@@ -3,11 +3,13 @@ package org.hzontal.shared_ui.submission
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
-import android.os.Build
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.*
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ProgressBar
+import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
@@ -50,9 +52,7 @@ class SubmittingItem @JvmOverloads  constructor(
         partSize = findViewById(R.id.partSize)
         uploadProgress = findViewById(R.id.uploadProgress)
         partCheckIcon = findViewById(R.id.partCheckIcon)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            uploadProgress.progressTintList = ColorStateList.valueOf(Color.GREEN);
-        }
+        uploadProgress.progressTintList = ColorStateList.valueOf(Color.GREEN);
     }
 
     private fun extractAttributes(attrs: AttributeSet?, defStyleAttr: Int) {
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
index ccf292f82..f0a1849f2 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
@@ -48,7 +48,6 @@ class CollapsibleTextView @JvmOverloads constructor(
         }
     }
 
-
     private fun toggleText() {
         isExpanded = !isExpanded
         collapsibleText.visibility = if (isExpanded) View.VISIBLE else View.GONE

From b8613720250e7b309982796c13a5854407576c8e Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 22 Jul 2025 10:37:22 +0100
Subject: [PATCH 097/153] navigate from view files to attachments

---
 mobile/src/main/AndroidManifest.xml              |  1 +
 .../tella/mobile/util/NavigationManager.kt       |  1 -
 .../tella/mobile/views/activity/MainActivity.kt  | 16 ++++++++++++++++
 .../senderflow/PeerToPeerResultFragment.kt       |  9 ++++++++-
 .../senderflow/SenderVerificationFragment.kt     |  3 ---
 .../peertopeer/viewmodel/PeerToPeerViewModel.kt  |  3 ---
 .../main/res/navigation/peer_to_peer_graph.xml   | 12 ++++--------
 7 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index bdc0b94e2..47eaf1b53 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -503,6 +503,7 @@
 
         <activity
             android:name=".views.activity.MainActivity"
+            android:launchMode="singleTop"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 7eaca5738..2da9a9e9a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -238,7 +238,6 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_recipientSuccessFragment_to_recipientUploadFilesFragment)
     }
 
-
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
         navControllerProvider.navController.navigate(
             R.id.startNearBySharingFragment,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
index ec05290ac..d69d82c69 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/MainActivity.kt
@@ -15,6 +15,7 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
+import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -449,4 +450,19 @@ class MainActivity : MetadataActivity(), IMetadataAttachPresenterContract.IView,
                     .e(getString(R.string.could_not_find_uwazientryfragment))
         }
     }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        intent?.getStringExtra("navigateTo")?.let { destination ->
+            if (destination == "attachments_screen") {
+                // Avoid navigating if already on the screen
+                if (navController.currentDestination?.id != R.id.attachments_screen) {
+                    navController.navigate(R.id.attachments_screen)
+                }
+            }
+        }
+    }
+
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
index 38838976b..692b9426c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -1,5 +1,6 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
+import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.View
@@ -9,6 +10,7 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.databinding.FragmentPeerToPeerResultBinding
+import org.horizontal.tella.mobile.views.activity.MainActivity
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
@@ -61,7 +63,12 @@ class PeerToPeerResultFragment :
                 setText(getString(R.string.view_files_action))
                 visibility = View.VISIBLE
                 setOnClickListener {
-                    baseActivity.finish()
+                    val intent = Intent(requireContext(), MainActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+                        putExtra("navigateTo", "attachments_screen")
+                    }
+                    startActivity(intent)
+                    requireActivity().finish() // finish PeerToPeerActivity
                 }
             } else {
                 visibility = View.GONE
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index f06bb26c7..38c4961d6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -53,15 +53,12 @@ class SenderVerificationFragment :
     }
 
     private fun initObservers() {
-
         viewModel.isManualConnection = true
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 findNavController().currentBackStackEntry?.savedStateHandle
                     ?.set("registrationSuccess", true)
                 navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
-            } else {
-                //  handle error UI
             }
         }
         viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index a1f5fbca3..7b1c06e04 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -2,13 +2,11 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
 import android.content.Context
 import android.os.Build
-import android.os.Environment
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
-import com.hzontal.utils.MediaFile.isAudioFileType
 import com.hzontal.utils.MediaFile.isImageFileType
 import com.hzontal.utils.MediaFile.isVideoFileType
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -296,7 +294,6 @@ class PeerToPeerViewModel @Inject constructor(
                 }
             }
 
-            // ✅ Final session status
             p2PState.session?.status = SessionStatus.FINISHED
 
             _uploadProgress.postValue(
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 6f3ff107b..9b49f653d 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -92,7 +92,7 @@
         android:id="@+id/recipientUploadFilesFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientUploadFilesFragment"
         android:label="recipientUploadFilesFragment"
-        tools:layout="@layout/fragment_upload_files" >
+        tools:layout="@layout/fragment_upload_files">
         <action
             android:id="@+id/action_recipientUploadFilesFragment_to_peerToPeerResultFragment"
             app:destination="@id/peerToPeerResultFragment" />
@@ -126,11 +126,7 @@
             android:id="@+id/action_waitingReceiverFragment_to_recipientSuccessFragment"
             app:destination="@id/recipientSuccessFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/successConnectFragment"
-        android:name="org.horizontal.tella.mobile.views.dialog.uwazi.step6.SuccessConnectFragment"
-        android:label="SuccessConnectFragment"
-        tools:layout="@layout/fragment_success_connect_flow" />
+
     <fragment
         android:id="@+id/recipientSuccessFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow.RecipientSuccessFragment"
@@ -155,7 +151,7 @@
         android:id="@+id/uploadSenderFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.SenderUploadFilesFragment"
         android:label="UploadFilesFragment"
-        tools:layout="@layout/fragment_upload_files" >
+        tools:layout="@layout/fragment_upload_files">
         <action
             android:id="@+id/action_uploadSenderFragment_to_peerToPeerResultFragment"
             app:destination="@id/peerToPeerResultFragment" />
@@ -164,7 +160,7 @@
         android:id="@+id/peerToPeerResultFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerResultFragment"
         android:label="PeerToPeerResultFragment"
-        tools:layout="@layout/fragment_peer_to_peer_result"/>
+        tools:layout="@layout/fragment_peer_to_peer_result" />
 
 
 </navigation>
\ No newline at end of file

From 2fbb2a480244642812fd2eff029db1e98e77675b Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 22 Jul 2025 11:20:25 +0100
Subject: [PATCH 098/153] fix nearbysharing display

---
 .../mobile/views/fragment/vault/home/HomeVaultFragment.kt      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
index d7c26aac6..9149c6fd9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
@@ -738,12 +738,10 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
      * This function show connections when all the server types are counted.
      **/
     private fun maybeShowConnections() {
-        serversList?.add(ServerDataItem(ArrayList(), ServerType.PEERTOPEER))
         // If the serversList is not empty, check if it has changed
         if (serversList?.isEmpty() == false) {
             // Use the vaultAdapter to check existing connections
             vaultAdapter.addConnectionServers(serversList!!)
-
         } else {
             vaultAdapter.removeConnectionServers()
         }
@@ -757,6 +755,7 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
         handleTellaUploadServers(serverCounts.tellaUploadServers)
         handleCollectServers(serverCounts.collectServers)
         handleUwaziServers(serverCounts.uwaziServers)
+        serversList?.add(ServerDataItem(ArrayList(), ServerType.PEERTOPEER))
 
         // Check if we need to show connections
         maybeShowConnections()

From 26aac6b476e3dd9cac4885124e23b46a6f238cde Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 22 Jul 2025 17:19:30 +0100
Subject: [PATCH 099/153] fix navigation issue

---
 .../tella/mobile/util/Extensions.kt           | 21 +++++++++++++++++--
 .../layout/fragment_peer_to_peer_result.xml   |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
index 3e4cb8ba6..77efbfbc9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/Extensions.kt
@@ -12,6 +12,7 @@ import android.view.WindowManager
 import android.view.accessibility.AccessibilityManager
 import android.widget.ImageView
 import androidx.annotation.ColorRes
+import androidx.annotation.IdRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import androidx.navigation.NavController
@@ -131,8 +132,24 @@ fun Context.isScreenReaderOn(): Boolean {
     return false
 }
 
-fun NavController.navigateSafe(destinationId: Int, bundle: Bundle? = null) {
-    navigate(destinationId, bundle)
+fun NavController.navigateSafe(@IdRes destinationId: Int, args: Bundle? = null) {
+    val currentNode = currentDestination
+    val action = currentNode?.getAction(destinationId)
+
+    if (action != null) {
+        navigate(destinationId, args)
+    } else {
+        val resources = currentNode?.navigatorName?.let {
+            context.resources
+        }
+
+        val destName = try {
+            resources?.getResourceEntryName(destinationId) ?: destinationId.toString()
+        } catch (e: Exception) {
+            destinationId.toString()
+        }
+        Timber.w("[NavigationSafe] Skipping navigation to '$destName' from '${currentNode?.label}' – action not found")
+    }
 }
 
 fun String.formatHash(): String {
diff --git a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
index 69f403c3d..3b7e91b3d 100644
--- a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
+++ b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
@@ -21,8 +21,8 @@
         app:startTitle="@string/result" />
     <ImageView
         android:id="@+id/setupImgV"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:src="@drawable/checked_circle"
         android:contentDescription="@string/Server_Connect_Icon"
         app:layout_constraintBottom_toTopOf="@+id/tileTv"

From 37e2c6c25e889870235f11701aedfe6a08a33003 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 23 Jul 2025 10:37:43 +0100
Subject: [PATCH 100/153] wip fix

---
 .../peertopeer/senderflow/PrepareUploadFragment.kt  |  2 +-
 .../peertopeer/viewmodel/FileTransferViewModel.kt   | 13 +++++++------
 .../peertopeer/viewmodel/PeerToPeerViewModel.kt     |  6 +++---
 .../java/com/hzontal/tella_vault/VaultFile.java     |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index c943f99b8..448fcf877 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -283,7 +283,7 @@ class PrepareUploadFragment :
                             size = vaultFile.size,
                             fileType = vaultFile.mimeType ?: "application/octet-stream",
                             sha256 = vaultFile.hash,
-                            thumb = vaultFile.thumb
+                            thumb = vaultFile.thumb ?: ByteArray(0)
                         )
 
                         val progressFile = ProgressFile(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 21a491117..04860c7bd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.MyApplication
+import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
@@ -33,12 +34,12 @@ class FileTransferViewModel @Inject constructor(
     private val peerClient: TellaPeerToPeerClient,
     var p2PSharedState: P2PSharedState
 ) : ViewModel() {
-    private val _prepareResults = MutableLiveData<PeerPrepareUploadResponse>()
-    val prepareResults: LiveData<PeerPrepareUploadResponse> = _prepareResults
-    private val _prepareRejected = MutableLiveData<Event<Boolean>>()
-    val prepareRejected: LiveData<Event<Boolean>> = _prepareRejected
-    private val _uploadProgress = MutableLiveData<UploadProgressState>()
-    val uploadProgress: LiveData<UploadProgressState> get() = _uploadProgress
+    private val _prepareResults = SingleLiveEvent<PeerPrepareUploadResponse>()
+    val prepareResults: SingleLiveEvent<PeerPrepareUploadResponse> = _prepareResults
+    private val _prepareRejected = SingleLiveEvent<Event<Boolean>>()
+    val prepareRejected: SingleLiveEvent<Event<Boolean>> = _prepareRejected
+    private val _uploadProgress = SingleLiveEvent<UploadProgressState>()
+    val uploadProgress: SingleLiveEvent<UploadProgressState> get() = _uploadProgress
     var peerToPeerParticipant: PeerToPeerParticipant = PeerToPeerParticipant.SENDER
 
     fun putVaultFilesInForm(vaultFileList: String): Single<List<VaultFile>> {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 7b1c06e04..15ce8a1d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -50,14 +50,14 @@ class PeerToPeerViewModel @Inject constructor(
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
     private val _registrationSuccess = SingleLiveEvent<Boolean>()
-    val registrationSuccess: LiveData<Boolean> get() = _registrationSuccess
+    val registrationSuccess: SingleLiveEvent<Boolean> get() = _registrationSuccess
     private val _getHashSuccess = SingleLiveEvent<String>()
-    val getHashSuccess: LiveData<String> get() = _getHashSuccess
+    val getHashSuccess: SingleLiveEvent<String> get() = _getHashSuccess
     val bottomMessageError = SingleLiveEvent<String>()
     val bottomSheetError = SingleLiveEvent<Pair<String, String>>()
     val clientHash = peerToPeerManager.clientConnected
     private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
-    val registrationServerSuccess: LiveData<Boolean> = _registrationServerSuccess
+    val registrationServerSuccess: SingleLiveEvent<Boolean> = _registrationServerSuccess
     private val _incomingPrepareRequest = SingleLiveEvent<PrepareUploadRequest?>()
     val incomingPrepareRequest: SingleLiveEvent<PrepareUploadRequest?> = _incomingPrepareRequest
     private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
diff --git a/tella-vault/src/main/java/com/hzontal/tella_vault/VaultFile.java b/tella-vault/src/main/java/com/hzontal/tella_vault/VaultFile.java
index b4c773baa..dce1bc622 100644
--- a/tella-vault/src/main/java/com/hzontal/tella_vault/VaultFile.java
+++ b/tella-vault/src/main/java/com/hzontal/tella_vault/VaultFile.java
@@ -14,7 +14,7 @@ public class VaultFile  implements Serializable {
     public long duration;
     public boolean anonymous;
     public Metadata metadata;
-    public byte[] thumb;
+    public byte[] thumb = null;
 
     public VaultFile() {
     }

From 5dc5a2f2716a6e9420d7b324032a87fe2960a2ea Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 23 Jul 2025 11:04:31 +0100
Subject: [PATCH 101/153] wip fixes

---
 .../managers/PeerServerStarterManager.kt      | 39 +++++++++++++------
 .../tella/mobile/domain/peertopeer/P2PFile.kt |  2 +-
 .../ReportsFilesRecyclerViewAdapter.kt        | 14 ++++---
 .../peertopeer/activity/PeerToPeerActivity.kt |  2 +
 .../receipentflow/QRCodeFragment.kt           |  5 +++
 .../SenderManualConnectionFragment.kt         |  1 -
 .../layout/connect_manually_verification.xml  |  2 +-
 .../res/layout/sender_manual_connection.xml   |  8 +---
 .../res/layout/show_device_info_layout.xml    |  4 +-
 mobile/src/main/res/values/strings.xml        |  4 +-
 .../textviews/CollapsibleTextView.kt          |  4 +-
 11 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 89794d12c..99691ae75 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -25,26 +25,43 @@ class PeerServerStarterManager @Inject constructor(
         config: KeyStoreConfig,
         p2PSharedState: P2PSharedState,
     ) {
-        if (server == null) {
-            server = TellaPeerToPeerServer(
-                ip = ip,
-                keyPair = keyPair,
-                pin = pin,
-                certificate = cert,
-                keyStoreConfig = config,
-                peerToPeerManager = peerToPeerManager,
-                p2PSharedState = p2PSharedState
-            )
+        if (isRunning()) {
+            stopServerBlocking() // Ensure clean restart
+        }
+
+        server = TellaPeerToPeerServer(
+            ip = ip,
+            keyPair = keyPair,
+            pin = pin,
+            certificate = cert,
+            keyStoreConfig = config,
+            peerToPeerManager = peerToPeerManager,
+            p2PSharedState = p2PSharedState
+        )
+
+        try {
             server?.start()
+        } catch (e: Exception) {
+            e.printStackTrace() // Optional: log to Sentry or Crashlytics
+            server = null
         }
     }
 
     fun stopServer() {
         CoroutineScope(Dispatchers.IO).launch {
+            stopServerBlocking()
+        }
+    }
+
+    private fun stopServerBlocking() {
+        try {
             server?.stop()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        } finally {
             server = null
         }
     }
 
-    fun isRunning(): Boolean = server != null
+    private fun isRunning(): Boolean = server != null
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
index 43fc2e92b..c4a6db2d8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
@@ -9,7 +9,7 @@ data class P2PFile(
     val size: Long,
     val fileType: String,
     val sha256: String,
-    val thumb: ByteArray
+    val thumb: ByteArray? = null
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/adapters/reports/ReportsFilesRecyclerViewAdapter.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/adapters/reports/ReportsFilesRecyclerViewAdapter.kt
index 933892b0c..c60a28152 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/adapters/reports/ReportsFilesRecyclerViewAdapter.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/adapters/reports/ReportsFilesRecyclerViewAdapter.kt
@@ -129,12 +129,14 @@ open class ReportsFilesRecyclerViewAdapter(
             filePreviewImg.loadImage(vaultFile.thumb)
         }
 
-        fun ImageView.loadImage(thumb: ByteArray) {
-            Glide.with(this)
-                .load(thumb)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .into(this)
+        fun ImageView.loadImage(thumb: ByteArray?) {
+            if (thumb != null) {
+                Glide.with(this)
+                    .load(thumb)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(true)
+                    .into(this)
+            }
         }
 
         private fun showAddLink() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
index 69ea4fe4b..7792cc09f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -15,6 +15,7 @@ import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILE_K
 import timber.log.Timber
 
 class PeerToPeerActivity : BaseLockActivity() {
+
     private lateinit var binding: ActivityPeerToPeerBinding
     private val mediaImportViewModel: MediaImportViewModel by viewModels()
 
@@ -80,4 +81,5 @@ class PeerToPeerActivity : BaseLockActivity() {
         mediaImportViewModel.mediaFileLiveData.observe(this, ::onMediaFileImported)
         mediaImportViewModel.importError.observe(this, ::onImportError)
     }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 019ce6928..685909a4c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -139,4 +139,9 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        peerServerStarterManager.stopServer()
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index cfe2149e1..345c819a8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -9,7 +9,6 @@ import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
-import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 import org.hzontal.shared_ui.utils.DialogUtils
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 14ec6c9af..571f8d990 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:padding="24dp"
+        android:padding="@dimen/activity_horizontal_large_margin"
         tools:text="87fd 5869 a6b3 e414 112c 1934 ca00 be77 b8e4 584c 829a 4536 490b da9a 3928 be4a"
         android:background="@drawable/bg_dual_text_check"
         app:layout_constraintTop_toBottomOf="@id/deviceImg"
diff --git a/mobile/src/main/res/layout/sender_manual_connection.xml b/mobile/src/main/res/layout/sender_manual_connection.xml
index f3f25d469..5c064362a 100644
--- a/mobile/src/main/res/layout/sender_manual_connection.xml
+++ b/mobile/src/main/res/layout/sender_manual_connection.xml
@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-
         <org.hzontal.shared_ui.appbar.ToolbarComponent
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
@@ -20,8 +19,7 @@
             app:arrowBackIconContentDescription="@string/connect_manually"
             app:layout_constraintTop_toTopOf="parent"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:startTitle="@string/connect_to_device" />
-
+            app:startTitle="@string/connect_manually" />
 
         <ImageView
             android:id="@+id/deviceImg"
@@ -35,7 +33,6 @@
             app:layout_constraintTop_toBottomOf="@+id/toolbar"
             app:layout_constraintVertical_chainStyle="packed" />
 
-
         <TextView
             android:id="@+id/titleTextView"
             style="@style/Tella_Main_White_TextExtraLargeBold"
@@ -51,7 +48,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
 
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/connectCode_layout"
             style="@style/DialogDataCollectionTextEntryLayout"
@@ -70,12 +66,12 @@
                 android:id="@+id/ip_address"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:digits="0123456789."
                 android:fontFamily="@font/open_sans"
                 android:hint="@string/ip_address"
                 android:imeOptions="actionNext"
                 android:importantForAutofill="no"
                 android:inputType="textNoSuggestions"
-                android:digits="0123456789."
                 android:maxLines="1"
                 android:textColor="@color/wa_white"
                 android:textDirection="ltr"
diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index 9007ac211..d21085a0e 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -12,10 +12,10 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         app:arrowBackIcon="@drawable/ic_close_white"
-        app:arrowBackIconContentDescription="@string/action_go_back"
+        app:arrowBackIconContentDescription="@string/connect_manually"
         app:layout_constraintTop_toTopOf="parent"
         app:popupTheme="@style/AppTheme.PopupOverlay"
-        app:startTitle="@string/connect_to_device" />
+        app:startTitle="@string/verification" />
 
 
     <ImageView
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 472ed4472..b8b24ec18 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1022,9 +1022,7 @@ Would you like to share analytics with the Tella team?</string>
     <string name="wifi_connection_instruction">Make sure both devices are connected to the same Wi-Fi network</string>
     <string name="tips_to_connect_title">Tips to connect</string>
     <string name="tips_to_connect_body">
-    1. The Wi-Fi network does not need to be connected to the internet.\n
-    2. You can create your own Wi-Fi network using your phone’s hotspot feature.\n
-    3. Disable any VPN connections.
+    1. The Wi-Fi network does not need to be connected to the internet.\n2. You can create your own Wi-Fi network using your phone’s hotspot feature.\n3. Disable any VPN connections.
 </string>
 
     <string name="current_wifi_network">Current Wifi network</string>
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
index f0a1849f2..bb6e7b7be 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/CollapsibleTextView.kt
@@ -40,7 +40,7 @@ class CollapsibleTextView @JvmOverloads constructor(
             collapsibleText.text = body
             isExpanded = expandedByDefault
             collapsibleText.visibility = if (isExpanded) View.VISIBLE else View.GONE
-            arrowIcon.rotation = if (isExpanded) 180f else 0f
+            arrowIcon.rotation = if (isExpanded) 0f else 180f
         }
 
         findViewById<View>(R.id.header).setOnClickListener {
@@ -51,7 +51,7 @@ class CollapsibleTextView @JvmOverloads constructor(
     private fun toggleText() {
         isExpanded = !isExpanded
         collapsibleText.visibility = if (isExpanded) View.VISIBLE else View.GONE
-        val rotation = if (isExpanded) 180f else 0f
+        val rotation = if (isExpanded) 0f else 180f
         arrowIcon.animate().rotation(rotation).start()
     }
 

From 7146c189dfe60e3b6f76fa81ab7628282f77b536 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 23 Jul 2025 14:29:04 +0100
Subject: [PATCH 102/153] handle back

---
 .../peertopeer/senderflow/PeerToPeerResultFragment.kt        | 2 ++
 .../fragment/peertopeer/senderflow/PrepareUploadFragment.kt  | 5 ++---
 .../peertopeer/senderflow/SenderUploadFilesFragment.kt       | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
index 692b9426c..8c81e9fb7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PeerToPeerResultFragment.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.R
@@ -29,6 +30,7 @@ class PeerToPeerResultFragment :
         setupImage()
         setupTexts()
         setupButton()
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { baseActivity.finish() }
     }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 448fcf877..5f4ca2e51 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
 import androidx.navigation.fragment.findNavController
@@ -75,9 +76,6 @@ class PrepareUploadFragment :
     }
 
     private fun initView() {
-        binding.toolbar.backClickListener = {
-            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
-        }
         gridLayoutManager = GridLayoutManager(context, 3)
         binding.filesRecyclerView.apply {
             layoutManager = gridLayoutManager
@@ -86,6 +84,7 @@ class PrepareUploadFragment :
         binding.toolbar.backClickListener = {
             exitOrSave()
         }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { exitOrSave()}
 
         //TODO HANDLE THIS IN THE NAVMANAGER
         val navBackStackEntry = findNavController().currentBackStackEntry
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 714914a18..7d0191bde 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -2,6 +2,7 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow
 
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.fragment.app.activityViewModels
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
@@ -39,6 +40,7 @@ class SenderUploadFilesFragment :
                     PeerToPeerFlags.cancelled = true
                     baseActivity.finish()})
         }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { }
     }
 
     private fun showFormEndView() {

From dd365054dbc2b235bbf3361712c9a0816af74b35 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 23 Jul 2025 18:25:54 +0100
Subject: [PATCH 103/153] WIP sheet progress state

---
 .../domain/peertopeer/PeerEventManager.kt     |  48 +++-
 .../domain/peertopeer/PeerRegisterPayload.kt  |   6 +-
 .../RecipientUploadFilesFragment.kt           |  89 ++++++--
 .../viewmodel/PeerToPeerViewModel.kt          | 207 +++++++++---------
 .../state/BottomSheetProgressState.kt         |   7 +
 .../uwazi/widgets/PeerToPeerEndView.java      |   2 +-
 6 files changed, 232 insertions(+), 127 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/BottomSheetProgressState.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index a1a1e765b..a01518be6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -12,36 +12,66 @@ import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.Upl
  */
 object PeerEventManager {
 
-    val registrationEvents = MutableSharedFlow<Boolean>(replay = 1)
-    private val _registrationRequests =
-        MutableSharedFlow<Pair<String, PeerRegisterPayload>>(replay = 1)
+    // Used to signal clearing of registration replayed value
+    private val EMPTY_REGISTRATION_REQUEST = "" to PeerRegisterPayload.EMPTY
+
+    val registrationEvents = MutableSharedFlow<Boolean>(
+        replay = 0,
+        extraBufferCapacity = 1
+    )
+
+    // Replays the last actual registration request to new collectors
+    private val _registrationRequests = MutableSharedFlow<Pair<String, PeerRegisterPayload>>(
+        replay = 1,
+        extraBufferCapacity = 1
+    )
     val registrationRequests = _registrationRequests.asSharedFlow()
-    private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
-    private val _prepareUploadEvents = MutableSharedFlow<PrepareUploadRequest>(replay = 1)
+
+    // Optional: refactor this one later too
+    private val _prepareUploadEvents = MutableSharedFlow<Unit>(
+        replay = 1,
+        extraBufferCapacity = 1
+    )
     val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
+
+    private var pendingPrepareUploadRequest: PrepareUploadRequest? = null
+
     private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+    private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
+
     private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 1)
     val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
 
+    // Upload progress
     suspend fun onUploadProgressState(state: UploadProgressState) {
         _uploadProgressStateFlow.emit(state)
     }
 
+    // Trigger one-time event for registration success
     suspend fun emitRegistrationSuccess() {
         registrationEvents.emit(true)
     }
 
+    // Trigger upload preparation request, storing the data separately
     suspend fun emitPrepareUploadRequest(request: PrepareUploadRequest): Boolean {
         val deferred = CompletableDeferred<Boolean>()
         decisionMap[request.sessionId] = deferred
-        _prepareUploadEvents.emit(request)
+        pendingPrepareUploadRequest = request
+        _prepareUploadEvents.emit(Unit)
         return deferred.await()
     }
 
+    fun getPendingPrepareUploadRequest(): PrepareUploadRequest? {
+        return pendingPrepareUploadRequest.also {
+            pendingPrepareUploadRequest = null // Clear once accessed
+        }
+    }
+
     fun resolveUserDecision(sessionId: String, accepted: Boolean) {
         decisionMap.remove(sessionId)?.complete(accepted)
     }
 
+    // Registration request with real payload
     suspend fun emitIncomingRegistrationRequest(
         registrationId: String,
         payload: PeerRegisterPayload
@@ -52,8 +82,12 @@ object PeerEventManager {
         return deferred.await()
     }
 
+    // Clears the replayed registration request by emitting a dummy one
+    suspend fun clearRegistrationRequest() {
+        _registrationRequests.emit(EMPTY_REGISTRATION_REQUEST)
+    }
+
     fun confirmRegistration(registrationId: String, accepted: Boolean) {
         registrationDecisionMap.remove(registrationId)?.complete(accepted)
     }
-
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
index 4386df941..2495a7fb2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerRegisterPayload.kt
@@ -7,4 +7,8 @@ import java.util.UUID
 data class PeerRegisterPayload(
     val pin: String,
     val nonce: String = UUID.randomUUID().toString(),
-)
\ No newline at end of file
+) {
+    companion object {
+        val EMPTY = PeerRegisterPayload(pin = "")
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index d6d6442a7..eebc02454 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -3,52 +3,72 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import dagger.hilt.android.AndroidEntryPoint
+import androidx.lifecycle.MutableLiveData
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
-import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
+import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
-import javax.inject.Inject
 
-@AndroidEntryPoint
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
 
-    @Inject
-    lateinit var p2PSharedState: P2PSharedState
 
     private lateinit var endView: PeerToPeerEndView
 
+
+    private val progressPercentLiveData = MutableLiveData<Int>()
+    private var sheetShown = false
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        initializeUI()
+        setupCancelButton()
+    }
+
+    private fun initializeUI() {
         showFormEndView()
         observeUploadProgress()
+        observeBottomSheetProgress() // NEW
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+    }
 
+    private fun setupCancelButton() {
         binding.cancel.setOnClickListener {
-            showStandardSheet(
-                baseActivity.supportFragmentManager,
-                getString(R.string.stop_sharing_files),
-                getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
-                getString(R.string.action_continue).uppercase(),
-                getString(R.string.stop).uppercase(),
-                {},
-                {   viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
-                    navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()})
+            showStopSharingConfirmation()
         }
     }
 
+    private fun showStopSharingConfirmation() {
+        showStandardSheet(
+            baseActivity.supportFragmentManager,
+            getString(R.string.stop_sharing_files),
+            getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
+            getString(R.string.action_continue).uppercase(),
+            getString(R.string.stop).uppercase(),
+            onConfirmClick = {},
+            onCancelClick = {
+                stopServerAndNavigate()
+            }
+        )
+    }
+
+    private fun stopServerAndNavigate() {
+        //peerServerStarterManager.stopServer()
+        viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+        navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
+    }
+
     private fun showFormEndView() {
-        val session = p2PSharedState.session ?: return
+        val session = viewModel.p2PState.session ?: return
         val files = session.files.values.toList()
 
         endView = PeerToPeerEndView(
@@ -63,21 +83,50 @@ class RecipientUploadFilesFragment :
     }
 
     private fun observeUploadProgress() {
-
         viewModel.uploadProgress.observe(viewLifecycleOwner) { state ->
             if (state == null) return@observe
+
             val files = state.files
-            val percentFloat = state.percent / 100f
+            val percent = state.percent.coerceIn(0, 100)
+            val percentFloat = percent / 100f
+
             endView.setUploadProgress(files, percentFloat)
 
-            val allSaved = state.files.all { it.status == P2PFileStatus.SAVED }
+            // Only show the bottom sheet once, updates come from observeBottomSheetProgress
+            if (!sheetShown) {
+                sheetShown = true
+                showProgressImportSheet(
+                    baseActivity.supportFragmentManager,
+                    getString(R.string.Vault_Importing_SheetTitle),
+                    files.size,
+                    resources.getQuantityString(
+                        R.plurals.Vault_Importing_SheetProgress, files.size
+                    ),
+                    progressStatus = progressPercentLiveData,
+                    getString(R.string.action_cancel).uppercase(),
+                    viewLifecycleOwner
+                ) {
+                    // peerServerStarterManager.stopServer()
+                    viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+                    navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
+                }
+            }
 
+            val allSaved = files.all { it.status == P2PFileStatus.SAVED }
             if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
+                //peerServerStarterManager.stopServer()
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
                 navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
             }
-
         }
     }
 
+    private fun observeBottomSheetProgress() {
+        viewModel.bottomSheetProgress.observe(viewLifecycleOwner) { progress ->
+            if (!sheetShown) return@observe // Only update if the sheet is shown
+
+            // Update percent on progress bar
+            progressPercentLiveData.value = progress.percent
+        }
+    }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 15ce8a1d9..2409d3ff6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
@@ -33,6 +34,7 @@ import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.NetworkInfo
 import org.horizontal.tella.mobile.util.NetworkInfoManager
 import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.BottomSheetProgressState
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import java.io.File
@@ -45,81 +47,125 @@ class PeerToPeerViewModel @Inject constructor(
     peerToPeerManager: PeerToPeerManager,
     val p2PState: P2PSharedState
 ) : ViewModel() {
+
     var peerToPeerParticipant: PeerToPeerParticipant = PeerToPeerParticipant.SENDER
     var isManualConnection: Boolean = true
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
+
     private val _registrationSuccess = SingleLiveEvent<Boolean>()
     val registrationSuccess: SingleLiveEvent<Boolean> get() = _registrationSuccess
+
     private val _getHashSuccess = SingleLiveEvent<String>()
     val getHashSuccess: SingleLiveEvent<String> get() = _getHashSuccess
+
     val bottomMessageError = SingleLiveEvent<String>()
     val bottomSheetError = SingleLiveEvent<Pair<String, String>>()
+
     val clientHash = peerToPeerManager.clientConnected
+
     private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
-    val registrationServerSuccess: SingleLiveEvent<Boolean> = _registrationServerSuccess
+    val registrationServerSuccess: SingleLiveEvent<Boolean> get() = _registrationServerSuccess
+
     private val _incomingPrepareRequest = SingleLiveEvent<PrepareUploadRequest?>()
-    val incomingPrepareRequest: SingleLiveEvent<PrepareUploadRequest?> = _incomingPrepareRequest
+    val incomingPrepareRequest: SingleLiveEvent<PrepareUploadRequest?> get() = _incomingPrepareRequest
+
     private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
-    val incomingRequest: StateFlow<IncomingRegistration?> = _incomingRequest
+    val incomingRequest: StateFlow<IncomingRegistration?> get() = _incomingRequest
+
+    private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
+    val uploadProgress: SingleLiveEvent<UploadProgressState?> get() = _uploadProgress
+
+
     private val networkInfoManager = NetworkInfoManager(context)
     val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
-    private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
-    val uploadProgress: SingleLiveEvent<UploadProgressState?> = _uploadProgress
-    private var isVaultSaveDone = false
 
+    private val _bottomSheetProgress = MutableLiveData<BottomSheetProgressState>()
+    val bottomSheetProgress: LiveData<BottomSheetProgressState> get() = _bottomSheetProgress
+
+    private var isVaultSaveDone = false
 
     init {
+        observePrepareUploadEvents()
+        observeRegistrationEvents()
+        observeRegistrationRequests()
+        observeUploadProgress()
+    }
+
+    private fun observePrepareUploadEvents() {
         viewModelScope.launch {
-            PeerEventManager.prepareUploadEvents.collect { request ->
-                _incomingPrepareRequest.postValue(request)
+            PeerEventManager.prepareUploadEvents.collect {
+                PeerEventManager.getPendingPrepareUploadRequest()?.let { request ->
+                    _incomingPrepareRequest.postValue(request)
+                }
             }
         }
+    }
 
+    private fun observeRegistrationEvents() {
         viewModelScope.launch {
             PeerEventManager.registrationEvents.collect { success ->
                 _registrationServerSuccess.postValue(success)
             }
         }
+    }
 
+    private fun observeRegistrationRequests() {
         viewModelScope.launch {
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
+                if (registrationId.isEmpty()) return@collect // Ignore sentinel
+
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
 
                 if (!p2PState.isUsingManualConnection) {
                     PeerEventManager.confirmRegistration(registrationId, true)
                     _registrationSuccess.postValue(true)
+                    PeerEventManager.clearRegistrationRequest()
                 }
             }
         }
+    }
 
+    fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
-            PeerEventManager.uploadProgressStateFlow.collect { state ->
+            val result = FingerprintFetcher.fetch(ip, port.toInt())
+            result.onSuccess { hash ->
+                Timber.d("hash ***** $hash")
+                p2PState.hash = hash
+                _getHashSuccess.postValue(hash)
 
+                // Notify the server after fetching the hash
+                runCatching {
+                    ServerPinger.notifyServer(ip, port.toInt())
+                }.onFailure {
+                    Timber.e(it, "Failed to ping server after fetching hash")
+                }
+
+            }.onFailure { error ->
+                Timber.d("error ***** $error")
+                bottomSheetError.postValue(
+                    "Connection failed" to
+                            "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+                )
+            }
+        }
+    }
+
+    private fun observeUploadProgress() {
+        viewModelScope.launch {
+            PeerEventManager.uploadProgressStateFlow.collect { state ->
                 val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
 
+                _uploadProgress.postValue(state) // existing state for other logic
+
                 if (allFinished && !isVaultSaveDone) {
-                    isVaultSaveDone = true // prevent re-saving
+                    isVaultSaveDone = true
                     finalizeAndSaveReceivedFiles(p2PState.session?.title.orEmpty(), state.files)
                 }
             }
         }
-
     }
 
-    fun resetRegistrationState() {
-        _registrationServerSuccess.postValue(false)
-    }
-
-    fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
-        PeerEventManager.resolveUserDecision(sessionId, accepted)
-    }
-
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    fun updateNetworkInfo() {
-        networkInfoManager.fetchCurrentNetworkInfo()
-    }
 
     fun startRegistration(
         ip: String,
@@ -130,37 +176,17 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
-                    with(p2PState) {
-                        this.session?.sessionId = result.sessionId
-                    }
+                    p2PState.session?.sessionId = result.sessionId
                     Timber.d("session id ***startRegistration ${p2PState.session?.sessionId}")
-
                     _registrationSuccess.postValue(true)
                 }
 
-                RegisterPeerResult.InvalidPin -> {
-                    bottomMessageError.postValue("Invalid PIN")
-                }
-
-                RegisterPeerResult.InvalidFormat -> {
-                    bottomMessageError.postValue("Invalid request format")
-                }
-
-                RegisterPeerResult.Conflict -> {
-                    bottomMessageError.postValue("Active session already exists")
-                }
-
-                RegisterPeerResult.TooManyRequests -> {
-                    bottomMessageError.postValue("Too many requests, try again later")
-                }
-
-                RegisterPeerResult.ServerError -> {
-                    bottomMessageError.postValue("Server error, try again later")
-                }
-
-                RegisterPeerResult.RejectedByReceiver -> {
-                    bottomMessageError.postValue("Receiver rejected the registration")
-                }
+                RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
+                RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
+                RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")
+                RegisterPeerResult.TooManyRequests -> bottomMessageError.postValue("Too many requests, try again later")
+                RegisterPeerResult.ServerError -> bottomMessageError.postValue("Server error, try again later")
+                RegisterPeerResult.RejectedByReceiver -> bottomMessageError.postValue("Receiver rejected the registration")
 
                 is RegisterPeerResult.Failure -> {
                     Timber.e(result.exception, "Connection failure")
@@ -173,41 +199,23 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
-
-    fun handleCertificate(ip: String, port: String, pin: String) {
-        viewModelScope.launch {
-            val result = FingerprintFetcher.fetch(ip, port.toInt())
-            result.onSuccess { hash ->
-                Timber.d("hash ***** $hash")
-                p2PState.hash = hash
-                _getHashSuccess.postValue(hash)
-
-                // Notify the server after fetching the hash
-                runCatching {
-                    ServerPinger.notifyServer(ip, port.toInt())
-                }.onFailure {
-                    Timber.e(it, "Failed to ping server after fetching hash")
-                }
-
-            }.onFailure { error ->
-                Timber.d("error ***** $error")
-                bottomSheetError.postValue(
-                    "Connection failed" to
-                            "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
-                )
-            }
-        }
-    }
-
     fun onUserConfirmedRegistration(registrationId: String) {
         viewModelScope.launch {
             PeerEventManager.confirmRegistration(registrationId, true)
             _registrationSuccess.postValue(true)
+            PeerEventManager.clearRegistrationRequest()
         }
     }
 
     fun onUserRejectedRegistration(registrationId: String) {
-        PeerEventManager.confirmRegistration(registrationId, accepted = false)
+        viewModelScope.launch {
+            PeerEventManager.confirmRegistration(registrationId, false)
+            PeerEventManager.clearRegistrationRequest()
+        }
+    }
+
+    fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
+        PeerEventManager.resolveUserDecision(sessionId, accepted)
     }
 
     fun clearPrepareRequest() {
@@ -215,6 +223,15 @@ class PeerToPeerViewModel @Inject constructor(
         hasNavigatedToSuccessFragment = false
     }
 
+    fun resetRegistrationState() {
+        _registrationServerSuccess.postValue(false)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun updateNetworkInfo() {
+        networkInfoManager.fetchCurrentNetworkInfo()
+    }
+
     private fun finalizeAndSaveReceivedFiles(
         folderName: String,
         progressFiles: List<ProgressFile>
@@ -268,23 +285,18 @@ class PeerToPeerViewModel @Inject constructor(
                         null
                     }
 
-                    //  Update both the shared session and local progress file status
                     p2PState.session?.files?.get(progressFile.file.id)?.status = P2PFileStatus.SAVED
-                    progressFile.status = P2PFileStatus.SAVED //  <-- Important!
-
+                    progressFile.status = P2PFileStatus.SAVED
                     progressFile.vaultFile = vaultFile
                     savedFiles++
-
-                    // Delete temp file after saving
                     file.delete()
 
-                    // Emit progress after each file
-                    _uploadProgress.postValue(
-                        UploadProgressState(
-                            title = folderName,
-                            percent = ((savedFiles * 100) / totalFiles),
-                            sessionStatus = SessionStatus.SENDING,
-                            files = progressFiles
+                    // ✅ Update bottom sheet progress only
+                    _bottomSheetProgress.postValue(
+                        BottomSheetProgressState(
+                            current = savedFiles,
+                            total = totalFiles,
+                            percent = ((savedFiles * 100) / totalFiles)
                         )
                     )
 
@@ -296,12 +308,12 @@ class PeerToPeerViewModel @Inject constructor(
 
             p2PState.session?.status = SessionStatus.FINISHED
 
-            _uploadProgress.postValue(
-                UploadProgressState(
-                    title = folderName,
-                    percent = 100,
-                    sessionStatus = SessionStatus.FINISHED,
-                    files = progressFiles
+            // ✅ Final state for bottom sheet
+            _bottomSheetProgress.postValue(
+                BottomSheetProgressState(
+                    current = totalFiles,
+                    total = totalFiles,
+                    percent = 100
                 )
             )
         }
@@ -312,5 +324,4 @@ class PeerToPeerViewModel @Inject constructor(
         super.onCleared()
         p2PState.clear()
     }
-
-}
\ No newline at end of file
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/BottomSheetProgressState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/BottomSheetProgressState.kt
new file mode 100644
index 000000000..e251600c5
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/state/BottomSheetProgressState.kt
@@ -0,0 +1,7 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state
+
+data class BottomSheetProgressState(
+    val current: Int,
+    val total: Int,
+    val percent: Int
+)
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index 6aaa6c1b3..b7ff9407b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -188,6 +188,6 @@ private View createProgressFileItemView(@NonNull ProgressFile file, boolean offl
     }
 
     private boolean isUploadedStatus(P2PFileStatus status) {
-        return status == P2PFileStatus.FINISHED || status == P2PFileStatus.SAVED;
+        return status == P2PFileStatus.FINISHED;
     }
 }

From 01fb2139f8c608f2f828ba1e2cca805f21e3bb83 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 09:57:53 +0100
Subject: [PATCH 104/153] WIP server celan up

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  2 -
 .../managers/PeerServerStarterManager.kt      | 39 ++++++-------------
 .../peertopeer/activity/PeerToPeerActivity.kt | 12 ++++++
 .../fragment/peertopeer/di/PeerModule.kt      |  2 +-
 .../receipentflow/QRCodeFragment.kt           |  6 ---
 .../senderflow/SenderVerificationFragment.kt  | 24 +++++++-----
 .../layout/connect_manually_verification.xml  |  2 +-
 7 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index c43e084f1..322bc95d7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -44,8 +44,6 @@ import java.security.KeyPair
 import java.security.KeyStore
 import java.security.cert.X509Certificate
 import java.util.UUID
-import kotlin.io.path.outputStream
-import kotlin.io.path.pathString
 
 const val port = 53317
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
index 99691ae75..89794d12c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/managers/PeerServerStarterManager.kt
@@ -25,43 +25,26 @@ class PeerServerStarterManager @Inject constructor(
         config: KeyStoreConfig,
         p2PSharedState: P2PSharedState,
     ) {
-        if (isRunning()) {
-            stopServerBlocking() // Ensure clean restart
-        }
-
-        server = TellaPeerToPeerServer(
-            ip = ip,
-            keyPair = keyPair,
-            pin = pin,
-            certificate = cert,
-            keyStoreConfig = config,
-            peerToPeerManager = peerToPeerManager,
-            p2PSharedState = p2PSharedState
-        )
-
-        try {
+        if (server == null) {
+            server = TellaPeerToPeerServer(
+                ip = ip,
+                keyPair = keyPair,
+                pin = pin,
+                certificate = cert,
+                keyStoreConfig = config,
+                peerToPeerManager = peerToPeerManager,
+                p2PSharedState = p2PSharedState
+            )
             server?.start()
-        } catch (e: Exception) {
-            e.printStackTrace() // Optional: log to Sentry or Crashlytics
-            server = null
         }
     }
 
     fun stopServer() {
         CoroutineScope(Dispatchers.IO).launch {
-            stopServerBlocking()
-        }
-    }
-
-    private fun stopServerBlocking() {
-        try {
             server?.stop()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        } finally {
             server = null
         }
     }
 
-    private fun isRunning(): Boolean = server != null
+    fun isRunning(): Boolean = server != null
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
index 7792cc09f..0be7d6bec 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/activity/PeerToPeerActivity.kt
@@ -6,19 +6,26 @@ import androidx.activity.viewModels
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.Gson
 import com.hzontal.tella_vault.VaultFile
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ActivityPeerToPeerBinding
 import org.horizontal.tella.mobile.mvvm.media.MediaImportViewModel
 import org.horizontal.tella.mobile.util.C
 import org.horizontal.tella.mobile.views.base_ui.BaseLockActivity
 import org.horizontal.tella.mobile.views.fragment.uwazi.attachments.VAULT_FILE_KEY
 import timber.log.Timber
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class PeerToPeerActivity : BaseLockActivity() {
 
     private lateinit var binding: ActivityPeerToPeerBinding
     private val mediaImportViewModel: MediaImportViewModel by viewModels()
 
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityPeerToPeerBinding.inflate(layoutInflater)
@@ -82,4 +89,9 @@ class PeerToPeerActivity : BaseLockActivity() {
         mediaImportViewModel.importError.observe(this, ::onImportError)
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        peerServerStarterManager.stopServer()
+    }
+
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index 8e78991c6..5da247183 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -4,8 +4,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import javax.inject.Singleton
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 685909a4c..4ff05c9f9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -138,10 +138,4 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
             }
         }
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        peerServerStarterManager.stopServer()
-    }
-
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 38c4961d6..139973954 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -16,6 +16,7 @@ import javax.inject.Inject
 
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
+
     private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     @Inject
@@ -72,15 +73,20 @@ class SenderVerificationFragment :
                 description,
                 null,
                 getString(R.string.try_again),
-                null,
-                {
-                    viewModel.startRegistration(
-                        ip = viewModel.p2PState.ip,
-                        port = viewModel.p2PState.port,
-                        hash = viewModel.p2PState.hash,
-                        pin = viewModel.p2PState.pin.toString()
-                    )
-                })
+                null
+            ) {
+                viewModel.startRegistration(
+                    ip = viewModel.p2PState.ip,
+                    port = viewModel.p2PState.port,
+                    hash = viewModel.p2PState.hash,
+                    pin = viewModel.p2PState.pin.toString()
+                )
+            }
         }
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        peerServerStarterManager.stopServer()
+    }
 }
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 571f8d990..1116d8f08 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -15,7 +15,7 @@
         app:arrowBackIconContentDescription="@string/action_go_back"
         app:layout_constraintTop_toTopOf="parent"
         app:popupTheme="@style/AppTheme.PopupOverlay"
-        app:startTitle="@string/connect_manually" />
+        app:startTitle="@string/verification" />
 
     <ImageView
         android:id="@+id/deviceImg"

From a4e732ca62818e8946e1664ba119cb0304736422 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 24 Jul 2025 16:16:45 +0100
Subject: [PATCH 105/153] add close connexion endpoint

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 30 +++++++++++++
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 43 +++++++++++++++++++
 .../data/peertopeer/model/SessionStatus.kt    |  3 +-
 .../data/peertopeer/remote/PeerApiRoutes.kt   |  2 +
 .../senderflow/SenderUploadFilesFragment.kt   |  1 +
 .../viewmodel/FileTransferViewModel.kt        | 22 ++++++++++
 6 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 811ccc360..03de12582 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -5,6 +5,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -232,5 +235,32 @@ class TellaPeerToPeerClient @Inject constructor() {
         }
     }
 
+    suspend fun closeConnection(
+        ip: String,
+        port: String,
+        expectedFingerprint: String,
+        sessionId: String
+    ): Boolean = withContext(Dispatchers.IO) {
+        val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.CLOSE)
 
+        val payload = Json.encodeToString(mapOf("sessionId" to sessionId))
+        val requestBody = payload.toRequestBody(CONTENT_TYPE_JSON.toMediaType())
+
+        val client = getClientWithFingerprintValidation(expectedFingerprint)
+
+        val request = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+            .build()
+
+        return@withContext try {
+            client.newCall(request).execute().use { response ->
+                response.isSuccessful
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to close connection")
+            false
+        }
+    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 322bc95d7..9de17215f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -277,6 +277,49 @@ class TellaPeerToPeerServer(
                         }
                     }
 
+                    post(PeerApiRoutes.CLOSE) {
+                        val payload = try {
+                            call.receive<Map<String, String>>()
+                        } catch (e: Exception) {
+                            call.respond(HttpStatusCode.BadRequest, "Missing or invalid JSON payload")
+                            return@post
+                        }
+
+                        val sessionId = payload["sessionId"]
+
+                        if (sessionId.isNullOrBlank()) {
+                            call.respond(HttpStatusCode.BadRequest, "Missing session ID")
+                            return@post
+                        }
+
+                        val currentSession = serverSession
+                        if (currentSession == null) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                            return@post
+                        }
+
+                        if (currentSession.sessionId != sessionId) {
+                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
+                            return@post
+                        }
+
+                        if (p2PSharedState.session?.status == SessionStatus.CLOSED) {
+                            call.respond(HttpStatusCode.Forbidden, "Session already closed")
+                            return@post
+                        }
+
+                        try {
+                            // ✅ Mark session as closed
+                            p2PSharedState.session?.status = SessionStatus.CLOSED
+                            serverSession = null
+
+                            call.respond(HttpStatusCode.OK, mapOf("success" to true))
+                        } catch (e: Exception) {
+                            Timber.e(e, "Error while closing session")
+                            call.respond(HttpStatusCode.InternalServerError, "Server error")
+                        }
+                    }
+
                 }
 
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
index dd048ae37..d0b2b2b05 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
@@ -4,5 +4,6 @@ enum class SessionStatus {
     WAITING,
     SENDING,
     FINISHED,
-    FINISHED_WITH_ERRORS
+    FINISHED_WITH_ERRORS,
+    CLOSED
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
index 8af395c92..4090ec4d7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
@@ -5,6 +5,8 @@ object PeerApiRoutes {
     const val PREPARE_UPLOAD = "/api/v1/prepare-upload"
     const val UPLOAD = "/api/v1/upload"
     const val PING = "/api/v1/ping"
+    const val CLOSE = "/api/v1/close-connection"
+
 
     fun buildUrl(ip: String, port: String, endpoint: String): String {
         return "https://$ip:$port$endpoint"
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 7d0191bde..43d66cda9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -67,6 +67,7 @@ class SenderUploadFilesFragment :
             val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
 
             if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
+                viewModel.closePeerConnection()
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
                 navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 04860c7bd..f1b7f81d9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -189,6 +189,28 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
+    fun closePeerConnection() {
+
+        viewModelScope.launch {
+            val ip = p2PSharedState.ip
+            val port = p2PSharedState.port
+            val fingerprint = p2PSharedState.hash
+
+            val success = peerClient.closeConnection(
+                ip = ip,
+                port = port,
+                expectedFingerprint = fingerprint,
+                sessionId = getSessionId()
+            )
+
+            if (success) {
+                Timber.d("Connection closed successfully.")
+            } else {
+                Timber.e("Failed to close peer connection.")
+            }
+        }
+    }
+
 
     private fun getVaultFilesFromState(): List<VaultFile> {
         return p2PSharedState.session?.files

From 53b75df65bb82be755ea7d60455094d9ca3524f8 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 17:09:28 +0100
Subject: [PATCH 106/153] show all files result

---
 .../domain/peertopeer/PeerEventManager.kt     |  6 +++---
 .../RecipientUploadFilesFragment.kt           | 21 ++++++++-----------
 .../receipentflow/ShowDeviceInfoFragment.kt   |  1 -
 .../viewmodel/PeerToPeerViewModel.kt          | 14 +++++++++++--
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index a01518be6..70261c75e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -22,14 +22,14 @@ object PeerEventManager {
 
     // Replays the last actual registration request to new collectors
     private val _registrationRequests = MutableSharedFlow<Pair<String, PeerRegisterPayload>>(
-        replay = 1,
+        replay = 0,
         extraBufferCapacity = 1
     )
     val registrationRequests = _registrationRequests.asSharedFlow()
 
     // Optional: refactor this one later too
     private val _prepareUploadEvents = MutableSharedFlow<Unit>(
-        replay = 1,
+        replay = 0,
         extraBufferCapacity = 1
     )
     val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
@@ -39,7 +39,7 @@ object PeerEventManager {
     private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
     private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
 
-    private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 1)
+    private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 0)
     val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
 
     // Upload progress
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index eebc02454..4b2a7a52b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -15,16 +15,13 @@ import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPee
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import kotlin.math.roundToInt
 
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
-
-
     private lateinit var endView: PeerToPeerEndView
-
-
     private val progressPercentLiveData = MutableLiveData<Int>()
     private var sheetShown = false
 
@@ -37,7 +34,7 @@ class RecipientUploadFilesFragment :
     private fun initializeUI() {
         showFormEndView()
         observeUploadProgress()
-        observeBottomSheetProgress() // NEW
+        observeBottomSheetProgress()
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
     }
 
@@ -106,15 +103,12 @@ class RecipientUploadFilesFragment :
                     getString(R.string.action_cancel).uppercase(),
                     viewLifecycleOwner
                 ) {
-                    // peerServerStarterManager.stopServer()
-                    viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
-                    navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
+
                 }
             }
 
             val allSaved = files.all { it.status == P2PFileStatus.SAVED }
             if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
-                //peerServerStarterManager.stopServer()
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
                 navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
             }
@@ -123,10 +117,13 @@ class RecipientUploadFilesFragment :
 
     private fun observeBottomSheetProgress() {
         viewModel.bottomSheetProgress.observe(viewLifecycleOwner) { progress ->
-            if (!sheetShown) return@observe // Only update if the sheet is shown
+            if (!sheetShown) return@observe
 
-            // Update percent on progress bar
-            progressPercentLiveData.value = progress.percent
+            // Convert percent to file count approximation
+            val totalFiles = viewModel.uploadProgress.value?.files?.size ?: return@observe
+            val filesSaved = (progress.percent * totalFiles / 100f).roundToInt()
+            progressPercentLiveData.value = filesSaved
         }
     }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
index 831264498..e9e3798c2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ShowDeviceInfoFragment.kt
@@ -17,7 +17,6 @@ class ShowDeviceInfoFragment :
 
     private var payload: PeerConnectionPayload? = null
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         arguments?.getString("payload")?.let { payloadJson ->
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 2409d3ff6..023b44c25 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -291,7 +291,6 @@ class PeerToPeerViewModel @Inject constructor(
                     savedFiles++
                     file.delete()
 
-                    // ✅ Update bottom sheet progress only
                     _bottomSheetProgress.postValue(
                         BottomSheetProgressState(
                             current = savedFiles,
@@ -308,7 +307,8 @@ class PeerToPeerViewModel @Inject constructor(
 
             p2PState.session?.status = SessionStatus.FINISHED
 
-            // ✅ Final state for bottom sheet
+            val updatedFiles = p2PState.session?.files?.values?.toList().orEmpty()
+
             _bottomSheetProgress.postValue(
                 BottomSheetProgressState(
                     current = totalFiles,
@@ -316,6 +316,16 @@ class PeerToPeerViewModel @Inject constructor(
                     percent = 100
                 )
             )
+
+            _uploadProgress.postValue(
+                UploadProgressState(
+                    title = p2PState.session?.title ?: "",
+                    sessionStatus = SessionStatus.FINISHED,
+                    files = updatedFiles,
+                    percent = 100
+                )
+            )
+
         }
     }
 

From 57bf12670d6cfb8910fc406454dc3dc64df9c6f5 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 24 Jul 2025 19:02:21 +0100
Subject: [PATCH 107/153] add stopserver

---
 .../receipentflow/RecipientUploadFilesFragment.kt        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 4b2a7a52b..e1d764a07 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.databinding.FragmentUploadFilesBinding
@@ -15,6 +16,7 @@ import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPee
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import javax.inject.Inject
 import kotlin.math.roundToInt
 
 class RecipientUploadFilesFragment :
@@ -24,6 +26,8 @@ class RecipientUploadFilesFragment :
     private lateinit var endView: PeerToPeerEndView
     private val progressPercentLiveData = MutableLiveData<Int>()
     private var sheetShown = false
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -59,7 +63,7 @@ class RecipientUploadFilesFragment :
     }
 
     private fun stopServerAndNavigate() {
-        //peerServerStarterManager.stopServer()
+        peerServerStarterManager.stopServer()
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
         navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
     }
@@ -109,8 +113,7 @@ class RecipientUploadFilesFragment :
 
             val allSaved = files.all { it.status == P2PFileStatus.SAVED }
             if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
-                viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
-                navManager().navigateFromRecipientUploadFilesFragmentToPeerToPeerResultFragment()
+                stopServerAndNavigate()
             }
         }
     }

From 9cdbc1146084f2c40d69b9fac9ad2f0409917bff Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 24 Jul 2025 19:33:07 +0100
Subject: [PATCH 108/153] fix injection

---
 .../peertopeer/receipentflow/RecipientUploadFilesFragment.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index e1d764a07..b22245b23 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
@@ -19,6 +20,7 @@ import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
+@AndroidEntryPoint
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
 

From 0703422296042cd56a1bdbee7bb145e06db23bf5 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 19:49:02 +0100
Subject: [PATCH 109/153] Fix close connection api

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 21 +++++++++---
 .../domain/peertopeer/PeerEventManager.kt     |  9 +++++
 .../RecipientUploadFilesFragment.kt           | 13 ++++----
 .../RecipientVerificationFragment.kt          |  8 +++++
 .../senderflow/SenderUploadFilesFragment.kt   |  4 +--
 .../senderflow/SenderVerificationFragment.kt  |  1 +
 .../viewmodel/FileTransferViewModel.kt        | 23 -------------
 .../viewmodel/PeerToPeerViewModel.kt          | 33 +++++++++++++++++++
 8 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 9de17215f..b10d4778a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -33,6 +33,7 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager.closeConnectionEvent
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
@@ -235,8 +236,10 @@ class TellaPeerToPeerServer(
                                 progressFile.bytesTransferred = bytesRead.toInt()
 
                                 // Optional: update session progress percent
-                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
-                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+                                val totalTransferred =
+                                    session.files.values.sumOf { it.bytesTransferred }
+                                val percent =
+                                    if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
 
                                 val state = UploadProgressState(
                                     title = session.title ?: "",
@@ -271,7 +274,10 @@ class TellaPeerToPeerServer(
                             )
                             PeerEventManager.onUploadProgressState(failedState)
 
-                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
+                            call.respond(
+                                HttpStatusCode.InternalServerError,
+                                "Upload failed: ${e.message}"
+                            )
                         } finally {
                             output.close()
                         }
@@ -281,7 +287,10 @@ class TellaPeerToPeerServer(
                         val payload = try {
                             call.receive<Map<String, String>>()
                         } catch (e: Exception) {
-                            call.respond(HttpStatusCode.BadRequest, "Missing or invalid JSON payload")
+                            call.respond(
+                                HttpStatusCode.BadRequest,
+                                "Missing or invalid JSON payload"
+                            )
                             return@post
                         }
 
@@ -309,10 +318,12 @@ class TellaPeerToPeerServer(
                         }
 
                         try {
-                            // ✅ Mark session as closed
                             p2PSharedState.session?.status = SessionStatus.CLOSED
                             serverSession = null
 
+                            launch {
+                                PeerEventManager.emitCloseConnection()
+                            }
                             call.respond(HttpStatusCode.OK, mapOf("success" to true))
                         } catch (e: Exception) {
                             Timber.e(e, "Error while closing session")
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 70261c75e..caf92a6b8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -20,6 +20,11 @@ object PeerEventManager {
         extraBufferCapacity = 1
     )
 
+    val closeConnectionEvent = MutableSharedFlow<Boolean>(
+        replay = 0,
+        extraBufferCapacity = 1
+    )
+
     // Replays the last actual registration request to new collectors
     private val _registrationRequests = MutableSharedFlow<Pair<String, PeerRegisterPayload>>(
         replay = 0,
@@ -52,6 +57,10 @@ object PeerEventManager {
         registrationEvents.emit(true)
     }
 
+    suspend fun emitCloseConnection() {
+        closeConnectionEvent.emit(true)
+    }
+
     // Trigger upload preparation request, storing the data separately
     suspend fun emitPrepareUploadRequest(request: PrepareUploadRequest): Boolean {
         val deferred = CompletableDeferred<Boolean>()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index b22245b23..f2dc75f81 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -23,7 +23,8 @@ import kotlin.math.roundToInt
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
-
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private lateinit var endView: PeerToPeerEndView
     private val progressPercentLiveData = MutableLiveData<Int>()
@@ -51,8 +52,7 @@ class RecipientUploadFilesFragment :
     }
 
     private fun showStopSharingConfirmation() {
-        showStandardSheet(
-            baseActivity.supportFragmentManager,
+        showStandardSheet(baseActivity.supportFragmentManager,
             getString(R.string.stop_sharing_files),
             getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
             getString(R.string.action_continue).uppercase(),
@@ -60,8 +60,7 @@ class RecipientUploadFilesFragment :
             onConfirmClick = {},
             onCancelClick = {
                 stopServerAndNavigate()
-            }
-        )
+            })
     }
 
     private fun stopServerAndNavigate() {
@@ -75,8 +74,7 @@ class RecipientUploadFilesFragment :
         val files = session.files.values.toList()
 
         endView = PeerToPeerEndView(
-            baseActivity,
-            session.title
+            baseActivity, session.title
         )
 
         endView.setFiles(files, MyApplication.isConnectedToInternet(baseActivity), false)
@@ -131,4 +129,5 @@ class RecipientUploadFilesFragment :
         }
     }
 
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index da42ca43a..6a0b64213 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.gson.Gson
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
@@ -17,6 +18,7 @@ import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class RecipientVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
 
@@ -70,6 +72,12 @@ class RecipientVerificationFragment :
                 navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
             }
         }
+
+        viewModel.closeConnection.observe(viewLifecycleOwner) { closeConnection ->
+            if (closeConnection) {
+                navigateBackAndStopServer()
+            }
+        }
     }
 
     private fun navigateBackAndStopServer() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 43d66cda9..6ce379e37 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -38,7 +38,8 @@ class SenderUploadFilesFragment :
                 {},
                 {
                     PeerToPeerFlags.cancelled = true
-                    baseActivity.finish()})
+                    baseActivity.finish()
+                })
         }
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { }
     }
@@ -67,7 +68,6 @@ class SenderUploadFilesFragment :
             val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
 
             if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
-                viewModel.closePeerConnection()
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
                 navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
             }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 139973954..24fbcc133 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -49,6 +49,7 @@ class SenderVerificationFragment :
         }
 
         binding.discardBtn.setOnClickListener {
+            viewModel.closePeerConnection()
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index f1b7f81d9..e6e95987e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -189,29 +189,6 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
-    fun closePeerConnection() {
-
-        viewModelScope.launch {
-            val ip = p2PSharedState.ip
-            val port = p2PSharedState.port
-            val fingerprint = p2PSharedState.hash
-
-            val success = peerClient.closeConnection(
-                ip = ip,
-                port = port,
-                expectedFingerprint = fingerprint,
-                sessionId = getSessionId()
-            )
-
-            if (success) {
-                Timber.d("Connection closed successfully.")
-            } else {
-                Timber.e("Failed to close peer connection.")
-            }
-        }
-    }
-
-
     private fun getVaultFilesFromState(): List<VaultFile> {
         return p2PSharedState.session?.files
             ?.values
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 023b44c25..84a5779ce 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -83,6 +83,9 @@ class PeerToPeerViewModel @Inject constructor(
     private val _bottomSheetProgress = MutableLiveData<BottomSheetProgressState>()
     val bottomSheetProgress: LiveData<BottomSheetProgressState> get() = _bottomSheetProgress
 
+    private val _closeConnection = SingleLiveEvent<Boolean>()
+    val closeConnection: SingleLiveEvent<Boolean> get() = _closeConnection
+
     private var isVaultSaveDone = false
 
     init {
@@ -110,6 +113,14 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+    private fun observeCloseConnectionEvents() {
+        viewModelScope.launch {
+            PeerEventManager.closeConnectionEvent.collect { success ->
+                _closeConnection.postValue(success)
+            }
+        }
+    }
+
     private fun observeRegistrationRequests() {
         viewModelScope.launch {
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
@@ -329,6 +340,28 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+    fun closePeerConnection() {
+
+        viewModelScope.launch {
+            val ip = p2PState.ip
+            val port = p2PState.port
+            val fingerprint = p2PState.hash
+
+            val success = peerClient.closeConnection(
+                ip = ip,
+                port = port,
+                expectedFingerprint = fingerprint,
+                sessionId = p2PState.session?.sessionId ?: ""
+            )
+
+            if (success) {
+                Timber.d("Connection closed successfully.")
+            } else {
+                Timber.e("Failed to close peer connection.")
+            }
+        }
+    }
+
 
     override fun onCleared() {
         super.onCleared()

From 6556dd726f6b5494a3cae1f0a904262c4322d554 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 19:58:27 +0100
Subject: [PATCH 110/153] fix error

---
 .../peertopeer/receipentflow/RecipientUploadFilesFragment.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index f2dc75f81..f41747b49 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -23,8 +23,7 @@ import kotlin.math.roundToInt
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
     BaseBindingFragment<FragmentUploadFilesBinding>(FragmentUploadFilesBinding::inflate) {
-    @Inject
-    lateinit var peerServerStarterManager: PeerServerStarterManager
+
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private lateinit var endView: PeerToPeerEndView
     private val progressPercentLiveData = MutableLiveData<Int>()

From 76956ac82b335b1f191d5fc49ea8b2ee1adcf9d2 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 21:48:07 +0100
Subject: [PATCH 111/153] Fix and improve flow

---
 .../mobile/certificate/CertificateUtils.kt    | 70 +++++++++++++++++++
 .../mobile/data/peertopeer/PeerKeyProvider.kt | 30 ++++++++
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  2 +-
 .../data/peertopeer/model/P2PSharedState.kt   | 12 ++++
 .../receipentflow/QRCodeFragment.kt           | 12 ++--
 .../senderflow/PrepareUploadFragment.kt       |  8 ++-
 .../senderflow/ScanQrCodeFragment.kt          |  6 +-
 .../senderflow/SenderVerificationFragment.kt  |  1 -
 .../viewmodel/PeerToPeerViewModel.kt          |  6 +-
 9 files changed, 135 insertions(+), 12 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerKeyProvider.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
index 25431735a..491f98727 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -1,12 +1,20 @@
 package org.horizontal.tella.mobile.certificate
 
 import android.util.Base64
+import org.bouncycastle.asn1.x500.X500Name
+import org.bouncycastle.asn1.x509.Extension
+import org.bouncycastle.asn1.x509.GeneralName
+import org.bouncycastle.asn1.x509.GeneralNames
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
 import java.math.BigInteger
 import java.security.KeyPair
 import java.security.SecureRandom
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.security.KeyStore
+import java.util.Date
 import java.util.UUID
 import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.SSLContext
@@ -15,6 +23,68 @@ import javax.net.ssl.X509TrustManager
 
 object CertificateUtils {
 
+
+    fun generateKeyPair(): KeyPair {
+        val keyPairGenerator = java.security.KeyPairGenerator.getInstance("RSA")
+        keyPairGenerator.initialize(2048)
+        return keyPairGenerator.generateKeyPair()
+    }
+
+    fun generateSelfSignedCertificate(keyPair: KeyPair): X509Certificate {
+        val certInfo = org.bouncycastle.x509.X509V3CertificateGenerator()
+        val now = java.util.Date()
+        val until = java.util.Date(now.time + 365L * 24 * 60 * 60 * 1000) // 1 year
+
+        val dnName = org.bouncycastle.jce.X509Principal("CN=Tella P2P, O=Tella, C=US")
+
+        certInfo.setSerialNumber(generateSerialNumber())
+        certInfo.setIssuerDN(dnName)
+        certInfo.setNotBefore(now)
+        certInfo.setNotAfter(until)
+        certInfo.setSubjectDN(dnName)
+        certInfo.setPublicKey(keyPair.public)
+        certInfo.setSignatureAlgorithm("SHA256WithRSAEncryption")
+
+        return certInfo.generate(keyPair.private) as X509Certificate
+    }
+
+    fun generateSelfSignedCertificate(keyPair: KeyPair, ipAddress: String): X509Certificate {
+        val now = Date()
+        val until = Date(now.time + 365L * 24 * 60 * 60 * 1000) // Valid for 1 year
+
+        val serial = BigInteger(128, SecureRandom())
+        val dn = X500Name("CN=Tella P2P, O=Tella, C=US")
+
+        val certBuilder = JcaX509v3CertificateBuilder(
+            dn,
+            serial,
+            now,
+            until,
+            dn,
+            keyPair.public
+        )
+
+        val san = GeneralNames(
+            GeneralName(GeneralName.iPAddress, ipAddress)
+        )
+
+        certBuilder.addExtension(
+            Extension.subjectAlternativeName,
+            false,
+            san
+        )
+
+        val signer = JcaContentSignerBuilder("SHA256WithRSAEncryption")
+            .build(keyPair.private)
+
+        val certHolder = certBuilder.build(signer)
+        return JcaX509CertificateConverter()
+            .setProvider(org.bouncycastle.jce.provider.BouncyCastleProvider())
+            .getCertificate(certHolder)
+    }
+
+
+
     fun generateSerialNumber(): BigInteger {
         return BigInteger(128, SecureRandom())
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerKeyProvider.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerKeyProvider.kt
new file mode 100644
index 000000000..8ab752fe7
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/PeerKeyProvider.kt
@@ -0,0 +1,30 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+import org.horizontal.tella.mobile.certificate.CertificateUtils
+import java.security.KeyPair
+import java.security.cert.X509Certificate
+
+object PeerKeyProvider {
+    private var keyPair: KeyPair? = null
+    private var certificate: X509Certificate? = null
+
+    fun getKeyPair(): KeyPair {
+        if (keyPair == null) {
+            keyPair = CertificateUtils.generateKeyPair()
+        }
+        return keyPair!!
+    }
+
+    fun getCertificate(ipAddress: String): X509Certificate {
+        if (certificate == null) {
+            certificate = CertificateUtils.generateSelfSignedCertificate(getKeyPair(), ipAddress)
+        }
+        return certificate!!
+    }
+
+    fun reset() {
+        keyPair = null
+        certificate = null
+    }
+}
+
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 03de12582..71bf9477f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -244,7 +244,7 @@ class TellaPeerToPeerClient @Inject constructor() {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.CLOSE)
 
         val payload = Json.encodeToString(mapOf("sessionId" to sessionId))
-        val requestBody = payload.toRequestBody(CONTENT_TYPE_JSON.toMediaType())
+        val requestBody = payload.toRequestBody()
 
         val client = getClientWithFingerprintValidation(expectedFingerprint)
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index 8a5052127..86d3a5095 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -10,6 +10,18 @@ class P2PSharedState(
     var isUsingManualConnection: Boolean = false,
 ) {
 
+    companion object {
+        fun P2PSharedState.Companion.createNewSession(): P2PSession {
+            return P2PSession(
+                sessionId = "",
+                title = "",
+                files = mutableMapOf(),
+                status = SessionStatus.SENDING
+            )
+        }
+    }
+
+
     fun clear() {
         ip = ""
         port = ""
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index 4ff05c9f9..bcad6808e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -11,6 +11,7 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import org.horizontal.tella.mobile.data.peertopeer.PeerKeyProvider
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
@@ -63,10 +64,10 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
     }
 
     private fun setupServerAndQr(ip: String) {
-        val (keyPair, certificate) = CertificateGenerator.generateCertificate(ipAddress = ip)
+        val keyPair = PeerKeyProvider.getKeyPair()
+        val certificate = PeerKeyProvider.getCertificate(ip)
         val config = KeyStoreConfig()
 
-
         val certHash = CertificateUtils.getPublicKeyHash(certificate)
         val pin = (100000..999999).random()
         val port = port
@@ -85,7 +86,6 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
             p2PSharedState
         )
 
-
         payload = PeerConnectionPayload(
             ipAddress = ip,
             port = port,
@@ -97,6 +97,7 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
         generateQrCode(qrPayload)
     }
 
+
     private fun generateQrCode(content: String) {
         try {
             val barcodeEncoder = BarcodeEncoder()
@@ -114,7 +115,10 @@ class QRCodeFragment : BaseBindingFragment<FragmentQrCodeBinding>(FragmentQrCode
 
     private fun handleBack() {
         binding.toolbar.backClickListener = { nav().popBackStack() }
-        binding.backBtn.setOnClickListener { nav().popBackStack() }
+        binding.backBtn.setOnClickListener {
+            peerServerStarterManager.stopServer()
+            nav().popBackStack()
+        }
     }
 
     private fun handleConnectManually() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 5f4ca2e51..14238904a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -18,6 +18,7 @@ import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.bus.EventObserver
 import org.horizontal.tella.mobile.bus.event.AudioRecordEvent
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSession
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
@@ -44,6 +45,7 @@ import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.IVaultFilesSelector
 import org.hzontal.shared_ui.bottomsheet.VaultSheetUtils.showVaultSelectFilesSheet
 import org.hzontal.shared_ui.utils.DialogUtils
+import javax.inject.Inject
 
 var PREPARE_UPLOAD_ENTRY = "PREPARE_UPLOAD_ENTRY"
 
@@ -61,6 +63,9 @@ class PrepareUploadFragment :
         ReportsFilesRecyclerViewAdapter(this)
     }
 
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setFragmentResultListener(BUNDLE_REPORT_AUDIO) { _, bundle ->
@@ -124,7 +129,8 @@ class PrepareUploadFragment :
                 object : BottomSheetUtils.ActionConfirmed {
                     override fun accept(isConfirmed: Boolean) {
                         if (isConfirmed) {
-                            back()
+                            peerServerStarterManager.stopServer()
+                            navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
                         }
                     }
                 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
index e98af9c0d..4c2c82264 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/ScanQrCodeFragment.kt
@@ -149,15 +149,15 @@ class ScanQrCodeFragment :
                     description,
                     null,
                     getString(R.string.try_again),
-                    null,
-                 {
+                    null
+                ) {
                     viewModel.startRegistration(
                         ip = viewModel.p2PState.ip,
                         port = viewModel.p2PState.port,
                         hash = viewModel.p2PState.hash,
                         pin = viewModel.p2PState.pin.toString()
                     )
-                })
+                }
             }
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 24fbcc133..139973954 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -49,7 +49,6 @@ class SenderVerificationFragment :
         }
 
         binding.discardBtn.setOnClickListener {
-            viewModel.closePeerConnection()
             navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 84a5779ce..70c7fa29d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -24,6 +24,7 @@ import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
+import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState.Companion.createNewSession
 import org.horizontal.tella.mobile.data.peertopeer.model.ProgressFile
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
@@ -187,6 +188,9 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
+                    if (p2PState.session == null) {
+                        p2PState.session = P2PSharedState.createNewSession()
+                    }
                     p2PState.session?.sessionId = result.sessionId
                     Timber.d("session id ***startRegistration ${p2PState.session?.sessionId}")
                     _registrationSuccess.postValue(true)
@@ -341,7 +345,6 @@ class PeerToPeerViewModel @Inject constructor(
     }
 
     fun closePeerConnection() {
-
         viewModelScope.launch {
             val ip = p2PState.ip
             val port = p2PState.port
@@ -353,7 +356,6 @@ class PeerToPeerViewModel @Inject constructor(
                 expectedFingerprint = fingerprint,
                 sessionId = p2PState.session?.sessionId ?: ""
             )
-
             if (success) {
                 Timber.d("Connection closed successfully.")
             } else {

From 83338048f5012494fef78360614cf09168c3d67a Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 24 Jul 2025 22:30:37 +0100
Subject: [PATCH 112/153] clean code

---
 .../tella/mobile/data/peertopeer/model/P2PSharedState.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
index 86d3a5095..f3b0a621a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/P2PSharedState.kt
@@ -11,7 +11,7 @@ class P2PSharedState(
 ) {
 
     companion object {
-        fun P2PSharedState.Companion.createNewSession(): P2PSession {
+        fun Companion.createNewSession(): P2PSession {
             return P2PSession(
                 sessionId = "",
                 title = "",

From 21559bf8c5e0eeddb00b77f802e7a33795e3e2ef Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 25 Jul 2025 11:33:12 +0100
Subject: [PATCH 113/153] Fix sheet progress

---
 .../receipentflow/RecipientUploadFilesFragment.kt          | 7 ++-----
 .../org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt  | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index f41747b49..6af420cce 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -28,6 +28,7 @@ class RecipientUploadFilesFragment :
     private lateinit var endView: PeerToPeerEndView
     private val progressPercentLiveData = MutableLiveData<Int>()
     private var sheetShown = false
+
     @Inject
     lateinit var peerServerStarterManager: PeerServerStarterManager
 
@@ -120,11 +121,7 @@ class RecipientUploadFilesFragment :
     private fun observeBottomSheetProgress() {
         viewModel.bottomSheetProgress.observe(viewLifecycleOwner) { progress ->
             if (!sheetShown) return@observe
-
-            // Convert percent to file count approximation
-            val totalFiles = viewModel.uploadProgress.value?.files?.size ?: return@observe
-            val filesSaved = (progress.percent * totalFiles / 100f).roundToInt()
-            progressPercentLiveData.value = filesSaved
+            progressPercentLiveData.postValue(progress.current)
         }
     }
 
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
index 19c397c0b..ae46487e6 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
@@ -724,7 +724,6 @@ object BottomSheetUtils {
         customSheetFragment.launch()
     }
 
-
     class ConfirmImageSheetHolder : PageHolder() {
         lateinit var actionButton: TextView
         lateinit var cancelButton: TextView

From 2451c65ec587fdc70bec9870ed7a72f68db412ca Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 25 Jul 2025 12:52:02 +0100
Subject: [PATCH 114/153] WIP fix manual connection

---
 mobile/build.gradle                           |  4 +-
 .../mobile/certificate/CertificateUtils.kt    | 88 +------------------
 .../data/peertopeer/FingerprintFetcher.kt     | 10 +--
 .../receipentflow/QRCodeFragment.kt           |  1 -
 .../RecipientVerificationFragment.kt          |  1 -
 .../receipentflow/WaitingReceiverFragment.kt  |  2 +
 .../SenderManualConnectionFragment.kt         | 24 +++--
 .../senderflow/SenderVerificationFragment.kt  |  2 +
 8 files changed, 34 insertions(+), 98 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 6b98157d2..99ad9a437 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,8 +15,8 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 204
-        versionName "2.16.0"
+        versionCode 205
+        versionName "3.0.0"
         multiDexEnabled true
 
         ndk {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
index 491f98727..9faff41b7 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -30,24 +30,6 @@ object CertificateUtils {
         return keyPairGenerator.generateKeyPair()
     }
 
-    fun generateSelfSignedCertificate(keyPair: KeyPair): X509Certificate {
-        val certInfo = org.bouncycastle.x509.X509V3CertificateGenerator()
-        val now = java.util.Date()
-        val until = java.util.Date(now.time + 365L * 24 * 60 * 60 * 1000) // 1 year
-
-        val dnName = org.bouncycastle.jce.X509Principal("CN=Tella P2P, O=Tella, C=US")
-
-        certInfo.setSerialNumber(generateSerialNumber())
-        certInfo.setIssuerDN(dnName)
-        certInfo.setNotBefore(now)
-        certInfo.setNotAfter(until)
-        certInfo.setSubjectDN(dnName)
-        certInfo.setPublicKey(keyPair.public)
-        certInfo.setSignatureAlgorithm("SHA256WithRSAEncryption")
-
-        return certInfo.generate(keyPair.private) as X509Certificate
-    }
-
     fun generateSelfSignedCertificate(keyPair: KeyPair, ipAddress: String): X509Certificate {
         val now = Date()
         val until = Date(now.time + 365L * 24 * 60 * 60 * 1000) // Valid for 1 year
@@ -56,12 +38,7 @@ object CertificateUtils {
         val dn = X500Name("CN=Tella P2P, O=Tella, C=US")
 
         val certBuilder = JcaX509v3CertificateBuilder(
-            dn,
-            serial,
-            now,
-            until,
-            dn,
-            keyPair.public
+            dn, serial, now, until, dn, keyPair.public
         )
 
         val san = GeneralNames(
@@ -69,22 +46,17 @@ object CertificateUtils {
         )
 
         certBuilder.addExtension(
-            Extension.subjectAlternativeName,
-            false,
-            san
+            Extension.subjectAlternativeName, false, san
         )
 
-        val signer = JcaContentSignerBuilder("SHA256WithRSAEncryption")
-            .build(keyPair.private)
+        val signer = JcaContentSignerBuilder("SHA256WithRSAEncryption").build(keyPair.private)
 
         val certHolder = certBuilder.build(signer)
-        return JcaX509CertificateConverter()
-            .setProvider(org.bouncycastle.jce.provider.BouncyCastleProvider())
+        return JcaX509CertificateConverter().setProvider(org.bouncycastle.jce.provider.BouncyCastleProvider())
             .getCertificate(certHolder)
     }
 
 
-
     fun generateSerialNumber(): BigInteger {
         return BigInteger(128, SecureRandom())
     }
@@ -94,63 +66,11 @@ object CertificateUtils {
         return "-----BEGIN CERTIFICATE-----\n$encoded\n-----END CERTIFICATE-----"
     }
 
-    fun pemToCertificate(pemString: String): X509Certificate {
-        val cleanPem = pemString
-            .replace("-----BEGIN CERTIFICATE-----", "")
-            .replace("-----END CERTIFICATE-----", "")
-            .replace("\\s".toRegex(), "")
-        val decoded = Base64.decode(cleanPem, Base64.DEFAULT)
-        val certFactory = CertificateFactory.getInstance("X.509")
-        return certFactory.generateCertificate(decoded.inputStream()) as X509Certificate
-    }
-
-    fun encodeBase64(data: ByteArray): String =
-        Base64.encodeToString(data, Base64.NO_WRAP)
-
-    fun decodeBase64(encodedString: String): ByteArray =
-        Base64.decode(encodedString, Base64.NO_WRAP)
-
-
     fun getPublicKeyHash(certificate: X509Certificate): String {
         val digest = java.security.MessageDigest.getInstance("SHA-256")
         val hash = digest.digest(certificate.encoded)
         return hash.joinToString("") { "%02x".format(it) } // <-- fix here
     }
 
-    fun createSSLContext(
-        keyPair: KeyPair,
-        certificate: X509Certificate
-    ): SSLContext {
-        val keyStore = KeyStore.getInstance("PKCS12")
-        val keyPassword =  UUID.randomUUID().toString()
-        keyStore.load(null, null)
-        keyStore.setKeyEntry(
-            "alias",
-            keyPair.private,
-            keyPassword.toCharArray(),
-            arrayOf(certificate)
-        )
 
-        val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
-        kmf.init(keyStore, keyPassword.toCharArray())
-
-        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        tmf.init(keyStore)
-
-        val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
-
-        return sslContext
-    }
-
-    fun getTrustManager(certificate: X509Certificate): X509TrustManager {
-        val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
-        keyStore.load(null, null)
-        keyStore.setCertificateEntry("alias", certificate)
-
-        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        tmf.init(keyStore)
-
-        return tmf.trustManagers[0] as X509TrustManager
-    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
index fbe1832d3..f9bdd7f35 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -15,11 +15,11 @@ object FingerprintFetcher {
 
     suspend fun fetch(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
         return@withContext try {
-            val socket = createUnsafeSSLSocket(ip, port)
-            val cert = socket.session.peerCertificates[0] as X509Certificate
-            val fingerprint = CertificateUtils.getPublicKeyHash(cert)
-            socket.close()
-            Result.success(fingerprint)
+            createUnsafeSSLSocket(ip, port).use { socket ->
+                val cert = socket.session.peerCertificates[0] as X509Certificate
+                val fingerprint = CertificateUtils.getPublicKeyHash(cert)
+                Result.success(fingerprint)
+            }
         } catch (e: SocketTimeoutException) {
             Result.failure(RuntimeException("Connection timed out", e))
         } catch (e: Exception) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
index bcad6808e..dfa44db63 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/QRCodeFragment.kt
@@ -9,7 +9,6 @@ import com.google.zxing.BarcodeFormat
 import com.google.zxing.WriterException
 import com.journeyapps.barcodescanner.BarcodeEncoder
 import dagger.hilt.android.AndroidEntryPoint
-import org.horizontal.tella.mobile.certificate.CertificateGenerator
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.PeerKeyProvider
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 6a0b64213..c65daeeb2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -24,7 +24,6 @@ class RecipientVerificationFragment :
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var payload: PeerConnectionPayload? = null
-
     @Inject
     lateinit var peerServerStarterManager: PeerServerStarterManager
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index e9d396242..3a234cbc0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
@@ -14,6 +15,7 @@ import org.hzontal.shared_ui.utils.DialogUtils
  * Created by wafa on 3/6/2025.
  */
 
+@AndroidEntryPoint
 class WaitingReceiverFragment :
     BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index 345c819a8..b5053820f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -5,22 +5,32 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.PeerKeyProvider
+import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import org.hzontal.shared_ui.bottomsheet.KeyboardUtil
 import org.hzontal.shared_ui.utils.DialogUtils
+import javax.inject.Inject
 
-// TODO: Show errors in the bottom sheet
+@AndroidEntryPoint
 class SenderManualConnectionFragment :
     BaseBindingFragment<SenderManualConnectionBinding>(SenderManualConnectionBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
+    @Inject
+    lateinit var peerServerStarterManager: PeerServerStarterManager
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        peerServerStarterManager.stopServer()
+        PeerKeyProvider.reset()
+        viewModel.p2PState.clear()
         initView()
         initListeners()
         initObservers()
@@ -70,10 +80,14 @@ class SenderManualConnectionFragment :
                 description,
                 null,
                 getString(R.string.try_again),
-                null,
-             {
-                 viewModel.handleCertificate(viewModel.p2PState.ip, viewModel.p2PState.port, viewModel.p2PState.pin.toString())
-             })
+                null
+            ) {
+                viewModel.handleCertificate(
+                    viewModel.p2PState.ip,
+                    viewModel.p2PState.port,
+                    viewModel.p2PState.pin.toString()
+                )
+            }
         }
     }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 139973954..142745212 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
@@ -14,6 +15,7 @@ import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import org.hzontal.shared_ui.utils.DialogUtils
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class SenderVerificationFragment :
     BaseBindingFragment<ConnectManuallyVerificationBinding>(ConnectManuallyVerificationBinding::inflate) {
 

From e5cc6a50dc15af7aca96fe305040191a2148da4b Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 29 Jul 2025 17:10:17 +0100
Subject: [PATCH 115/153] Fix wifi problem

---
 .../tella/mobile/util/ConnectionType.kt       | 35 ++-----------------
 .../RecipientUploadFilesFragment.kt           |  1 -
 .../vault/attachements/AttachmentsFragment.kt |  1 -
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
index 411da5c58..8ec1e9b82 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
@@ -6,7 +6,6 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.net.wifi.WifiManager
 import android.os.Build
-import android.text.format.Formatter
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
@@ -50,29 +49,19 @@ class NetworkInfoManager(private val context: Context) {
                     context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
 
                 val wifiInfo = wifiManager?.connectionInfo
-
                 val ssid = when {
                     wifiInfo?.ssid != null && wifiInfo.ssid != WifiManager.UNKNOWN_SSID ->
                         wifiInfo.ssid.trim('"')
-
-                    else -> "Unknown WiFi (check location permissions)"
-                }
-
-                val ipAddress = wifiInfo?.ipAddress?.let {
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                        Formatter.formatIpAddress(it)
-                    } else {
-                        // Provide fallback logic if needed for newer APIs
-                        getLocalIpAddress()
-                    }
+                    else -> "Unknown WiFi"
                 }
 
+                val ipAddress = getLocalIpAddress()
                 _networkInfo.postValue(NetworkInfo(ConnectionType.WIFI, ssid, ipAddress))
             }
 
             isDeviceHotspotEnabled(context) -> {
                 val hotspotSSID = getDeviceHotspotSSID(context) ?: "Hotspot"
-                val hotspotIpAddress = getDeviceHotspotIpAddress()
+                val hotspotIpAddress = getLocalIpAddress() // more reliable than hardcoded
                 _networkInfo.postValue(NetworkInfo(ConnectionType.HOTSPOT, hotspotSSID, hotspotIpAddress))
             }
 
@@ -115,24 +104,6 @@ class NetworkInfoManager(private val context: Context) {
         }
     }
 
-    private fun getDeviceHotspotIpAddress(): String? {
-        return try {
-            val interfaces = NetworkInterface.getNetworkInterfaces()
-            for (intf in interfaces) {
-                if (!intf.isUp || intf.isLoopback) continue
-                for (addr in intf.inetAddresses) {
-                    if (!addr.isLoopbackAddress && addr is Inet4Address) {
-                        return addr.hostAddress
-                    }
-                }
-            }
-            null
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
     private fun getLocalIpAddress(): String? {
         return try {
             NetworkInterface.getNetworkInterfaces().toList().flatMap { it.inetAddresses.toList() }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 6af420cce..f9740faa5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -125,5 +125,4 @@ class RecipientUploadFilesFragment :
         }
     }
 
-
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsFragment.kt
index 6b2cb5435..370a01dc4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/attachements/AttachmentsFragment.kt
@@ -322,7 +322,6 @@ class AttachmentsFragment :
     private fun createVaultManageFilesAction(): VaultSheetUtils.IVaultManageFiles {
         return object : VaultSheetUtils.IVaultManageFiles {
             override fun goToCamera() {
-
                 val intent = Intent(activity, CameraActivity::class.java)
                 intent.putExtra(VAULT_CURRENT_ROOT_PARENT, currentRootID)
                 baseActivity.startActivity(intent)

From 8208b23d7d75b0c3cb5f159d7264c626ee24774c Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 31 Jul 2025 11:59:27 +0100
Subject: [PATCH 116/153] Fix wifi

---
 .../data/peertopeer/FingerprintFetcher.kt     | 38 +++++++++++++------
 .../viewmodel/PeerToPeerViewModel.kt          |  2 +-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
index f9bdd7f35..007e29c05 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -1,21 +1,22 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import java.net.Socket
 import java.net.SocketTimeoutException
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.X509TrustManager
+import javax.net.ssl.*
 
 object FingerprintFetcher {
 
-    suspend fun fetch(ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
+    suspend fun fetch(context: Context, ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
         return@withContext try {
-            createUnsafeSSLSocket(ip, port).use { socket ->
+            createBoundSSLSocket(context, ip, port).use { socket ->
                 val cert = socket.session.peerCertificates[0] as X509Certificate
                 val fingerprint = CertificateUtils.getPublicKeyHash(cert)
                 Result.success(fingerprint)
@@ -27,14 +28,29 @@ object FingerprintFetcher {
         }
     }
 
-    private fun createUnsafeSSLSocket(ip: String, port: Int): SSLSocket {
+    private fun createBoundSSLSocket(context: Context, ip: String, port: Int): SSLSocket {
         val sslContext = SSLContext.getInstance("TLS")
         sslContext.init(null, arrayOf(TrustAllCerts()), SecureRandom())
         val factory = sslContext.socketFactory as SSLSocketFactory
-        val socket = factory.createSocket(ip, port) as SSLSocket
-        socket.soTimeout = 5000
-        socket.startHandshake()
-        return socket
+
+        // Create plain socket
+        val plainSocket: Socket = factory.createSocket() as SSLSocket
+        plainSocket.soTimeout = 5000
+
+        // Bind to Wi-Fi network if available
+        val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        connectivityManager.allNetworks.firstOrNull { network ->
+            connectivityManager.getNetworkCapabilities(network)
+                ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+        }?.bindSocket(plainSocket)
+
+        // Connect and handshake
+        plainSocket.connect(java.net.InetSocketAddress(ip, port), 5000)
+        (plainSocket as SSLSocket).startHandshake()
+
+        return plainSocket
     }
 
     class TrustAllCerts : X509TrustManager {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 70c7fa29d..97b8c4547 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -140,7 +140,7 @@ class PeerToPeerViewModel @Inject constructor(
 
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
-            val result = FingerprintFetcher.fetch(ip, port.toInt())
+            val result = FingerprintFetcher.fetch(context,ip, port.toInt())
             result.onSuccess { hash ->
                 Timber.d("hash ***** $hash")
                 p2PState.hash = hash

From e3c9d2c16381408708e650ce78d754fb18036cfc Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 1 Aug 2025 16:45:58 +0100
Subject: [PATCH 117/153] add the wifi screen in the sender

---
 .../tella/mobile/util/NavigationManager.kt       |  2 +-
 .../peertopeer/StartNearBySharingFragment.kt     | 16 ++++++++++++++--
 .../receipentflow/ConnectHotspotFragment.kt      |  4 ++++
 .../main/res/navigation/peer_to_peer_graph.xml   |  6 +++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 2da9a9e9a..847dab4fc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -179,7 +179,7 @@ class NavigationManager(
     }
 
     fun navigateFromActionConnectHotspotScreenToScanQrCodeScreen() {
-        navigateToWithBundle(R.id.action_startNearBySharingFragment_to_scanQrCodeScreen)
+        navigateToWithBundle(R.id.action_connectHotspotScreen_to_scanQrCodeScreen)
     }
 
     fun navigateFromScanQrCodeToDeviceInfo() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
index 558712df8..b9c9fd015 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/StartNearBySharingFragment.kt
@@ -2,15 +2,19 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.StartNearBySharingFragmentBinding
 import org.horizontal.tella.mobile.util.Util
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
+import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmentBinding>(
     StartNearBySharingFragmentBinding::inflate
 ) {
+    private val viewModel: PeerToPeerViewModel by activityViewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -44,8 +48,16 @@ class StartNearBySharingFragment : BaseBindingFragment<StartNearBySharingFragmen
     private fun onNextClicked() {
         with(binding) {
             when {
-                sendFilesBtn.isChecked -> navManager().navigateFromActionConnectHotspotScreenToScanQrCodeScreen()
-                receiveFilesBtn.isChecked -> navManager().navigateFromStartNearBySharingFragmentToConnectHotspotFragment()
+                sendFilesBtn.isChecked -> {
+                    viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
+                    navManager().navigateFromStartNearBySharingFragmentToConnectHotspotFragment()
+                }
+
+                receiveFilesBtn.isChecked -> {
+                    viewModel.peerToPeerParticipant = PeerToPeerParticipant.RECIPIENT
+                    navManager().navigateFromStartNearBySharingFragmentToConnectHotspotFragment()
+                }
+
                 else -> {}
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 501707d97..d1e971b72 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -29,6 +29,7 @@ import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
 import org.horizontal.tella.mobile.util.ConnectionType
 import org.horizontal.tella.mobile.util.LocationProvider.isLocationEnabled
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
 
 @AndroidEntryPoint
@@ -101,7 +102,10 @@ class ConnectHotspotFragment :
     }
 
     private fun onNextClicked() {
+        if(viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
         navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
+        else navManager().navigateFromActionConnectHotspotScreenToScanQrCodeScreen()
+
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index 9b49f653d..c399df0aa 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -14,9 +14,6 @@
             android:id="@+id/action_startNearBySharingFragment_to_connectHotspotFragment"
             app:destination="@id/connectHotspotScreen" />
 
-        <action
-            android:id="@+id/action_startNearBySharingFragment_to_scanQrCodeScreen"
-            app:destination="@id/scanQrCodeScreen" />
     </fragment>
 
     <fragment
@@ -28,6 +25,9 @@
         <action
             android:id="@+id/action_connectHotspotScreen_to_qrCodeScreen"
             app:destination="@id/qrCodeScreen" />
+        <action
+            android:id="@+id/action_connectHotspotScreen_to_scanQrCodeScreen"
+            app:destination="@id/scanQrCodeScreen" />
 
     </fragment>
 

From 2c62374c50e674a7d1f789fce2de61672345696a Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 8 Aug 2025 14:55:50 +0100
Subject: [PATCH 118/153] fix thumbnail issue between ios and android

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |  6 +---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 31 +++++++------------
 .../tella/mobile/domain/peertopeer/P2PFile.kt | 13 ++++----
 .../senderflow/PrepareUploadFragment.kt       |  2 +-
 .../uwazi/widgets/PeerToPeerEndView.java      |  2 +-
 5 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 71bf9477f..88cae752e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -5,10 +5,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -141,7 +137,7 @@ class TellaPeerToPeerClient @Inject constructor() {
                 size = it.size,
                 fileType = mimeType,
                 sha256 = it.hash,
-                thumb = it.thumb
+                thumbnail = it.thumb
             )
         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index b10d4778a..606ddba17 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -68,27 +68,25 @@ class TellaPeerToPeerServer(
         val keyStore = KeyStore.getInstance("PKCS12").apply {
             load(null, null)
             setKeyEntry(
-                keyStoreConfig.alias,
-                keyPair.private,
-                keyStoreConfig.password,
-                arrayOf(certificate)
+                keyStoreConfig.alias, keyPair.private, keyStoreConfig.password, arrayOf(certificate)
             )
         }
 
         engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
-            sslConnector(
-                keyStore = keyStore,
+            sslConnector(keyStore = keyStore,
                 keyAlias = keyStoreConfig.alias,
                 keyStorePassword = { keyStoreConfig.password },
-                privateKeyPassword = { keyStoreConfig.password }
-            ) {
+                privateKeyPassword = { keyStoreConfig.password }) {
                 this.host = ip
                 this.port = serverPort
             }
 
             module {
                 install(ContentNegotiation) {
-                    json()
+                    json(kotlinx.serialization.json.Json {
+                        ignoreUnknownKeys = true
+                        isLenient = true
+                    })
                 }
                 routing {
                     // Root route to confirm the server is running
@@ -135,8 +133,7 @@ class TellaPeerToPeerServer(
 
                         if (!accepted) {
                             call.respond(
-                                HttpStatusCode.Forbidden,
-                                "Receiver rejected the registration"
+                                HttpStatusCode.Forbidden, "Receiver rejected the registration"
                             )
                             return@post
                         }
@@ -175,14 +172,12 @@ class TellaPeerToPeerServer(
                             val responseFiles = request.files.map { file ->
                                 val transmissionId = UUID.randomUUID().toString()
                                 val receivingFile = ProgressFile(
-                                    file = file,
-                                    transmissionId = transmissionId
+                                    file = file, transmissionId = transmissionId
                                 )
                                 session.files[transmissionId] = receivingFile
 
                                 FileInfo(
-                                    id = file.id,
-                                    transmissionId = transmissionId
+                                    id = file.id, transmissionId = transmissionId
                                 )
                             }
 
@@ -275,8 +270,7 @@ class TellaPeerToPeerServer(
                             PeerEventManager.onUploadProgressState(failedState)
 
                             call.respond(
-                                HttpStatusCode.InternalServerError,
-                                "Upload failed: ${e.message}"
+                                HttpStatusCode.InternalServerError, "Upload failed: ${e.message}"
                             )
                         } finally {
                             output.close()
@@ -288,8 +282,7 @@ class TellaPeerToPeerServer(
                             call.receive<Map<String, String>>()
                         } catch (e: Exception) {
                             call.respond(
-                                HttpStatusCode.BadRequest,
-                                "Missing or invalid JSON payload"
+                                HttpStatusCode.BadRequest, "Missing or invalid JSON payload"
                             )
                             return@post
                         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
index c4a6db2d8..8af3d75e5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
@@ -9,7 +9,8 @@ data class P2PFile(
     val size: Long,
     val fileType: String,
     val sha256: String,
-    val thumb: ByteArray? = null
+    @Serializable(with = ByteArrayFlexibleSerializer::class)
+    val thumbnail: ByteArray? = null
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -22,10 +23,10 @@ data class P2PFile(
         if (size != other.size) return false
         if (fileType != other.fileType) return false
         if (sha256 != other.sha256) return false
-        if (thumb != null) {
-            if (other.thumb == null) return false
-            if (!thumb.contentEquals(other.thumb)) return false
-        } else if (other.thumb != null) return false
+        if (thumbnail != null) {
+            if (other.thumbnail == null) return false
+            if (!thumbnail.contentEquals(other.thumbnail)) return false
+        } else if (other.thumbnail != null) return false
 
         return true
     }
@@ -36,7 +37,7 @@ data class P2PFile(
         result = 31 * result + size.hashCode()
         result = 31 * result + fileType.hashCode()
         result = 31 * result + sha256.hashCode()
-        result = 31 * result + (thumb?.contentHashCode() ?: 0)
+        result = 31 * result + (thumbnail?.contentHashCode() ?: 0)
         return result
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 14238904a..84aa8b295 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -288,7 +288,7 @@ class PrepareUploadFragment :
                             size = vaultFile.size,
                             fileType = vaultFile.mimeType ?: "application/octet-stream",
                             sha256 = vaultFile.hash,
-                            thumb = vaultFile.thumb ?: ByteArray(0)
+                            thumbnail = vaultFile.thumb ?: ByteArray(0)
                         )
 
                         val progressFile = ProgressFile(
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
index b7ff9407b..3a80788d4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/uwazi/widgets/PeerToPeerEndView.java
@@ -164,7 +164,7 @@ private View createProgressFileItemView(@NonNull ProgressFile file, boolean offl
 
         byte[] thumb = file.getVaultFile() != null && file.getVaultFile().thumb != null
                 ? file.getVaultFile().thumb
-                : file.getFile().getThumb();
+                : file.getFile().getThumbnail();
 
         if (thumb != null) {
             Glide.with(getContext())

From 12d0f56e6ed8a1e02ad1a315e53e475fcbd3c410 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 8 Aug 2025 15:54:31 +0100
Subject: [PATCH 119/153] fix T-And-1697 - Get connected screen is showing an
 incorrect text

---
 mobile/src/main/res/layout/connect_hotspot_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
index 6aeb8f75d..2d57d9188 100644
--- a/mobile/src/main/res/layout/connect_hotspot_layout.xml
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -58,7 +58,7 @@
         android:layout_marginTop="@dimen/activity_horizontal_small_margin"
         android:gravity="start"
         android:paddingHorizontal="@dimen/activity_horizontal_margin"
-        android:text="@string/verify_sequence_match"
+        android:text="@string/wifi_connection_instruction"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"

From c90333d423b6500aacf1fe54a46d2ce2ea09f271 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 18 Aug 2025 14:11:06 +0100
Subject: [PATCH 120/153] add byteArrayFlexibleSerializer

---
 .../peertopeer/ByteArrayFlexibleSerializer.kt | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/ByteArrayFlexibleSerializer.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/ByteArrayFlexibleSerializer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/ByteArrayFlexibleSerializer.kt
new file mode 100644
index 000000000..a2264763f
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/ByteArrayFlexibleSerializer.kt
@@ -0,0 +1,57 @@
+package org.horizontal.tella.mobile.domain.peertopeer
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.*
+import kotlinx.serialization.json.*
+import java.util.Base64 // On Android <26, switch to android.util.Base64
+
+object ByteArrayFlexibleSerializer : KSerializer<ByteArray> {
+    override val descriptor: SerialDescriptor =
+        PrimitiveSerialDescriptor("ByteArrayFlexible", PrimitiveKind.STRING)
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun serialize(encoder: Encoder, value: ByteArray) {
+        // Always serialize as Base64 string to keep responses compact/consistent
+        val b64 = Base64.getEncoder().encodeToString(value)
+        encoder.encodeString(b64)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun deserialize(decoder: Decoder): ByteArray {
+        if (decoder !is JsonDecoder)
+            throw SerializationException("Expected JsonDecoder")
+
+        val el = decoder.decodeJsonElement()
+        return when (el) {
+            is JsonPrimitive -> {
+                // Base64 string
+                val s = el.content
+                try {
+                    Base64.getDecoder().decode(s)
+                } catch (e: Exception) {
+                    throw SerializationException("Invalid Base64 in thumbnail", e)
+                }
+            }
+            is JsonArray -> {
+                // [0..255, 0..255, ...]
+                val out = ByteArray(el.size)
+                el.forEachIndexed { i, jp ->
+                    val n = jp.jsonPrimitive.int
+                    // clamp to 0..255 and convert to signed byte
+                    val b = (n.coerceIn(0, 255) and 0xFF).toByte()
+                    out[i] = b
+                }
+                out
+            }
+            is JsonNull -> {
+                // shouldn't reach here for non-null type; handled by .nullable wrapper
+                throw SerializationException("thumbnail was null")
+            }
+            else -> throw SerializationException("thumbnail must be Base64 string or int[]")
+        }
+    }
+}
\ No newline at end of file

From e835c989d57bfc9dd6e004691e0155f5b2d7f85f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 18 Aug 2025 14:11:51 +0100
Subject: [PATCH 121/153] wip handle success uploading file in the sender side

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  5 ++++
 .../domain/peertopeer/PeerEventManager.kt     |  6 +++++
 .../viewmodel/FileTransferViewModel.kt        | 24 ++++++++++---------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 606ddba17..6f6d7c157 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -248,6 +248,11 @@ class TellaPeerToPeerServer(
                             progressFile.status = P2PFileStatus.FINISHED
                             progressFile.path = tmpFile.path
 
+                            //  Check if every file for the session is finished
+                            if (session.files.values.all { it.status == P2PFileStatus.FINISHED }) {
+                                PeerEventManager.emitAllFilesReceived()
+                            }
+
                             val finalState = UploadProgressState(
                                 title = session.title ?: "",
                                 percent = 100,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index caf92a6b8..5192cc3bd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -47,6 +47,12 @@ object PeerEventManager {
     private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 0)
     val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
 
+    private val _allFilesReceivedEvents = MutableSharedFlow<Unit>(replay = 0, extraBufferCapacity = 1)
+    val allFilesReceivedEvents = _allFilesReceivedEvents.asSharedFlow()
+
+    suspend fun emitAllFilesReceived() {
+        _allFilesReceivedEvents.emit(Unit)
+    }
     // Upload progress
     suspend fun onUploadProgressState(state: UploadProgressState) {
         _uploadProgressStateFlow.emit(state)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index e6e95987e..0dce57a62 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -20,6 +20,7 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
+import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
@@ -175,17 +176,18 @@ class FileTransferViewModel @Inject constructor(
                 )
             }
 
-            session.status = SessionStatus.FINISHED
-
-            // Final update after all uploads complete
-            _uploadProgress.postValue(
-                UploadProgressState(
-                    title = session.title ?: "",
-                    percent = 100,
-                    sessionStatus = session.status,
-                    files = session.files.values.toList()
-                )
-            )
+            // Instead: wait for the server event confirming all files were saved
+                PeerEventManager.allFilesReceivedEvents.collect {
+                    session.status = SessionStatus.FINISHED
+                    _uploadProgress.postValue(
+                        UploadProgressState(
+                            title = session.title ?: "",
+                            percent = 100,
+                            sessionStatus = session.status,
+                            files = session.files.values.toList()
+                        )
+                    )
+                }
         }
     }
 

From 8c7a856c39720597e45600a1c2118b1ad746f642 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 21 Aug 2025 11:39:49 +0100
Subject: [PATCH 122/153] Revert "wip handle success uploading file in the
 sender side"

This reverts commit e835c989d57bfc9dd6e004691e0155f5b2d7f85f.
---
 .../data/peertopeer/TellaPeerToPeerServer.kt  |  5 ----
 .../domain/peertopeer/PeerEventManager.kt     |  6 -----
 .../viewmodel/FileTransferViewModel.kt        | 24 +++++++++----------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 6f6d7c157..606ddba17 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -248,11 +248,6 @@ class TellaPeerToPeerServer(
                             progressFile.status = P2PFileStatus.FINISHED
                             progressFile.path = tmpFile.path
 
-                            //  Check if every file for the session is finished
-                            if (session.files.values.all { it.status == P2PFileStatus.FINISHED }) {
-                                PeerEventManager.emitAllFilesReceived()
-                            }
-
                             val finalState = UploadProgressState(
                                 title = session.title ?: "",
                                 percent = 100,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 5192cc3bd..caf92a6b8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -47,12 +47,6 @@ object PeerEventManager {
     private val _uploadProgressStateFlow = MutableSharedFlow<UploadProgressState>(replay = 0)
     val uploadProgressStateFlow = _uploadProgressStateFlow.asSharedFlow()
 
-    private val _allFilesReceivedEvents = MutableSharedFlow<Unit>(replay = 0, extraBufferCapacity = 1)
-    val allFilesReceivedEvents = _allFilesReceivedEvents.asSharedFlow()
-
-    suspend fun emitAllFilesReceived() {
-        _allFilesReceivedEvents.emit(Unit)
-    }
     // Upload progress
     suspend fun onUploadProgressState(state: UploadProgressState) {
         _uploadProgressStateFlow.emit(state)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 0dce57a62..e6e95987e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -20,7 +20,6 @@ import org.horizontal.tella.mobile.data.peertopeer.model.P2PFileStatus
 import org.horizontal.tella.mobile.data.peertopeer.model.P2PSharedState
 import org.horizontal.tella.mobile.data.peertopeer.model.SessionStatus
 import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadResult
-import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.media.MediaFileHandler
 import org.horizontal.tella.mobile.util.Event
@@ -176,18 +175,17 @@ class FileTransferViewModel @Inject constructor(
                 )
             }
 
-            // Instead: wait for the server event confirming all files were saved
-                PeerEventManager.allFilesReceivedEvents.collect {
-                    session.status = SessionStatus.FINISHED
-                    _uploadProgress.postValue(
-                        UploadProgressState(
-                            title = session.title ?: "",
-                            percent = 100,
-                            sessionStatus = session.status,
-                            files = session.files.values.toList()
-                        )
-                    )
-                }
+            session.status = SessionStatus.FINISHED
+
+            // Final update after all uploads complete
+            _uploadProgress.postValue(
+                UploadProgressState(
+                    title = session.title ?: "",
+                    percent = 100,
+                    sessionStatus = session.status,
+                    files = session.files.values.toList()
+                )
+            )
         }
     }
 

From 267967ece1ad84fb116762e2dc46994c88e611c6 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 21 Aug 2025 18:52:11 +0100
Subject: [PATCH 123/153] Fix hotspot shared for registartion issue

---
 .../mobile/certificate/CertificateUtils.kt    |   3 +-
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 197 ++++++++++--------
 .../data/peertopeer/TellaPeerToPeerServer.kt  |   1 -
 .../fragment/peertopeer/di/PeerModule.kt      |   6 +-
 4 files changed, 120 insertions(+), 87 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
index 9faff41b7..3d0f67f9b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/certificate/CertificateUtils.kt
@@ -71,6 +71,5 @@ object CertificateUtils {
         val hash = digest.digest(certificate.encoded)
         return hash.joinToString("") { "%02x".format(it) } // <-- fix here
     }
-
-
+    
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 88cae752e..996d3820e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -1,5 +1,12 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
 import com.hzontal.tella_vault.VaultFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -28,64 +35,43 @@ import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
-class TellaPeerToPeerClient @Inject constructor() {
+class TellaPeerToPeerClient @Inject constructor(
+    @ApplicationContext private val appContext: Context
+) {
 
-    private fun getClientWithFingerprintValidation(expectedFingerprint: String): OkHttpClient {
-        val trustManager = object : X509TrustManager {
-            override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
-
-            override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String?) {}
-
-            override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String?) {
-                val serverCert = chain[0]
-                val actualFingerprint = CertificateUtils.getPublicKeyHash(serverCert)
-
-                if (!actualFingerprint.equals(expectedFingerprint, ignoreCase = true)) {
-                    throw CertificateException(
-                        "Server certificate fingerprint mismatch.\nExpected: $expectedFingerprint\nGot: $actualFingerprint"
-                    )
-                }
-            }
-        }
-
-        val sslContext = SSLContext.getInstance("TLS").apply {
-            init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
-        }
-
-        return OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS)
-            .sslSocketFactory(sslContext.socketFactory, trustManager).build()
-    }
+    // ---------------- Public API (unchanged) ----------------
 
     suspend fun registerPeerDevice(
         ip: String,
         port: String,
-        expectedFingerprint: String,
+        expectedFingerprint: String, // DER SHA-256 HEX from getPublicKeyHash
         pin: String,
     ): RegisterPeerResult = withContext(Dispatchers.IO) {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
         Timber.d("Connecting to: $url")
 
         val payload = PeerRegisterPayload(
-            pin = pin, nonce = UUID.randomUUID().toString()
+            pin = pin.trim(),
+            nonce = UUID.randomUUID().toString()
         )
 
         val jsonPayload = Json.encodeToString(payload)
         val requestBody = jsonPayload.toRequestBody()
-        val client = getClientWithFingerprintValidation(expectedFingerprint)
+        val client = getClientWithFingerprintValidation(ip, expectedFingerprint)
 
-        val request =
-            Request.Builder().url(url).post(requestBody).addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
-                .build()
+        val request = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+            .build()
 
         return@withContext try {
             client.newCall(request).execute().use { response ->
-                val body = response.body.string()
+                val body = response.body?.string().orEmpty()
 
                 if (response.isSuccessful) {
                     return@use parseSessionIdFromResponse(body)
@@ -107,26 +93,14 @@ class TellaPeerToPeerClient @Inject constructor() {
         }
     }
 
-    private fun parseSessionIdFromResponse(body: String): RegisterPeerResult {
-        return try {
-            val json = JSONObject(body)
-            val sessionId = json.getString("sessionId")
-            RegisterPeerResult.Success(sessionId)
-        } catch (e: Exception) {
-            Timber.e(e, "Malformed JSON response: %s", body)
-            RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
-        }
-    }
-
     suspend fun prepareUpload(
         ip: String,
         port: String,
-        expectedFingerprint: String,
+        expectedFingerprint: String, // DER HEX
         title: String,
         files: List<VaultFile>,
         sessionId: String
     ): PrepareUploadResult = withContext(Dispatchers.IO) {
-
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.PREPARE_UPLOAD)
 
         val fileItems = files.map {
@@ -144,7 +118,7 @@ class TellaPeerToPeerClient @Inject constructor() {
         val requestPayload = PrepareUploadRequest(title, sessionId, fileItems)
         val jsonPayload = Json.encodeToString(requestPayload)
         val requestBody = jsonPayload.toRequestBody()
-        val client = getClientWithFingerprintValidation(expectedFingerprint)
+        val client = getClientWithFingerprintValidation(ip, expectedFingerprint)
 
         try {
             val request = Request.Builder()
@@ -154,8 +128,7 @@ class TellaPeerToPeerClient @Inject constructor() {
                 .build()
 
             client.newCall(request).execute().use { response ->
-                val responseBody = response.body.string()
-
+                val responseBody = response.body?.string().orEmpty()
                 return@withContext if (response.isSuccessful) {
                     parseTransmissionId(responseBody)
                 } else {
@@ -164,35 +137,15 @@ class TellaPeerToPeerClient @Inject constructor() {
                 }
             }
         } catch (e: Exception) {
-            Timber.e(e, "Exception during upload")
-            return@withContext PrepareUploadResult.Failure(e)
-        }
-    }
-
-    private fun parseTransmissionId(body: String): PrepareUploadResult {
-        return try {
-            val response = Json.decodeFromString<PeerPrepareUploadResponse>(body)
-            PrepareUploadResult.Success(response.files)
-        } catch (e: Exception) {
-            Timber.e(e, "Invalid JSON response: %s", body)
-            PrepareUploadResult.Failure(Exception("Malformed server response"))
-        }
-    }
-
-    private fun handleServerError(code: Int, body: String): PrepareUploadResult {
-        return when (code) {
-            400 -> PrepareUploadResult.BadRequest
-            403 -> PrepareUploadResult.Forbidden
-            409 -> PrepareUploadResult.Conflict
-            500 -> PrepareUploadResult.ServerError
-            else -> PrepareUploadResult.Failure(Exception("Unhandled server error $code: $body"))
+            Timber.e(e, "Exception during prepareUpload")
+            PrepareUploadResult.Failure(e)
         }
     }
 
     suspend fun uploadFileWithProgress(
         ip: String,
         port: String,
-        expectedFingerprint: String,
+        expectedFingerprint: String, // DER HEX
         sessionId: String,
         fileId: String,
         transmissionId: String,
@@ -201,12 +154,10 @@ class TellaPeerToPeerClient @Inject constructor() {
         fileName: String,
         onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
-
-        Timber.d("session id from the client+$sessionId")
+        Timber.d("session id from the client = $sessionId")
         val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
 
-        val client = getClientWithFingerprintValidation(expectedFingerprint)
-
+        val client = getClientWithFingerprintValidation(ip, expectedFingerprint)
         val requestBody = ProgressRequestBody(inputStream, fileSize, onProgress)
 
         val request = Request.Builder()
@@ -234,15 +185,14 @@ class TellaPeerToPeerClient @Inject constructor() {
     suspend fun closeConnection(
         ip: String,
         port: String,
-        expectedFingerprint: String,
+        expectedFingerprint: String, // DER HEX
         sessionId: String
     ): Boolean = withContext(Dispatchers.IO) {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.CLOSE)
 
         val payload = Json.encodeToString(mapOf("sessionId" to sessionId))
         val requestBody = payload.toRequestBody()
-
-        val client = getClientWithFingerprintValidation(expectedFingerprint)
+        val client = getClientWithFingerprintValidation(ip, expectedFingerprint)
 
         val request = Request.Builder()
             .url(url)
@@ -259,4 +209,87 @@ class TellaPeerToPeerClient @Inject constructor() {
             false
         }
     }
-}
\ No newline at end of file
+
+    // ---------------- Internals ----------------
+
+    private fun parseSessionIdFromResponse(body: String): RegisterPeerResult =
+        try {
+            val json = JSONObject(body)
+            RegisterPeerResult.Success(json.getString("sessionId"))
+        } catch (e: Exception) {
+            Timber.e(e, "Malformed JSON response: %s", body)
+            RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
+        }
+
+    private fun parseTransmissionId(body: String): PrepareUploadResult =
+        try {
+            val response = Json.decodeFromString<PeerPrepareUploadResponse>(body)
+            PrepareUploadResult.Success(response.files)
+        } catch (e: Exception) {
+            Timber.e(e, "Invalid JSON response: %s", body)
+            PrepareUploadResult.Failure(Exception("Malformed server response"))
+        }
+
+    private fun handleServerError(code: Int, body: String): PrepareUploadResult =
+        when (code) {
+            400 -> PrepareUploadResult.BadRequest
+            403 -> PrepareUploadResult.Forbidden
+            409 -> PrepareUploadResult.Conflict
+            500 -> PrepareUploadResult.ServerError
+            else -> PrepareUploadResult.Failure(Exception("Unhandled server error $code: $body"))
+        }
+
+    /**
+     * Build an OkHttp client that:
+     *  - Validates the server by DER-hash HEX (your getPublicKeyHash).
+     *  - Routes sockets over Wi-Fi (LAN).
+     *  - Relaxes hostname verification (safe because we hard-pin).
+     */
+    private fun getClientWithFingerprintValidation(
+        ip: String,
+        expectedFingerprintHex: String
+    ): OkHttpClient {
+        val expected = normalizeHex(expectedFingerprintHex)
+
+        val trustManager = object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
+            override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String?) = Unit
+            override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String?) {
+                val serverCert = chain.firstOrNull()
+                    ?: throw CertificateException("Empty certificate chain")
+                val actualHex = normalizeHex(CertificateUtils.getPublicKeyHash(serverCert))
+                if (actualHex != expected) {
+                    throw CertificateException(
+                        "Certificate DER hash mismatch.\nExpected: $expected\nGot:      $actualHex"
+                    )
+                }
+            }
+        }
+
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
+        }
+
+        val builder = OkHttpClient.Builder()
+            .sslSocketFactory(sslContext.socketFactory, trustManager)
+            .hostnameVerifier { _, _ -> true } // IP literal + pinning → OK
+            .connectTimeout(5, TimeUnit.SECONDS)
+            .readTimeout(20, TimeUnit.SECONDS)
+            .writeTimeout(20, TimeUnit.SECONDS)
+
+        // Route over Wi-Fi (same network path as FingerprintFetcher)
+        findWifiNetwork(appContext)?.let { builder.socketFactory(it.socketFactory) }
+
+        return builder.build()
+    }
+
+    private fun findWifiNetwork(context: Context): Network? {
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        return cm.allNetworks.firstOrNull { n ->
+            cm.getNetworkCapabilities(n)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+        }
+    }
+
+    private fun normalizeHex(hexLike: String): String =
+        hexLike.trim().replace(":", "").replace("\\s".toRegex(), "").lowercase()
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 606ddba17..06c851b6d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -33,7 +33,6 @@ import org.horizontal.tella.mobile.data.peertopeer.remote.PrepareUploadRequest
 import org.horizontal.tella.mobile.domain.peertopeer.FileInfo
 import org.horizontal.tella.mobile.domain.peertopeer.KeyStoreConfig
 import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager
-import org.horizontal.tella.mobile.domain.peertopeer.PeerEventManager.closeConnectionEvent
 import org.horizontal.tella.mobile.domain.peertopeer.PeerPrepareUploadResponse
 import org.horizontal.tella.mobile.domain.peertopeer.PeerRegisterPayload
 import org.horizontal.tella.mobile.domain.peertopeer.PeerResponse
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
index 5da247183..4d971ae93 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/di/PeerModule.kt
@@ -1,8 +1,10 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.di
 
+import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
@@ -16,8 +18,8 @@ object PeerModule {
 
     @Provides
     @Singleton
-    fun providePeerClient(): TellaPeerToPeerClient {
-        return TellaPeerToPeerClient()
+    fun providePeerClient(@ApplicationContext context: Context): TellaPeerToPeerClient {
+        return TellaPeerToPeerClient(context)
     }
 
     @Provides

From 537f2915113677a114eccbb6bba43a8745c94e65 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 22 Aug 2025 18:29:18 +0100
Subject: [PATCH 124/153] Fix success screen

---
 .../RecipientUploadFilesFragment.kt           | 27 +++---
 .../senderflow/SenderUploadFilesFragment.kt   |  7 +-
 .../viewmodel/FileTransferViewModel.kt        | 87 +++++++++----------
 .../shared_ui/bottomsheet/BottomSheetUtils.kt | 42 ++++-----
 4 files changed, 77 insertions(+), 86 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index f9740faa5..0e0f9a3e5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -18,7 +18,6 @@ import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndVie
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import javax.inject.Inject
-import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
@@ -89,30 +88,32 @@ class RecipientUploadFilesFragment :
 
             val files = state.files
             val percent = state.percent.coerceIn(0, 100)
-            val percentFloat = percent / 100f
+            endView.setUploadProgress(files, percent / 100f)
 
-            endView.setUploadProgress(files, percentFloat)
-
-            // Only show the bottom sheet once, updates come from observeBottomSheetProgress
             if (!sheetShown) {
                 sheetShown = true
                 showProgressImportSheet(
                     baseActivity.supportFragmentManager,
                     getString(R.string.Vault_Importing_SheetTitle),
                     files.size,
-                    resources.getQuantityString(
-                        R.plurals.Vault_Importing_SheetProgress, files.size
-                    ),
+                    resources.getQuantityString(R.plurals.Vault_Importing_SheetProgress, files.size),
                     progressStatus = progressPercentLiveData,
                     getString(R.string.action_cancel).uppercase(),
                     viewLifecycleOwner
-                ) {
-
-                }
+                ) { }
             }
 
-            val allSaved = files.all { it.status == P2PFileStatus.SAVED }
-            if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
+            val isFinishedOrClosed =
+                state.sessionStatus == SessionStatus.FINISHED || state.sessionStatus == SessionStatus.CLOSED
+
+            if (isFinishedOrClosed) {
+                // If sender cancelled mid-way, some files may still be QUEUE/SENDING → mark them FAILED
+                val session = viewModel.p2PState.session
+                session?.files?.values?.forEach { pf ->
+                    if (pf.status == P2PFileStatus.SENDING || pf.status == P2PFileStatus.QUEUE) {
+                        pf.status = P2PFileStatus.FAILED
+                    }
+                }
                 stopServerAndNavigate()
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 6ce379e37..bb6bdc45b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -23,7 +23,6 @@ class SenderUploadFilesFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.uploadAllFiles()
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
         showFormEndView()
         observeUploadProgress()
@@ -64,13 +63,11 @@ class SenderUploadFilesFragment :
             val percentFloat = state.percent / 100f
             endView.setUploadProgress(files, percentFloat)
 
-
-            val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
-
-            if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
+            if (state.sessionStatus == SessionStatus.FINISHED) {
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
                 navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
             }
         }
     }
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index e6e95987e..d2f10b83e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -116,71 +116,60 @@ class FileTransferViewModel @Inject constructor(
 
             val totalSize = session.files.values.sumOf { it.vaultFile?.size ?: 0L }
 
-            session.files.values.forEach { progressFile ->
-                val vaultFile = progressFile.vaultFile ?: return@forEach
-                val inputStream = MediaFileHandler.getStream(vaultFile)
+            fun postProgress() {
+                val uploaded = session.files.values.sumOf { it.bytesTransferred }
+                val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                _uploadProgress.postValue(
+                    UploadProgressState(
+                        title = session.title.orEmpty(),
+                        percent = percent,
+                        sessionStatus = session.status,
+                        files = session.files.values.toList()
+                    )
+                )
+            }
 
-                progressFile.status = P2PFileStatus.SENDING
+            // upload sequentially; each file reflects its true result
+            for (pf in session.files.values) {
+                val vf = pf.vaultFile ?: continue
+                val input = MediaFileHandler.getStream(vf)
+                pf.status = P2PFileStatus.SENDING
+                postProgress()
 
                 try {
-                    if (inputStream != null) {
-                        Timber.d("session id ***uploadAllFiles ${getSessionId()}")
-                        peerClient.uploadFileWithProgress(
+                    if (input != null) {
+                        val ok = peerClient.uploadFileWithProgress(
                             ip = ip,
                             port = port,
                             expectedFingerprint = fingerprint,
-                            sessionId = getSessionId(),
-                            fileId = progressFile.file.id,
-                            transmissionId = progressFile.transmissionId.orEmpty(),
-                            inputStream = inputStream,
-                            fileSize = vaultFile.size,
-                            fileName = vaultFile.name,
+                            sessionId = session.sessionId.orEmpty(),
+                            fileId = pf.file.id,
+                            transmissionId = pf.transmissionId.orEmpty(),
+                            inputStream = input,
+                            fileSize = vf.size,
+                            fileName = vf.name,
                         ) { written, _ ->
-                            progressFile.bytesTransferred = written.toInt()
-
-                            val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                            val percent =
-                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
-
-                            _uploadProgress.postValue(
-                                UploadProgressState(
-                                    title = session.title ?: "",
-                                    percent = percent,
-                                    sessionStatus = session.status,
-                                    files = session.files.values.toList()
-                                )
-                            )
+                            pf.bytesTransferred = written.toInt()
+                            postProgress()
                         }
+                        pf.status = if (ok) P2PFileStatus.FINISHED else P2PFileStatus.FAILED
+                    } else {
+                        pf.status = P2PFileStatus.FAILED
                     }
-
-
-                    progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
-                    progressFile.status = P2PFileStatus.FAILED
-                    Timber.e(e, "Upload failed for file ${progressFile.file.fileName}")
+                    pf.status = P2PFileStatus.FAILED
+                    Timber.e(e, "Upload failed for ${pf.file.fileName}")
                 } finally {
-                    inputStream?.close()
+                    input?.close()
                 }
-
-                // Post state after each file is done
-                _uploadProgress.postValue(
-                    UploadProgressState(
-                        title = session.title ?: "",
-                        percent = session.files.values.sumOf { it.bytesTransferred }.let {
-                            if (totalSize > 0) ((it * 100) / totalSize).toInt() else 0
-                        },
-                        sessionStatus = session.status,
-                        files = session.files.values.toList()
-                    )
-                )
+                postProgress()
             }
 
+            // session is done (partial or full)
             session.status = SessionStatus.FINISHED
-
-            // Final update after all uploads complete
             _uploadProgress.postValue(
                 UploadProgressState(
-                    title = session.title ?: "",
+                    title = session.title.orEmpty(),
                     percent = 100,
                     sessionStatus = session.status,
                     files = session.files.values.toList()
@@ -189,6 +178,8 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
+
+
     private fun getVaultFilesFromState(): List<VaultFile> {
         return p2PSharedState.session?.files
             ?.values
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
index ae46487e6..3df08ca2a 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
@@ -692,38 +692,40 @@ object BottomSheetUtils {
         cancelText: String,
         lifecycleOwner: LifecycleOwner,
         onCancelImport: (() -> Unit)
-
-    ) {
+    ): CustomBottomSheetFragment {   // <-- return it
         val customSheetFragment =
-            CustomBottomSheetFragment.with(fragmentManager).page(R.layout.layout_progess_sheet)
-                .cancellable(true).statusBarColor(R.color.space_cadet)
+            CustomBottomSheetFragment.with(fragmentManager)
+                .page(R.layout.layout_progess_sheet)
+                .cancellable(true)
+                .statusBarColor(R.color.space_cadet)
+
         customSheetFragment.holder(DownloadStatustHolder(), object : Binder<DownloadStatustHolder> {
-            override fun onBind(holder: DownloadStatustHolder) {
-                with(holder) {
-                    progressStatus.observe(lifecycleOwner) { status ->
-                        subtitle.text = "$status/$totalProgress $progressNumberText"
-                        val statusPercent = status * 100 / totalProgress
-                        circularProgress.setProgressPercent(statusPercent, true)
-                        linearProgress.setProgressPercent(statusPercent, true)
-                        if ((status == totalProgress) && (customSheetFragment.isAdded)) {
-                            customSheetFragment.dismiss()
-                        }
-                    }
-                    title.text = titleText
-                    cancelTextView.text = cancelText
-                    cancelTextView.setOnClickListener {
-                        onCancelImport.invoke()
+            override fun onBind(holder: DownloadStatustHolder) = with(holder) {
+                progressStatus.observe(lifecycleOwner) { status ->
+                    subtitle.text = "$status/$totalProgress $progressNumberText"
+                    val statusPercent = status * 100 / totalProgress
+                    circularProgress.setProgressPercent(statusPercent, true)
+                    linearProgress.setProgressPercent(statusPercent, true)
+
+                    if ((status == totalProgress) && customSheetFragment.isAdded) {
                         customSheetFragment.dismiss()
                     }
-
+                }
+                title.text = titleText
+                cancelTextView.text = cancelText
+                cancelTextView.setOnClickListener {
+                    onCancelImport.invoke()
+                    customSheetFragment.dismiss()
                 }
             }
         })
 
         customSheetFragment.transparentBackground()
         customSheetFragment.launch()
+        return customSheetFragment
     }
 
+
     class ConfirmImageSheetHolder : PageHolder() {
         lateinit var actionButton: TextView
         lateinit var cancelButton: TextView

From 91b50c3effe4e79b5e5ed76fc2a08bad8ae68296 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 26 Aug 2025 13:35:42 +0100
Subject: [PATCH 125/153] Revert "Fix success screen"

This reverts commit 537f2915113677a114eccbb6bba43a8745c94e65.
---
 .../RecipientUploadFilesFragment.kt           | 27 +++---
 .../senderflow/SenderUploadFilesFragment.kt   |  7 +-
 .../viewmodel/FileTransferViewModel.kt        | 87 ++++++++++---------
 .../shared_ui/bottomsheet/BottomSheetUtils.kt | 42 +++++----
 4 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index 0e0f9a3e5..f9740faa5 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -18,6 +18,7 @@ import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndVie
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
 import javax.inject.Inject
+import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
@@ -88,32 +89,30 @@ class RecipientUploadFilesFragment :
 
             val files = state.files
             val percent = state.percent.coerceIn(0, 100)
-            endView.setUploadProgress(files, percent / 100f)
+            val percentFloat = percent / 100f
 
+            endView.setUploadProgress(files, percentFloat)
+
+            // Only show the bottom sheet once, updates come from observeBottomSheetProgress
             if (!sheetShown) {
                 sheetShown = true
                 showProgressImportSheet(
                     baseActivity.supportFragmentManager,
                     getString(R.string.Vault_Importing_SheetTitle),
                     files.size,
-                    resources.getQuantityString(R.plurals.Vault_Importing_SheetProgress, files.size),
+                    resources.getQuantityString(
+                        R.plurals.Vault_Importing_SheetProgress, files.size
+                    ),
                     progressStatus = progressPercentLiveData,
                     getString(R.string.action_cancel).uppercase(),
                     viewLifecycleOwner
-                ) { }
-            }
-
-            val isFinishedOrClosed =
-                state.sessionStatus == SessionStatus.FINISHED || state.sessionStatus == SessionStatus.CLOSED
+                ) {
 
-            if (isFinishedOrClosed) {
-                // If sender cancelled mid-way, some files may still be QUEUE/SENDING → mark them FAILED
-                val session = viewModel.p2PState.session
-                session?.files?.values?.forEach { pf ->
-                    if (pf.status == P2PFileStatus.SENDING || pf.status == P2PFileStatus.QUEUE) {
-                        pf.status = P2PFileStatus.FAILED
-                    }
                 }
+            }
+
+            val allSaved = files.all { it.status == P2PFileStatus.SAVED }
+            if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
                 stopServerAndNavigate()
             }
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index bb6bdc45b..6ce379e37 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -23,6 +23,7 @@ class SenderUploadFilesFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        viewModel.uploadAllFiles()
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
         showFormEndView()
         observeUploadProgress()
@@ -63,11 +64,13 @@ class SenderUploadFilesFragment :
             val percentFloat = state.percent / 100f
             endView.setUploadProgress(files, percentFloat)
 
-            if (state.sessionStatus == SessionStatus.FINISHED) {
+
+            val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
+
+            if (state.sessionStatus == SessionStatus.FINISHED && allFinished) {
                 viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
                 navManager().navigateFromUploadSenderFragmentToPeerToPeerResultFragment()
             }
         }
     }
-
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index d2f10b83e..e6e95987e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -116,60 +116,71 @@ class FileTransferViewModel @Inject constructor(
 
             val totalSize = session.files.values.sumOf { it.vaultFile?.size ?: 0L }
 
-            fun postProgress() {
-                val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
-                _uploadProgress.postValue(
-                    UploadProgressState(
-                        title = session.title.orEmpty(),
-                        percent = percent,
-                        sessionStatus = session.status,
-                        files = session.files.values.toList()
-                    )
-                )
-            }
+            session.files.values.forEach { progressFile ->
+                val vaultFile = progressFile.vaultFile ?: return@forEach
+                val inputStream = MediaFileHandler.getStream(vaultFile)
 
-            // upload sequentially; each file reflects its true result
-            for (pf in session.files.values) {
-                val vf = pf.vaultFile ?: continue
-                val input = MediaFileHandler.getStream(vf)
-                pf.status = P2PFileStatus.SENDING
-                postProgress()
+                progressFile.status = P2PFileStatus.SENDING
 
                 try {
-                    if (input != null) {
-                        val ok = peerClient.uploadFileWithProgress(
+                    if (inputStream != null) {
+                        Timber.d("session id ***uploadAllFiles ${getSessionId()}")
+                        peerClient.uploadFileWithProgress(
                             ip = ip,
                             port = port,
                             expectedFingerprint = fingerprint,
-                            sessionId = session.sessionId.orEmpty(),
-                            fileId = pf.file.id,
-                            transmissionId = pf.transmissionId.orEmpty(),
-                            inputStream = input,
-                            fileSize = vf.size,
-                            fileName = vf.name,
+                            sessionId = getSessionId(),
+                            fileId = progressFile.file.id,
+                            transmissionId = progressFile.transmissionId.orEmpty(),
+                            inputStream = inputStream,
+                            fileSize = vaultFile.size,
+                            fileName = vaultFile.name,
                         ) { written, _ ->
-                            pf.bytesTransferred = written.toInt()
-                            postProgress()
+                            progressFile.bytesTransferred = written.toInt()
+
+                            val uploaded = session.files.values.sumOf { it.bytesTransferred }
+                            val percent =
+                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+
+                            _uploadProgress.postValue(
+                                UploadProgressState(
+                                    title = session.title ?: "",
+                                    percent = percent,
+                                    sessionStatus = session.status,
+                                    files = session.files.values.toList()
+                                )
+                            )
                         }
-                        pf.status = if (ok) P2PFileStatus.FINISHED else P2PFileStatus.FAILED
-                    } else {
-                        pf.status = P2PFileStatus.FAILED
                     }
+
+
+                    progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
-                    pf.status = P2PFileStatus.FAILED
-                    Timber.e(e, "Upload failed for ${pf.file.fileName}")
+                    progressFile.status = P2PFileStatus.FAILED
+                    Timber.e(e, "Upload failed for file ${progressFile.file.fileName}")
                 } finally {
-                    input?.close()
+                    inputStream?.close()
                 }
-                postProgress()
+
+                // Post state after each file is done
+                _uploadProgress.postValue(
+                    UploadProgressState(
+                        title = session.title ?: "",
+                        percent = session.files.values.sumOf { it.bytesTransferred }.let {
+                            if (totalSize > 0) ((it * 100) / totalSize).toInt() else 0
+                        },
+                        sessionStatus = session.status,
+                        files = session.files.values.toList()
+                    )
+                )
             }
 
-            // session is done (partial or full)
             session.status = SessionStatus.FINISHED
+
+            // Final update after all uploads complete
             _uploadProgress.postValue(
                 UploadProgressState(
-                    title = session.title.orEmpty(),
+                    title = session.title ?: "",
                     percent = 100,
                     sessionStatus = session.status,
                     files = session.files.values.toList()
@@ -178,8 +189,6 @@ class FileTransferViewModel @Inject constructor(
         }
     }
 
-
-
     private fun getVaultFilesFromState(): List<VaultFile> {
         return p2PSharedState.session?.files
             ?.values
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
index 3df08ca2a..ae46487e6 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
@@ -692,40 +692,38 @@ object BottomSheetUtils {
         cancelText: String,
         lifecycleOwner: LifecycleOwner,
         onCancelImport: (() -> Unit)
-    ): CustomBottomSheetFragment {   // <-- return it
-        val customSheetFragment =
-            CustomBottomSheetFragment.with(fragmentManager)
-                .page(R.layout.layout_progess_sheet)
-                .cancellable(true)
-                .statusBarColor(R.color.space_cadet)
 
+    ) {
+        val customSheetFragment =
+            CustomBottomSheetFragment.with(fragmentManager).page(R.layout.layout_progess_sheet)
+                .cancellable(true).statusBarColor(R.color.space_cadet)
         customSheetFragment.holder(DownloadStatustHolder(), object : Binder<DownloadStatustHolder> {
-            override fun onBind(holder: DownloadStatustHolder) = with(holder) {
-                progressStatus.observe(lifecycleOwner) { status ->
-                    subtitle.text = "$status/$totalProgress $progressNumberText"
-                    val statusPercent = status * 100 / totalProgress
-                    circularProgress.setProgressPercent(statusPercent, true)
-                    linearProgress.setProgressPercent(statusPercent, true)
-
-                    if ((status == totalProgress) && customSheetFragment.isAdded) {
+            override fun onBind(holder: DownloadStatustHolder) {
+                with(holder) {
+                    progressStatus.observe(lifecycleOwner) { status ->
+                        subtitle.text = "$status/$totalProgress $progressNumberText"
+                        val statusPercent = status * 100 / totalProgress
+                        circularProgress.setProgressPercent(statusPercent, true)
+                        linearProgress.setProgressPercent(statusPercent, true)
+                        if ((status == totalProgress) && (customSheetFragment.isAdded)) {
+                            customSheetFragment.dismiss()
+                        }
+                    }
+                    title.text = titleText
+                    cancelTextView.text = cancelText
+                    cancelTextView.setOnClickListener {
+                        onCancelImport.invoke()
                         customSheetFragment.dismiss()
                     }
-                }
-                title.text = titleText
-                cancelTextView.text = cancelText
-                cancelTextView.setOnClickListener {
-                    onCancelImport.invoke()
-                    customSheetFragment.dismiss()
+
                 }
             }
         })
 
         customSheetFragment.transparentBackground()
         customSheetFragment.launch()
-        return customSheetFragment
     }
 
-
     class ConfirmImageSheetHolder : PageHolder() {
         lateinit var actionButton: TextView
         lateinit var cancelButton: TextView

From 6ff4c244a84d74952966c1fbb83a1633e0f010e7 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 26 Aug 2025 13:37:45 +0100
Subject: [PATCH 126/153] update the p2pFile Status while upload/ cancel

---
 .../viewmodel/FileTransferViewModel.kt        | 85 ++++++++-----------
 1 file changed, 37 insertions(+), 48 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index e6e95987e..92bda5448 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -116,71 +116,60 @@ class FileTransferViewModel @Inject constructor(
 
             val totalSize = session.files.values.sumOf { it.vaultFile?.size ?: 0L }
 
-            session.files.values.forEach { progressFile ->
-                val vaultFile = progressFile.vaultFile ?: return@forEach
-                val inputStream = MediaFileHandler.getStream(vaultFile)
+            fun postProgress() {
+                val uploaded = session.files.values.sumOf { it.bytesTransferred }
+                val percent = if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
+                _uploadProgress.postValue(
+                    UploadProgressState(
+                        title = session.title.orEmpty(),
+                        percent = percent,
+                        sessionStatus = session.status,
+                        files = session.files.values.toList()
+                    )
+                )
+            }
 
-                progressFile.status = P2PFileStatus.SENDING
+            // upload sequentially; each file reflects its true result
+            for (pf in session.files.values) {
+                val vf = pf.vaultFile ?: continue
+                val input = MediaFileHandler.getStream(vf)
+                pf.status = P2PFileStatus.SENDING
+                postProgress()
 
                 try {
-                    if (inputStream != null) {
-                        Timber.d("session id ***uploadAllFiles ${getSessionId()}")
-                        peerClient.uploadFileWithProgress(
+                    if (input != null) {
+                        val ok = peerClient.uploadFileWithProgress(
                             ip = ip,
                             port = port,
                             expectedFingerprint = fingerprint,
-                            sessionId = getSessionId(),
-                            fileId = progressFile.file.id,
-                            transmissionId = progressFile.transmissionId.orEmpty(),
-                            inputStream = inputStream,
-                            fileSize = vaultFile.size,
-                            fileName = vaultFile.name,
+                            sessionId = session.sessionId.orEmpty(),
+                            fileId = pf.file.id,
+                            transmissionId = pf.transmissionId.orEmpty(),
+                            inputStream = input,
+                            fileSize = vf.size,
+                            fileName = vf.name,
                         ) { written, _ ->
-                            progressFile.bytesTransferred = written.toInt()
-
-                            val uploaded = session.files.values.sumOf { it.bytesTransferred }
-                            val percent =
-                                if (totalSize > 0) ((uploaded * 100) / totalSize).toInt() else 0
-
-                            _uploadProgress.postValue(
-                                UploadProgressState(
-                                    title = session.title ?: "",
-                                    percent = percent,
-                                    sessionStatus = session.status,
-                                    files = session.files.values.toList()
-                                )
-                            )
+                            pf.bytesTransferred = written.toInt()
+                            postProgress()
                         }
+                        pf.status = if (ok) P2PFileStatus.FINISHED else P2PFileStatus.FAILED
+                    } else {
+                        pf.status = P2PFileStatus.FAILED
                     }
-
-
-                    progressFile.status = P2PFileStatus.FINISHED
                 } catch (e: Exception) {
-                    progressFile.status = P2PFileStatus.FAILED
-                    Timber.e(e, "Upload failed for file ${progressFile.file.fileName}")
+                    pf.status = P2PFileStatus.FAILED
+                    Timber.e(e, "Upload failed for ${pf.file.fileName}")
                 } finally {
-                    inputStream?.close()
+                    input?.close()
                 }
-
-                // Post state after each file is done
-                _uploadProgress.postValue(
-                    UploadProgressState(
-                        title = session.title ?: "",
-                        percent = session.files.values.sumOf { it.bytesTransferred }.let {
-                            if (totalSize > 0) ((it * 100) / totalSize).toInt() else 0
-                        },
-                        sessionStatus = session.status,
-                        files = session.files.values.toList()
-                    )
-                )
+                postProgress()
             }
 
+            // session is done (partial or full)
             session.status = SessionStatus.FINISHED
-
-            // Final update after all uploads complete
             _uploadProgress.postValue(
                 UploadProgressState(
-                    title = session.title ?: "",
+                    title = session.title.orEmpty(),
                     percent = 100,
                     sessionStatus = session.status,
                     files = session.files.values.toList()

From 72f6696e7d291d9cdc89655b1b095bf91b799ce7 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 27 Aug 2025 16:15:42 +0100
Subject: [PATCH 127/153] Fix files status preview

---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |   3 +-
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 161 ++++----
 .../data/peertopeer/model/SessionStatus.kt    |   1 +
 .../RecipientUploadFilesFragment.kt           |  45 +--
 .../senderflow/SenderUploadFilesFragment.kt   |   1 +
 .../viewmodel/FileTransferViewModel.kt        |  15 +
 .../viewmodel/PeerToPeerViewModel.kt          | 378 +++++++++++-------
 .../shared_ui/bottomsheet/BottomSheetUtils.kt |   2 +-
 8 files changed, 345 insertions(+), 261 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 996d3820e..5776eae8e 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -43,7 +43,6 @@ class TellaPeerToPeerClient @Inject constructor(
     @ApplicationContext private val appContext: Context
 ) {
 
-    // ---------------- Public API (unchanged) ----------------
 
     suspend fun registerPeerDevice(
         ip: String,
@@ -185,7 +184,7 @@ class TellaPeerToPeerClient @Inject constructor(
     suspend fun closeConnection(
         ip: String,
         port: String,
-        expectedFingerprint: String, // DER HEX
+        expectedFingerprint: String,
         sessionId: String
     ): Boolean = withContext(Dispatchers.IO) {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.CLOSE)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 06c851b6d..990c16f17 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -57,6 +57,7 @@ class TellaPeerToPeerServer(
     private val peerToPeerManager: PeerToPeerManager,
     private val p2PSharedState: P2PSharedState
 ) : TellaServer {
+
     private var serverSession: PeerResponse? = null
     private var engine: ApplicationEngine? = null
 
@@ -67,15 +68,20 @@ class TellaPeerToPeerServer(
         val keyStore = KeyStore.getInstance("PKCS12").apply {
             load(null, null)
             setKeyEntry(
-                keyStoreConfig.alias, keyPair.private, keyStoreConfig.password, arrayOf(certificate)
+                keyStoreConfig.alias,
+                keyPair.private,
+                keyStoreConfig.password,
+                arrayOf(certificate)
             )
         }
 
         engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
-            sslConnector(keyStore = keyStore,
+            sslConnector(
+                keyStore = keyStore,
                 keyAlias = keyStoreConfig.alias,
                 keyStorePassword = { keyStoreConfig.password },
-                privateKeyPassword = { keyStoreConfig.password }) {
+                privateKeyPassword = { keyStoreConfig.password }
+            ) {
                 this.host = ip
                 this.port = serverPort
             }
@@ -87,12 +93,12 @@ class TellaPeerToPeerServer(
                         isLenient = true
                     })
                 }
+
                 routing {
-                    // Root route to confirm the server is running
-                    get("/") {
-                        call.respondText("The server is running securely over HTTPS.")
-                    }
+                    // Sanity probe
+                    get("/") { call.respondText("The server is running securely over HTTPS.") }
 
+                    // Client presence hint (optional)
                     post(PeerApiRoutes.PING) {
                         CoroutineScope(Dispatchers.IO).launch {
                             peerToPeerManager.notifyClientConnected(p2PSharedState.hash)
@@ -100,6 +106,7 @@ class TellaPeerToPeerServer(
                         call.respondText("ping", status = HttpStatusCode.OK)
                     }
 
+                    // 1) Register a session
                     post(PeerApiRoutes.REGISTER) {
                         val request = try {
                             call.receive<PeerRegisterPayload>()
@@ -131,19 +138,15 @@ class TellaPeerToPeerServer(
                         }
 
                         if (!accepted) {
-                            call.respond(
-                                HttpStatusCode.Forbidden, "Receiver rejected the registration"
-                            )
+                            call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
                             return@post
                         }
 
-                        launch {
-                            PeerEventManager.emitRegistrationSuccess()
-                        }
-
+                        launch { PeerEventManager.emitRegistrationSuccess() }
                         call.respond(HttpStatusCode.OK, session)
                     }
 
+                    // 2) Prepare upload → create receiving session, STATUS = SENDING
                     post(PeerApiRoutes.PREPARE_UPLOAD) {
                         val request = try {
                             call.receive<PrepareUploadRequest>()
@@ -163,38 +166,34 @@ class TellaPeerToPeerServer(
                         }
 
                         val accepted = PeerEventManager.emitPrepareUploadRequest(request)
-                        if (accepted) {
-
-                            val session =
-                                P2PSession(title = request.title, sessionId = request.sessionId)
-
-                            val responseFiles = request.files.map { file ->
-                                val transmissionId = UUID.randomUUID().toString()
-                                val receivingFile = ProgressFile(
-                                    file = file, transmissionId = transmissionId
-                                )
-                                session.files[transmissionId] = receivingFile
-
-                                FileInfo(
-                                    id = file.id, transmissionId = transmissionId
-                                )
-                            }
+                        if (!accepted) {
+                            call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
+                            return@post
+                        }
 
-                            p2PSharedState.session = session
+                        val session = P2PSession(
+                            title = request.title,
+                            sessionId = request.sessionId
+                        ).also { it.status = SessionStatus.SENDING }
 
-                            val responsePayload = PeerPrepareUploadResponse(files = responseFiles)
-                            call.respond(HttpStatusCode.OK, responsePayload)
-                        } else {
-                            call.respond(HttpStatusCode.Forbidden, "Transfer rejected by receiver")
+                        val responseFiles = request.files.map { file ->
+                            val transmissionId = UUID.randomUUID().toString()
+                            val receivingFile = ProgressFile(file = file, transmissionId = transmissionId)
+                            session.files[transmissionId] = receivingFile
+                            FileInfo(id = file.id, transmissionId = transmissionId)
                         }
+
+                        p2PSharedState.session = session
+                        call.respond(HttpStatusCode.OK, PeerPrepareUploadResponse(files = responseFiles))
                     }
 
+                    // 3) Upload each file (transport-only; recipient will SAVE later)
                     put(PeerApiRoutes.UPLOAD) {
                         val sessionId = call.parameters["sessionId"]
                         val fileId = call.parameters["fileId"]
                         val transmissionId = call.parameters["transmissionId"]
 
-                        Timber.d("session id from the server +$sessionId")
+                        Timber.d("UPLOAD: session=$sessionId, fileId=$fileId, tx=$transmissionId")
 
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
@@ -213,6 +212,7 @@ class TellaPeerToPeerServer(
                             return@put
                         }
 
+                        // temp file for the recipient VM to persist into Vault later
                         val tmpFile = File.createTempFile(fileId, ".tmp")
                         val output = tmpFile.outputStream().buffered()
 
@@ -229,77 +229,73 @@ class TellaPeerToPeerServer(
                                 bytesRead += read
                                 progressFile.bytesTransferred = bytesRead.toInt()
 
-                                // Optional: update session progress percent
-                                val totalTransferred =
-                                    session.files.values.sumOf { it.bytesTransferred }
-                                val percent =
-                                    if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
-
-                                val state = UploadProgressState(
-                                    title = session.title ?: "",
-                                    percent = percent,
-                                    sessionStatus = session.status,
-                                    files = session.files.values.toList()
+                                // Broadcast “transport” progress; keep status = SENDING
+                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
+                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+
+                                PeerEventManager.onUploadProgressState(
+                                    UploadProgressState(
+                                        title = session.title.orEmpty(),
+                                        percent = percent,
+                                        sessionStatus = session.status,   // SENDING
+                                        files = session.files.values.toList()
+                                    )
                                 )
-                                PeerEventManager.onUploadProgressState(state)
                             }
 
-                            progressFile.status = P2PFileStatus.FINISHED
-                            progressFile.path = tmpFile.path
+                            progressFile.status = P2PFileStatus.FINISHED       // network finished
+                            progressFile.path = tmpFile.path                    // handoff path to recipient
 
-                            val finalState = UploadProgressState(
-                                title = session.title ?: "",
-                                percent = 100,
-                                sessionStatus = SessionStatus.FINISHED,
-                                files = session.files.values.toList()
-                            )
+                            // Emit one last transport-progress tick (still SENDING)
+                            val totalTransferred2 = session.files.values.sumOf { it.bytesTransferred }
+                            val totalSize2 = session.files.values.sumOf { it.file.size }
+                            val percent2 = if (totalSize2 > 0) ((totalTransferred2 * 100) / totalSize2).toInt() else 0
 
-                            PeerEventManager.onUploadProgressState(finalState)
+                            PeerEventManager.onUploadProgressState(
+                                UploadProgressState(
+                                    title = session.title.orEmpty(),
+                                    percent = percent2,
+                                    sessionStatus = session.status,   // still SENDING
+                                    files = session.files.values.toList()
+                                )
+                            )
 
                             call.respond(HttpStatusCode.OK, "Upload complete")
                         } catch (e: Exception) {
                             progressFile.status = P2PFileStatus.FAILED
 
-                            val failedState = UploadProgressState(
-                                title = session.title ?: "",
-                                percent = 0,
-                                sessionStatus = session.status,
-                                files = session.files.values.toList()
+                            PeerEventManager.onUploadProgressState(
+                                UploadProgressState(
+                                    title = session.title.orEmpty(),
+                                    percent = 0,
+                                    sessionStatus = session.status, // SENDING
+                                    files = session.files.values.toList()
+                                )
                             )
-                            PeerEventManager.onUploadProgressState(failedState)
 
-                            call.respond(
-                                HttpStatusCode.InternalServerError, "Upload failed: ${e.message}"
-                            )
+                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
                         } finally {
                             output.close()
                         }
                     }
 
+                    // 4) Close session (transport finished/cancelled by sender)
                     post(PeerApiRoutes.CLOSE) {
                         val payload = try {
                             call.receive<Map<String, String>>()
                         } catch (e: Exception) {
-                            call.respond(
-                                HttpStatusCode.BadRequest, "Missing or invalid JSON payload"
-                            )
+                            call.respond(HttpStatusCode.BadRequest, "Missing or invalid JSON payload")
                             return@post
                         }
 
                         val sessionId = payload["sessionId"]
-
                         if (sessionId.isNullOrBlank()) {
                             call.respond(HttpStatusCode.BadRequest, "Missing session ID")
                             return@post
                         }
 
-                        val currentSession = serverSession
-                        if (currentSession == null) {
-                            call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
-                            return@post
-                        }
-
-                        if (currentSession.sessionId != sessionId) {
+                        val current = serverSession
+                        if (current == null || current.sessionId != sessionId) {
                             call.respond(HttpStatusCode.Unauthorized, "Invalid session ID")
                             return@post
                         }
@@ -312,19 +308,14 @@ class TellaPeerToPeerServer(
                         try {
                             p2PSharedState.session?.status = SessionStatus.CLOSED
                             serverSession = null
-
-                            launch {
-                                PeerEventManager.emitCloseConnection()
-                            }
+                            launch { PeerEventManager.emitCloseConnection() }
                             call.respond(HttpStatusCode.OK, mapOf("success" to true))
                         } catch (e: Exception) {
                             Timber.e(e, "Error while closing session")
                             call.respond(HttpStatusCode.InternalServerError, "Server error")
                         }
                     }
-
                 }
-
             }
         }).start(wait = false)
     }
@@ -333,7 +324,5 @@ class TellaPeerToPeerServer(
         engine?.stop(1000, 5000)
     }
 
-    private fun isValidPin(pin: String): Boolean {
-        return pin.length == 6
-    }
+    private fun isValidPin(pin: String) = pin.length == 6
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
index d0b2b2b05..f745c5398 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/model/SessionStatus.kt
@@ -3,6 +3,7 @@ package org.horizontal.tella.mobile.data.peertopeer.model
 enum class SessionStatus {
     WAITING,
     SENDING,
+    SAVING,
     FINISHED,
     FINISHED_WITH_ERRORS,
     CLOSED
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
index f9740faa5..ea3b120bc 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientUploadFilesFragment.kt
@@ -17,8 +17,8 @@ import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPee
 import org.horizontal.tella.mobile.views.fragment.uwazi.widgets.PeerToPeerEndView
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showProgressImportSheet
 import org.hzontal.shared_ui.bottomsheet.BottomSheetUtils.showStandardSheet
+import timber.log.Timber
 import javax.inject.Inject
-import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class RecipientUploadFilesFragment :
@@ -29,8 +29,7 @@ class RecipientUploadFilesFragment :
     private val progressPercentLiveData = MutableLiveData<Int>()
     private var sheetShown = false
 
-    @Inject
-    lateinit var peerServerStarterManager: PeerServerStarterManager
+    @Inject lateinit var peerServerStarterManager: PeerServerStarterManager
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -46,21 +45,19 @@ class RecipientUploadFilesFragment :
     }
 
     private fun setupCancelButton() {
-        binding.cancel.setOnClickListener {
-            showStopSharingConfirmation()
-        }
+        binding.cancel.setOnClickListener { showStopSharingConfirmation() }
     }
 
     private fun showStopSharingConfirmation() {
-        showStandardSheet(baseActivity.supportFragmentManager,
+        showStandardSheet(
+            baseActivity.supportFragmentManager,
             getString(R.string.stop_sharing_files),
             getString(R.string.nearby_sharing_will_be_stopped_the_recipient_will_not_have_access_to_files_that_were_not_fully_transferred),
             getString(R.string.action_continue).uppercase(),
             getString(R.string.stop).uppercase(),
             onConfirmClick = {},
-            onCancelClick = {
-                stopServerAndNavigate()
-            })
+            onCancelClick = { stopServerAndNavigate() }
+        )
     }
 
     private fun stopServerAndNavigate() {
@@ -73,10 +70,7 @@ class RecipientUploadFilesFragment :
         val session = viewModel.p2PState.session ?: return
         val files = session.files.values.toList()
 
-        endView = PeerToPeerEndView(
-            baseActivity, session.title
-        )
-
+        endView = PeerToPeerEndView(baseActivity, session.title)
         endView.setFiles(files, MyApplication.isConnectedToInternet(baseActivity), false)
 
         binding.endViewContainer.removeAllViews()
@@ -89,30 +83,29 @@ class RecipientUploadFilesFragment :
 
             val files = state.files
             val percent = state.percent.coerceIn(0, 100)
-            val percentFloat = percent / 100f
-
-            endView.setUploadProgress(files, percentFloat)
+            endView.setUploadProgress(files, percent / 100f)
 
-            // Only show the bottom sheet once, updates come from observeBottomSheetProgress
             if (!sheetShown) {
                 sheetShown = true
                 showProgressImportSheet(
                     baseActivity.supportFragmentManager,
                     getString(R.string.Vault_Importing_SheetTitle),
                     files.size,
-                    resources.getQuantityString(
-                        R.plurals.Vault_Importing_SheetProgress, files.size
-                    ),
+                    resources.getQuantityString(R.plurals.Vault_Importing_SheetProgress, files.size),
                     progressStatus = progressPercentLiveData,
                     getString(R.string.action_cancel).uppercase(),
                     viewLifecycleOwner
-                ) {
+                ) { /* no-op */ }
+            }
 
-                }
+            val isTerminal = when (state.sessionStatus) {
+                SessionStatus.FINISHED,
+                SessionStatus.FINISHED_WITH_ERRORS,
+                SessionStatus.CLOSED -> true
+                else -> false  // WAITING, SENDING, SAVING → not yet
             }
 
-            val allSaved = files.all { it.status == P2PFileStatus.SAVED }
-            if (state.sessionStatus == SessionStatus.FINISHED && allSaved) {
+            if (isTerminal) {
                 stopServerAndNavigate()
             }
         }
@@ -121,8 +114,8 @@ class RecipientUploadFilesFragment :
     private fun observeBottomSheetProgress() {
         viewModel.bottomSheetProgress.observe(viewLifecycleOwner) { progress ->
             if (!sheetShown) return@observe
+            // The sheet dismisses itself when current == total
             progressPercentLiveData.postValue(progress.current)
         }
     }
-
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 6ce379e37..0b24c21f0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -37,6 +37,7 @@ class SenderUploadFilesFragment :
                 getString(R.string.stop).uppercase(),
                 {},
                 {
+                    viewModel.closePeerConnection()
                     PeerToPeerFlags.cancelled = true
                     baseActivity.finish()
                 })
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 92bda5448..7a137db12 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -198,6 +198,21 @@ class FileTransferViewModel @Inject constructor(
         p2PSharedState.clear()
     }
 
+    fun closePeerConnection() {
+        viewModelScope.launch {
+            val ip = p2PSharedState.ip
+            val port = p2PSharedState.port
+            val fingerprint = p2PSharedState.hash
+            val success = peerClient.closeConnection(
+                ip = ip,
+                port = port,
+                expectedFingerprint = fingerprint,
+                sessionId = p2PSharedState.session?.sessionId ?: ""
+            )
+            if (!success) Timber.e("Failed to close peer connection.")
+        }
+    }
+
 }
 
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 97b8c4547..0d30a688d 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -39,6 +39,8 @@ import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.Bot
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.state.UploadProgressState
 import timber.log.Timber
 import java.io.File
+import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 
 @HiltViewModel
@@ -77,7 +79,6 @@ class PeerToPeerViewModel @Inject constructor(
     private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
     val uploadProgress: SingleLiveEvent<UploadProgressState?> get() = _uploadProgress
 
-
     private val networkInfoManager = NetworkInfoManager(context)
     val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
 
@@ -87,13 +88,21 @@ class PeerToPeerViewModel @Inject constructor(
     private val _closeConnection = SingleLiveEvent<Boolean>()
     val closeConnection: SingleLiveEvent<Boolean> get() = _closeConnection
 
-    private var isVaultSaveDone = false
+    // ---------- Save-on-arrival state ----------
+    // Track files being saved/done by transmissionId to prevent duplicate saves.
+    private val savingOrDone: MutableSet<String> =
+        Collections.newSetFromMap(ConcurrentHashMap<String, Boolean>())
+    private var totalFilesExpected = 0
+    private var savedCount = 0
+    private var targetFolderId: String? = null
+    // -------------------------------------------
 
     init {
         observePrepareUploadEvents()
         observeRegistrationEvents()
         observeRegistrationRequests()
         observeUploadProgress()
+        observeCloseConnectionEvents()
     }
 
     private fun observePrepareUploadEvents() {
@@ -117,7 +126,11 @@ class PeerToPeerViewModel @Inject constructor(
     private fun observeCloseConnectionEvents() {
         viewModelScope.launch {
             PeerEventManager.closeConnectionEvent.collect { success ->
-                _closeConnection.postValue(success)
+                if (success) {
+                    // Set CLOSED now; final emission will happen when all files are saved/failed
+                    p2PState.session?.status = SessionStatus.CLOSED
+                    emitFinalIfReady(SessionStatus.CLOSED)
+                }
             }
         }
     }
@@ -125,10 +138,8 @@ class PeerToPeerViewModel @Inject constructor(
     private fun observeRegistrationRequests() {
         viewModelScope.launch {
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
-                if (registrationId.isEmpty()) return@collect // Ignore sentinel
-
+                if (registrationId.isEmpty()) return@collect
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
-
                 if (!p2PState.isUsingManualConnection) {
                     PeerEventManager.confirmRegistration(registrationId, true)
                     _registrationSuccess.postValue(true)
@@ -140,69 +151,247 @@ class PeerToPeerViewModel @Inject constructor(
 
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
-            val result = FingerprintFetcher.fetch(context,ip, port.toInt())
-            result.onSuccess { hash ->
-                Timber.d("hash ***** $hash")
-                p2PState.hash = hash
-                _getHashSuccess.postValue(hash)
-
-                // Notify the server after fetching the hash
-                runCatching {
-                    ServerPinger.notifyServer(ip, port.toInt())
-                }.onFailure {
-                    Timber.e(it, "Failed to ping server after fetching hash")
+            FingerprintFetcher.fetch(context, ip, port.toInt())
+                .onSuccess { hash ->
+                    p2PState.hash = hash
+                    _getHashSuccess.postValue(hash)
+                    runCatching { ServerPinger.notifyServer(ip, port.toInt()) }
+                        .onFailure { Timber.e(it, "Failed to ping server after fetching hash") }
+                }
+                .onFailure {
+                    bottomSheetError.postValue(
+                        "Connection failed" to
+                                "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+                    )
                 }
+        }
+    }
+
+    // -------------------- SAVE-ON-ARRIVAL CORE --------------------
+
+    private fun initCountersIfNeeded() {
+        val session = p2PState.session ?: return
+        if (totalFilesExpected == 0) {
+            totalFilesExpected = session.files.size
+            savedCount = session.files.values.count { it.status == P2PFileStatus.SAVED }
+            // Mark already terminal as “done” to avoid reprocessing
+            session.files.values.forEach { pf ->
+                val tx = pf.transmissionId
+                if (!tx.isNullOrBlank() &&
+                    (pf.status == P2PFileStatus.SAVED || pf.status == P2PFileStatus.FAILED)
+                ) {
+                    savingOrDone.add(tx)
+                }
+            }
+            postBottomSheetProgress()
+        }
+    }
+
+    private fun maybeFinalizeAfterSave() {
+        val session = p2PState.session ?: return
+        if (!allFilesSavedOrFailed()) return
+
+        val final = when (session.status) {
+            SessionStatus.CLOSED -> SessionStatus.CLOSED
+            SessionStatus.SENDING, SessionStatus.SAVING -> computeFinalStatus()
+            // If server already marked FINISHED/FINISHED_WITH_ERRORS we keep it
+            SessionStatus.FINISHED, SessionStatus.FINISHED_WITH_ERRORS -> session.status
+            else -> computeFinalStatus()
+        }
+
+        session.status = final
+
+        _uploadProgress.postValue(
+            UploadProgressState(
+                title = session.title.orEmpty(),
+                sessionStatus = final,     // <-- TERMINAL
+                files = session.files.values.toList(),
+                percent = 100
+            )
+        )
+    }
 
-            }.onFailure { error ->
-                Timber.d("error ***** $error")
-                bottomSheetError.postValue(
-                    "Connection failed" to
-                            "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+
+
+    private fun obtainTargetFolderId(): String {
+        targetFolderId?.let { return it }
+        val title = (p2PState.session?.title ?: "").trim()
+        val finalTitle = if (title.isEmpty()) "Transfer" else title
+
+        val vault = MyApplication.keyRxVault.rxVault.blockingFirst()
+        val root = vault.root.blockingGet()
+        val folder = vault.builder()
+            .setName(finalTitle)
+            .setType(VaultFile.Type.DIRECTORY)
+            .build(root.id)
+            .blockingGet()
+        targetFolderId = folder.id
+        return folder.id
+    }
+
+    private fun saveOneFile(pf: ProgressFile) {
+        val txId = pf.transmissionId ?: return
+        // Guard to avoid duplicate saves
+        if (!savingOrDone.add(txId)) return
+
+        // First save → switch session to SAVING (so UI doesn’t navigate early)
+        if (p2PState.session?.status == SessionStatus.SENDING) {
+            p2PState.session?.status = SessionStatus.SAVING
+            _uploadProgress.postValue(
+                UploadProgressState(
+                    title = p2PState.session?.title.orEmpty(),
+                    sessionStatus = SessionStatus.SAVING,
+                    files = p2PState.session?.files?.values?.toList().orEmpty(),
+                    percent = 100 // transport might have reached 100; keep UI bar full while saving
                 )
+            )
+        }
+
+        try {
+            val path = pf.path ?: return
+            val f = File(path)
+            if (!f.exists()) return
+
+            val folderId = obtainTargetFolderId()
+            val vault = MyApplication.keyRxVault.rxVault.blockingFirst()
+
+            val vaultFile = try {
+                when {
+                    isImageFileType(pf.file.fileType) -> {
+                        val bytes = f.readBytes()
+                        if (pf.file.fileType.contains("png", true)) {
+                            MediaFileHandler.savePngImage(bytes)
+                        } else {
+                            MediaFileHandler.saveJpegPhoto(bytes, folderId).blockingGet()
+                        }
+                    }
+                    isVideoFileType(pf.file.fileType) -> {
+                        MediaFileHandler.saveMp4Video(f, folderId)
+                    }
+                    else -> {
+                        vault.builder(f.inputStream())
+                            .setName(f.name)
+                            .setMimeType(pf.file.fileType)
+                            .setType(VaultFile.Type.FILE)
+                            .build(folderId)
+                            .blockingGet()
+                    }
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to save file ${pf.file.fileName}")
+                null
             }
+
+            // Mark SAVED only after DB write succeeds
+            // NOTE: use transmissionId key; ensure your session map is keyed accordingly.
+            val txKey = pf.transmissionId
+            if (txKey != null) {
+                p2PState.session?.files?.get(txKey)?.status = P2PFileStatus.SAVED
+            }
+            pf.status = P2PFileStatus.SAVED
+            pf.vaultFile = vaultFile
+            savedCount++
+            f.delete()
+        } catch (e: Exception) {
+            Timber.e(e, "Saving to vault failed for file ${pf.file.fileName}")
+            pf.status = P2PFileStatus.FAILED
+            // do not increment savedCount on failure
+        } finally {
+            postBottomSheetProgress()
+            maybeFinalizeAfterSave()
+        }
+    }
+
+    private fun postBottomSheetProgress() {
+        _bottomSheetProgress.postValue(
+            BottomSheetProgressState(
+                current = savedCount,
+                total = totalFilesExpected,
+                percent = if (totalFilesExpected > 0) (savedCount * 100 / totalFilesExpected) else 0
+            )
+        )
+    }
+
+    private fun sessionIsTerminal(sessionStatus: SessionStatus): Boolean =
+        sessionStatus == SessionStatus.FINISHED ||
+                sessionStatus == SessionStatus.FINISHED_WITH_ERRORS ||
+                sessionStatus == SessionStatus.CLOSED
+
+    private fun allFilesSavedOrFailed(): Boolean =
+        p2PState.session?.files?.values?.all {
+            it.status == P2PFileStatus.SAVED || it.status == P2PFileStatus.FAILED
+        } == true
+
+    private fun computeFinalStatus(): SessionStatus {
+        val files = p2PState.session?.files?.values.orEmpty()
+        val anyFailed = files.any { it.status == P2PFileStatus.FAILED }
+        return if (anyFailed) SessionStatus.FINISHED_WITH_ERRORS else SessionStatus.FINISHED
+    }
+
+    private fun emitFinalIfReady(triggerStatus: SessionStatus) {
+        val session = p2PState.session ?: return
+
+        // Only finish when:
+        // - session is terminal (by sender or by logic), AND
+        // - all files are saved/failed locally
+        if (!sessionIsTerminal(triggerStatus)) return
+        if (!allFilesSavedOrFailed()) return
+
+        val final = when (session.status) {
+            SessionStatus.CLOSED -> SessionStatus.CLOSED
+            else -> computeFinalStatus()
         }
+        session.status = final
+
+        _uploadProgress.postValue(
+            UploadProgressState(
+                title = session.title.orEmpty(),
+                sessionStatus = final,
+                files = session.files.values.toList(),
+                percent = 100
+            )
+        )
     }
 
     private fun observeUploadProgress() {
         viewModelScope.launch {
             PeerEventManager.uploadProgressStateFlow.collect { state ->
-                val allFinished = state.files.all { it.status == P2PFileStatus.FINISHED }
-
-                _uploadProgress.postValue(state) // existing state for other logic
-
-                if (allFinished && !isVaultSaveDone) {
-                    isVaultSaveDone = true
-                    finalizeAndSaveReceivedFiles(p2PState.session?.title.orEmpty(), state.files)
+                initCountersIfNeeded()
+
+                // Forward raw transport progress (SENDING) from the server
+                _uploadProgress.postValue(state)
+
+                // Save each FINISHED file exactly once (by transmissionId)
+                state.files.forEach { pf ->
+                    val txId = pf.transmissionId
+                    if (txId != null &&
+                        pf.status == P2PFileStatus.FINISHED &&
+                        !savingOrDone.contains(txId)
+                    ) {
+                        viewModelScope.launch(Dispatchers.IO) { saveOneFile(pf) }
+                    }
                 }
+
+                // If the sender is done/cancelled, finalize when all files are saved/failed
+                emitFinalIfReady(state.sessionStatus)
             }
         }
     }
 
-
-    fun startRegistration(
-        ip: String,
-        port: String,
-        hash: String,
-        pin: String
-    ) {
+    fun startRegistration(ip: String, port: String, hash: String, pin: String) {
         viewModelScope.launch {
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
-                    if (p2PState.session == null) {
-                        p2PState.session = P2PSharedState.createNewSession()
-                    }
+                    if (p2PState.session == null) p2PState.session = P2PSharedState.createNewSession()
                     p2PState.session?.sessionId = result.sessionId
-                    Timber.d("session id ***startRegistration ${p2PState.session?.sessionId}")
                     _registrationSuccess.postValue(true)
                 }
-
                 RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
                 RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
                 RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")
                 RegisterPeerResult.TooManyRequests -> bottomMessageError.postValue("Too many requests, try again later")
                 RegisterPeerResult.ServerError -> bottomMessageError.postValue("Server error, try again later")
                 RegisterPeerResult.RejectedByReceiver -> bottomMessageError.postValue("Receiver rejected the registration")
-
                 is RegisterPeerResult.Failure -> {
                     Timber.e(result.exception, "Connection failure")
                     bottomSheetError.postValue(
@@ -247,124 +436,21 @@ class PeerToPeerViewModel @Inject constructor(
         networkInfoManager.fetchCurrentNetworkInfo()
     }
 
-    private fun finalizeAndSaveReceivedFiles(
-        folderName: String,
-        progressFiles: List<ProgressFile>
-    ) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val vault = MyApplication.keyRxVault.rxVault.blockingFirst()
-            val root = vault.root.blockingGet()
-
-            val folder = vault.builder()
-                .setName(folderName)
-                .setType(VaultFile.Type.DIRECTORY)
-                .build(root.id)
-                .blockingGet()
-
-            val totalFiles = progressFiles.size
-            var savedFiles = 0
-
-            progressFiles.forEach { progressFile ->
-                try {
-                    val path = progressFile.path ?: return@forEach
-                    val file = File(path)
-                    if (!file.exists()) return@forEach
-
-                    val vaultFile = try {
-                        when {
-                            isImageFileType(progressFile.file.fileType) -> {
-                                val imageBytes = file.readBytes()
-                                if (progressFile.file.fileType.contains("png", ignoreCase = true)) {
-                                    MediaFileHandler.savePngImage(imageBytes)
-                                } else {
-                                    MediaFileHandler.saveJpegPhoto(imageBytes, folder.id)
-                                        .blockingGet()
-                                }
-                            }
-
-                            isVideoFileType(progressFile.file.fileType) -> {
-                                MediaFileHandler.saveMp4Video(file, folder.id)
-                            }
-
-                            else -> {
-                                vault.builder(file.inputStream())
-                                    .setName(file.name)
-                                    .setMimeType(progressFile.file.fileType)
-                                    .setType(VaultFile.Type.FILE)
-                                    .build(folder.id)
-                                    .blockingGet()
-                            }
-                        }
-                    } catch (e: Exception) {
-                        Timber.e(e, "Failed to save file ${progressFile.file.fileName}")
-                        null
-                    }
-
-                    p2PState.session?.files?.get(progressFile.file.id)?.status = P2PFileStatus.SAVED
-                    progressFile.status = P2PFileStatus.SAVED
-                    progressFile.vaultFile = vaultFile
-                    savedFiles++
-                    file.delete()
-
-                    _bottomSheetProgress.postValue(
-                        BottomSheetProgressState(
-                            current = savedFiles,
-                            total = totalFiles,
-                            percent = ((savedFiles * 100) / totalFiles)
-                        )
-                    )
-
-                } catch (e: Exception) {
-                    Timber.e(e, "Saving to vault failed for file ${progressFile.file.fileName}")
-                    progressFile.status = P2PFileStatus.FAILED
-                }
-            }
-
-            p2PState.session?.status = SessionStatus.FINISHED
-
-            val updatedFiles = p2PState.session?.files?.values?.toList().orEmpty()
-
-            _bottomSheetProgress.postValue(
-                BottomSheetProgressState(
-                    current = totalFiles,
-                    total = totalFiles,
-                    percent = 100
-                )
-            )
-
-            _uploadProgress.postValue(
-                UploadProgressState(
-                    title = p2PState.session?.title ?: "",
-                    sessionStatus = SessionStatus.FINISHED,
-                    files = updatedFiles,
-                    percent = 100
-                )
-            )
-
-        }
-    }
-
     fun closePeerConnection() {
         viewModelScope.launch {
             val ip = p2PState.ip
             val port = p2PState.port
             val fingerprint = p2PState.hash
-
             val success = peerClient.closeConnection(
                 ip = ip,
                 port = port,
                 expectedFingerprint = fingerprint,
                 sessionId = p2PState.session?.sessionId ?: ""
             )
-            if (success) {
-                Timber.d("Connection closed successfully.")
-            } else {
-                Timber.e("Failed to close peer connection.")
-            }
+            if (!success) Timber.e("Failed to close peer connection.")
         }
     }
 
-
     override fun onCleared() {
         super.onCleared()
         p2PState.clear()
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
index ae46487e6..deb81d997 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/bottomsheet/BottomSheetUtils.kt
@@ -354,7 +354,7 @@ object BottomSheetUtils {
                     setupButton(buttonFourDeactivated, buttonFourLabel)
                     setupButton(buttonFiveDeactivated, buttonFiveLabel)
                     setupButton(buttonSixDeactivated, buttonSixLabel)
-                    unavailableConnexionText.text = unavailableConnexionLabel;
+                    unavailableConnexionText.text = unavailableConnexionLabel
                     unavailableConnexionTextDesc.text = unavailableConnexionDesc
 
                     // Set button click listeners using a helper method

From 1d5bbf272f4b667412f0db0e7d8fca9e2ce7f3a3 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 3 Sep 2025 13:50:43 +0100
Subject: [PATCH 128/153] Fix design

---
 mobile/src/main/res/layout/show_device_info_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/src/main/res/layout/show_device_info_layout.xml b/mobile/src/main/res/layout/show_device_info_layout.xml
index d21085a0e..dcc90c68f 100644
--- a/mobile/src/main/res/layout/show_device_info_layout.xml
+++ b/mobile/src/main/res/layout/show_device_info_layout.xml
@@ -15,7 +15,7 @@
         app:arrowBackIconContentDescription="@string/connect_manually"
         app:layout_constraintTop_toTopOf="parent"
         app:popupTheme="@style/AppTheme.PopupOverlay"
-        app:startTitle="@string/verification" />
+        app:startTitle="@string/connect_manually" />
 
 
     <ImageView

From bb4c70c16d76b2dc57ac612e5dd6ac8eda1228f5 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Fri, 5 Sep 2025 16:03:53 +0100
Subject: [PATCH 129/153] add nearby settings/home screen

---
 .../mobile/data/sharedpref/Preferences.java   |   8 ++++
 .../mobile/data/sharedpref/SharedPrefs.java   |   2 +
 .../tella/mobile/domain/entity/ServerType.kt  |   2 +-
 .../activity/ServersSettingsActivity.java     |  17 +++++++-
 .../views/activity/SettingsActivity.java      |   4 +-
 .../fragment/vault/adapters/VaultAdapter.kt   |  23 +++++++----
 .../adapters/connections/ServerAdapter.kt     |  39 ++++++++++++++----
 .../adapters/connections/ServerViewHolder.kt  |  15 ++++---
 .../fragment/vault/home/HomeVaultFragment.kt  |  22 ++++++++--
 .../res/drawable-xhdpi/ic_add_connection.png  | Bin 0 -> 2655 bytes
 .../res/drawable-xxhdpi/ic_add_connection.png | Bin 0 -> 3982 bytes
 .../res/drawable/bg_add_connection_dashed.xml |  10 +++++
 .../main/res/drawable/ic_add_connection.png   | Bin 0 -> 1308 bytes
 mobile/src/main/res/drawable/ic_add_home.xml  |  11 +++++
 .../activity_documentation_settings.xml       |  13 ++++++
 .../src/main/res/layout/activity_settings.xml |  14 +++----
 .../res/layout/item_add_connection_card.xml   |  23 +++++++++++
 .../res/layout/sender_manual_connection.xml   |   2 +-
 mobile/src/main/res/values/config.xml         |   1 +
 mobile/src/main/res/values/strings.xml        |   4 ++
 20 files changed, 172 insertions(+), 38 deletions(-)
 create mode 100644 mobile/src/main/res/drawable-xhdpi/ic_add_connection.png
 create mode 100644 mobile/src/main/res/drawable-xxhdpi/ic_add_connection.png
 create mode 100644 mobile/src/main/res/drawable/bg_add_connection_dashed.xml
 create mode 100644 mobile/src/main/res/drawable/ic_add_connection.png
 create mode 100644 mobile/src/main/res/drawable/ic_add_home.xml
 create mode 100644 mobile/src/main/res/layout/item_add_connection_card.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
index 8f9e2de86..06357b892 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
@@ -126,6 +126,14 @@ public static void setEraseForms(boolean value) {
         setBoolean(SharedPrefs.ERASE_FORMS, value);
     }
 
+    public static boolean isEnableHomeNearby() {
+        return getBoolean(SharedPrefs.ENABLE_HOME_NEARBY_SHARING, false);
+    }
+
+    public static void setEnableHomeNearby(boolean value) {
+        setBoolean(SharedPrefs.ENABLE_HOME_NEARBY_SHARING, value);
+    }
+
     public static boolean isPanicGeolocationActive() {
         return getBoolean(SharedPrefs.PANIC_GEOLOCATION, true);
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/SharedPrefs.java b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/SharedPrefs.java
index 391f92715..3a5c8072f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/SharedPrefs.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/SharedPrefs.java
@@ -32,6 +32,8 @@ public class SharedPrefs {
 
     static final String REMAINING_UNLOCK_ATTEMPTS = "remaining_unlock_attempts";
     static final String ERASE_FORMS = "erase_forms";
+
+    static final String ENABLE_HOME_NEARBY_SHARING = "enable_home_nearby_sharing";
     //private static final String AUTO_SAVE_DRAFT_FORM = "auto_save_draft_form";
     private static final String LANGUAGE = "language";
     static final String SECRET_MODE_ENABLED = "secret_password_enabled";
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
index 5946e5bea..99ff73a43 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/ServerType.kt
@@ -1,5 +1,5 @@
 package org.horizontal.tella.mobile.domain.entity
 
 enum class ServerType {
-    UNKNOWN, ODK_COLLECT, TELLA_UPLOAD, TELLA_RESORCES, UWAZI, GOOGLE_DRIVE, DROP_BOX, NEXTCLOUD,PEERTOPEER
+    UNKNOWN, ODK_COLLECT, TELLA_UPLOAD, TELLA_RESORCES, UWAZI, GOOGLE_DRIVE, DROP_BOX, NEXTCLOUD, PEERTOPEER, ADD_BUTTON
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/ServersSettingsActivity.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/ServersSettingsActivity.java
index a0c5f2c9b..82470b8a8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/ServersSettingsActivity.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/ServersSettingsActivity.java
@@ -141,6 +141,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         initDropBoxEvents();
         initNextCloudEvents();
         initListeners();
+        initNearbySharingView();
     }
 
     private void initObservers() {
@@ -188,6 +189,19 @@ private void initObservers() {
         nextCloudServersViewModel.getServerRemoved().observe(this, this::onRemovedNextCloudServer);
     }
 
+    private void initNearbySharingView() {
+        binding.nearbySharingSwitch.mSwitch.setChecked(Preferences.isEnableHomeNearby());
+        binding.nearbySharingSwitch.setTextAndAction(R.string.action_learn_more, () -> {
+            maybeChangeTemporaryTimeout(() -> {
+                Util.startBrowserIntent(getApplicationContext(), getString(R.string.config_nearby_sharing_url));
+                return null;
+            });
+            return Unit.INSTANCE;
+        });
+
+        binding.nearbySharingSwitch.mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> Preferences.setEnableHomeNearby(isChecked));
+    }
+
     private void initDropBoxEvents() {
         INSTANCE.getCreateDropBoxServer().observe(this, server -> {
             if (server != null) {
@@ -399,8 +413,7 @@ public void onRefreshBlankFormsError(Throwable error) {
     private void showChooseServerTypeDialog() {
 
         BottomSheetUtils.showBinaryTypeSheet(this.getSupportFragmentManager(), this, getString(R.string.settings_add_server_selection_dialog_title), getString(R.string.settings_add_server_selection_dialog_title), getString(R.string.Connections_description_selection), getString(R.string.Connections_description), this::browseIntent, getString(R.string.action_cancel), //TODO CHECk THIS
-                getString(R.string.action_ok),
-                getString(R.string.settings_docu_add_server_dialog_select_odk), getString(R.string.settings_docu_add_server_dialog_select_tella_web), getString(R.string.settings_docu_add_server_dialog_select_tella_uwazi), getString(R.string.settings_docu_add_server_dialog_select_tella_google_drive), getString(R.string.settings_docu_add_server_dialog_select_tella_dropbox), getString(R.string.settings_docu_add_server_dialog_select_next_cloud), getString(R.string.unavailable_connections), getString(R.string.unavailable_connections_desc), servers.stream().anyMatch(server -> server instanceof GoogleDriveServer), servers.stream().anyMatch(server -> server instanceof DropBoxServer), servers.stream().anyMatch(server -> server instanceof NextCloudServer), new BottomSheetUtils.IServerChoiceActions() {
+                getString(R.string.action_ok), getString(R.string.settings_docu_add_server_dialog_select_odk), getString(R.string.settings_docu_add_server_dialog_select_tella_web), getString(R.string.settings_docu_add_server_dialog_select_tella_uwazi), getString(R.string.settings_docu_add_server_dialog_select_tella_google_drive), getString(R.string.settings_docu_add_server_dialog_select_tella_dropbox), getString(R.string.settings_docu_add_server_dialog_select_next_cloud), getString(R.string.unavailable_connections), getString(R.string.unavailable_connections_desc), servers.stream().anyMatch(server -> server instanceof GoogleDriveServer), servers.stream().anyMatch(server -> server instanceof DropBoxServer), servers.stream().anyMatch(server -> server instanceof NextCloudServer), new BottomSheetUtils.IServerChoiceActions() {
 
                     @Override
                     public void addDropBoxServer() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/SettingsActivity.java b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/SettingsActivity.java
index 115e151b5..9429116ec 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/SettingsActivity.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/SettingsActivity.java
@@ -72,14 +72,14 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         disposables = MyApplication.bus().createCompositeDisposable();
-        disposables.wire(LocaleChangedEvent.class, new EventObserver<LocaleChangedEvent>() {
+        disposables.wire(LocaleChangedEvent.class, new EventObserver<>() {
             @Override
             public void onNext(@NotNull LocaleChangedEvent event) {
                 recreate();
             }
         });
 
-        disposables.wire(CloseSettingsActivityEvent.class, new EventObserver<CloseSettingsActivityEvent>() {
+        disposables.wire(CloseSettingsActivityEvent.class, new EventObserver<>() {
             @Override
             public void onNext(@NotNull CloseSettingsActivityEvent event) {
                 finish();
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/VaultAdapter.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/VaultAdapter.kt
index 4d2ebd342..bb41e2263 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/VaultAdapter.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/VaultAdapter.kt
@@ -11,6 +11,7 @@ import org.horizontal.tella.mobile.data.sharedpref.Preferences
 import org.horizontal.tella.mobile.data.sharedpref.Preferences.hasAcceptedAnalytics
 import org.horizontal.tella.mobile.data.sharedpref.Preferences.isShowVaultAnalyticsSection
 import org.horizontal.tella.mobile.data.sharedpref.Preferences.isTimeToShowReminderAnalytics
+import org.horizontal.tella.mobile.domain.entity.ServerType
 import org.horizontal.tella.mobile.domain.entity.collect.CollectForm
 import org.horizontal.tella.mobile.domain.entity.uwazi.UwaziTemplate
 import org.horizontal.tella.mobile.views.fragment.vault.adapters.connections.ServerDataItem
@@ -57,16 +58,20 @@ class VaultAdapter(private val onClick: VaultClickListener) :
         return oldList.zip(newList).all { (oldItem, newItem) -> oldItem == newItem }
     }
 
-    fun addConnectionServers(connectionsList: List<ServerDataItem>) {
-        val sortedConnectionsList = connectionsList.sortedBy { server -> server.type }
-        val newConnectionsItem = DataItem.ConnectionsItem(sortedConnectionsList)
+    private fun ServerType.rank(): Int = when (this) {
+        ServerType.ADD_BUTTON -> Int.MAX_VALUE  // always last
+        else -> ordinal                          // or a custom map if you want a specific order
+    }
 
-        // Check if the current connections are the same as the new ones
-        if (favoriteForms.isEmpty() || !areListsEqual(
-                connectionsList.first().servers, newConnectionsItem.item
-            )
-        ) {
-            connections = mutableListOf(newConnectionsItem)
+    fun addConnectionServers(connectionsList: List<ServerDataItem>) {
+        val ordered = connectionsList.sortedWith(
+            compareBy<ServerDataItem> { it.type.rank() }
+                .thenBy { it.type.name } // secondary, harmless
+        )
+        val newItem = DataItem.ConnectionsItem(ordered)
+        val same = connections.firstOrNull()?.item == newItem.item
+        if (!same) {
+            connections = mutableListOf(newItem)
             updateItems()
         }
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerAdapter.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerAdapter.kt
index 8088081dc..9de87ab5b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerAdapter.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerAdapter.kt
@@ -1,21 +1,46 @@
 package org.horizontal.tella.mobile.views.fragment.vault.adapters.connections
 
+import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.domain.entity.ServerType
 import org.horizontal.tella.mobile.views.fragment.vault.adapters.VaultClickListener
 
 class ServerAdapter(
-    val list: List<ServerDataItem>,
+    private val list: List<ServerDataItem>,
     private val vaultClickListener: VaultClickListener
-) : RecyclerView.Adapter<ServerViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ServerViewHolder {
-        return ServerViewHolder.from(parent)
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private companion object {
+        const val TYPE_SERVER = 0
+        const val TYPE_ADD = 1
+    }
+
+    override fun getItemViewType(position: Int): Int =
+        if (list[position].type == ServerType.ADD_BUTTON) TYPE_ADD else TYPE_SERVER
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return if (viewType == TYPE_ADD) {
+            val v = inflater.inflate(R.layout.item_add_connection_card, parent, false)
+            AddButtonViewHolder(v)
+        } else {
+            ServerViewHolder.from(parent) // your existing server card holder
+        }
     }
 
-    override fun onBindViewHolder(holder: ServerViewHolder, position: Int) {
-        holder.bind(list[position], vaultClickListener)
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val item = list[position]
+        if (holder is AddButtonViewHolder) {
+            holder.itemView.setOnClickListener { vaultClickListener.onServerItemClickListener(item) }
+        } else if (holder is ServerViewHolder) {
+            holder.bind(item, vaultClickListener)
+        }
     }
 
     override fun getItemCount() = list.size
 
-}
\ No newline at end of file
+    private class AddButtonViewHolder(view: View) : RecyclerView.ViewHolder(view)
+}
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
index 657fd4e05..390877fc8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/adapters/connections/ServerViewHolder.kt
@@ -1,6 +1,5 @@
 package org.horizontal.tella.mobile.views.fragment.vault.adapters.connections
 
-import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -23,10 +22,6 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
         twoLinesReportTypeTextView = view.findViewById(R.id.two_line_server_name_textView)
         reportTypeImg = view.findViewById(R.id.server_img)
 
-        // Set the default padding
-       // val defaultPadding = view.context.resources.getDimensionPixelSize(R.dimen.hide_tella_small_margin)
-      //  view.setPadding(view.paddingLeft, defaultPadding, view.paddingRight, view.paddingBottom)
-
         when (item.type) {
             ServerType.UWAZI -> {
                 reportTypeTextView.text = view.context.getString(R.string.Home_BottomNav_Uwazi)
@@ -38,6 +33,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.TELLA_UPLOAD -> {
                 reportTypeTextView.text = view.context.getText(R.string.Home_BottomNav_Reports)
                 reportTypeImg.setImageDrawable(
@@ -48,6 +44,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.TELLA_RESORCES -> {
                 reportTypeTextView.text = view.context.getText(R.string.Home_BottomNav_Resources)
                 reportTypeImg.setImageDrawable(
@@ -58,6 +55,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.ODK_COLLECT -> {
                 reportTypeTextView.text = view.context.getText(R.string.Home_BottomNav_Forms)
                 reportTypeImg.setImageDrawable(
@@ -68,6 +66,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.GOOGLE_DRIVE -> {
                 reportTypeTextView.text = view.context.getText(R.string.google_drive)
                 reportTypeImg.setImageDrawable(
@@ -78,6 +77,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.DROP_BOX -> {
                 reportTypeTextView.text = view.context.getString(R.string.dropbox)
                 reportTypeImg.setImageDrawable(
@@ -88,6 +88,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.NEXTCLOUD -> {
                 reportTypeTextView.text = view.context.getString(R.string.NextCloud)
                 reportTypeImg.setImageDrawable(
@@ -98,6 +99,7 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
+
             ServerType.PEERTOPEER -> {
                 twoLinesReportTypeTextView.text = view.context.getText(R.string.NearBySharing)
                 reportTypeImg.setImageDrawable(
@@ -108,7 +110,8 @@ class ServerViewHolder(val view: View) : BaseViewHolder<ServerDataItem>(view) {
                     )
                 )
             }
-            else -> { // todo create default server type
+
+            else -> {
             }
         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
index 9149c6fd9..670637248 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/vault/home/HomeVaultFragment.kt
@@ -56,6 +56,7 @@ import org.horizontal.tella.mobile.util.TopSheetTestUtils.showBackgroundActiviti
 import org.horizontal.tella.mobile.util.setMargins
 import org.horizontal.tella.mobile.views.activity.CollectFormEntryActivity
 import org.horizontal.tella.mobile.views.activity.MainActivity
+import org.horizontal.tella.mobile.views.activity.ServersSettingsActivity
 import org.horizontal.tella.mobile.views.activity.analytics.AnalyticsActions
 import org.horizontal.tella.mobile.views.activity.analytics.AnalyticsIntroActivity
 import org.horizontal.tella.mobile.views.activity.viewer.AudioPlayActivity
@@ -462,6 +463,15 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
                 nav().navigate(R.id.action_homeScreen_to_peerToPeer_screen)
             }
 
+            ServerType.ADD_BUTTON -> {
+                baseActivity.startActivity(
+                    Intent(
+                        baseActivity,
+                        ServersSettingsActivity::class.java
+                    )
+                )
+            }
+
             else -> {}
         }
     }
@@ -748,19 +758,25 @@ class HomeVaultFragment : BaseFragment(), VaultClickListener {
     }
 
     private fun handleServerCountsSuccess(serverCounts: ServerCounts) {
-        // Handle each server type
+        serversList?.clear()
+
         handleGoogleDriveServers(serverCounts.googleDriveServers)
         handleDropBoxServers(serverCounts.dropBoxServers)
         handleNextCloudServers(serverCounts.nextCloudServers)
         handleTellaUploadServers(serverCounts.tellaUploadServers)
         handleCollectServers(serverCounts.collectServers)
         handleUwaziServers(serverCounts.uwaziServers)
-        serversList?.add(ServerDataItem(ArrayList(), ServerType.PEERTOPEER))
 
-        // Check if we need to show connections
+        if (Preferences.isEnableHomeNearby()) {
+            serversList?.add(ServerDataItem(emptyList(), ServerType.PEERTOPEER))
+        }
+
+        serversList?.add(ServerDataItem(emptyList(), ServerType.ADD_BUTTON))
+
         maybeShowConnections()
     }
 
+
     private fun handleServerCountsError(error: Throwable?) {
         error?.let {
             Timber.d("***onServerCountFailed**$it")
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_add_connection.png b/mobile/src/main/res/drawable-xhdpi/ic_add_connection.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c04820114a50f31116e3307b7e7810d41739174
GIT binary patch
literal 2655
zcmai0XHXN^7EUOFAkq|8K#E9j0zyzCksu(_q(neSP&!gVOE3lyMPU^LmpZi21eaby
zClFW{=>((%f}sc!q>~^>fAP(GGq3HuALpL=zI*PuGv~W=&v|v%!kC9kgbM%w@R;1b
zWzF=BKaKMgbG@r6+r@OJ18zG60{}uYKMiPNeR-2f0)wrMp@51(v2RSk=BaP44**mr
za34NoXCBx#xutLW7`R4NzbkDl^l=O1_+nAaU{c}iYMiNRjfQi(03v044yNDc>)*{I
zthNUod#S_{6ST0<9rg_L{rsPyI<#p)<OFW~cGai2cbNT?lA;$zE^mk4<8Zij95i+5
z_&CA_iAGI+`l>{v?!+|Un$nZ<<xll!^KLKRT*OyS5lrg$#+_+p{vp_dZ(P)()<s%d
z*L8C9zy~+%&Qq)!;~LoyCpQ&V41$0ep&KDh=Kjb-EkvJyUw6<X$6<lwb8~0KZBzOk
zgJb<vHz^<)<Xz}I6EO}tC~`s~oh0zc!y?K27VzhNjPuf)a?xd118)Z(;O?^VOxl3k
z5xV&xEe51ZT9+tQ;%$Hxpu;9d4(_E?D-NSlUwu6Hsmi3oV&OX&i)#(UM(so!pCs2$
zU!ly+9hr&i1#@pMX^xS$G%)eu<HlM<|C|HK0Ye)Ro<@n}3E*^X)cc3`%{%so!X~!v
zA$x6%WS&sGu2dSatj{2HDLC7)swX=s;1}3p<1u?xh&cXv0J3)^x;aa$S~y2{wr#4~
zx~1Z}OGiC?w6JYL7nmjdS}2GcOBJ7?2Wca{^@7`5EBrdv$zZdpEoGA-x$KszGugdy
z9$bw?`BKZZQLr!Ut>9UKEd{VmWno*qKMya`qi2*meV{=@++V5Ka&1*)?&JHK{>SrC
zDdT&HnVOw)<-~~jc+_5+8tcg^mSDUxrl>dUVxNY+1dp?h;434CqB4hJQds?QSAA=p
z+o~bwP=0fqgOF&s`b2|QaSK<w3~WA@cCN}&+-=!tb@UPDX4CFx9#(U@Vl2v0)soLa
zHfL4n=*z1&_oc%ST1|O=qOsai!AH#{!C!Y}Z_J{yLalEYc!#qi_yd%q$YQIxnl~8U
z4u=ueBipqCpGBx3JkLb|f8|(Dl977hh1xg^F_f)nKxM{u%@{4Ky`u(mis4_^f}2!N
zy0b~3>zN&VXX#sT=*Jd{k7`B4v47@RTWoC^WV2V1vo0^O_vkvSqXgV#?IZmD{?YT4
z`SgCD^GAepB-70xu9(ES45!mo8OpPJK+nQ+Bvu@`l_PoD9yVQ~aqso}P;u4@L#*Y;
zm1!o2axHA+jTJR9-9+rf+WjODuW9UCt_rwQV2SpjiEfWv_Ya;oN>_zeJ{&w7+-#fY
zI70wN-mSHt;g{s=tIgh4AeeMsPn;U|y0#*BWHEGY8bpxe<&i~yqP-bVb*#UTnl!BD
zr|S8@0v(xdA<_69s)w-3yEO%BRwS+432h#(%E;(6FKf3z6gwDtwQ&>rc3)pI?!iwV
z#{l%>Qf9Xy`gUV(q1f>r&@&6kS<W|+(pOpHhd6bh(*FvS=qB8mggA{VuO!(yHUPk0
z>ZN7cVW6Q^7Wa^qE2iGG26pdUXAb+)?_knZ!At)u#lPia0zZQ)zTMs3rz4rfC3=%8
z<h<dQrTz-%4;HV+gzZIC&9W|hw=nw9c1W>AUIi~{s`a^$yg!k{R$e0z<~&rS_8z=b
zr%L3^u<c=-Vmy;h1e0v7_(XulUZPKO8QSnX!^1ql#T44LRz77ueVKo5vWeyK2fQ$9
z=l>b`7a%HLQ_q4f>ODxd5kD|GK}ZekwaUMqVNXz=ZFv4$#_)!pZff*5td1jNcs~UU
za(EJwL2{(?zM9(*q35uTb_mXxi2XL*=fwHL_#{b3PdJWmGvU&JCG`8BlezQy&CnHp
zHFus#r)T@bAJC`ZM1Ng44a3_-?@x&@4J)Zrdv|So;W2nl-SMRKDs5(e&#>fCcnz3T
z8|6v3*i>D=AV+C>I!5do^;5||``=3aXPN&YXc=g(4iIQdCv?EZ_)Kt~CGvllS~RIC
zyJD8|eTjJi`t6<`cJO{ek8ek<dfEy9)$&AUm<mI`9c5FTt&#BH;Fk~rKx9Fain{N8
zWCuSk?NeI;*L}F8?#Bl0VVIp~|No_B7JWQ((<xG?Ta)>SP};M3L33p0m(LP1YLB}x
z9CiDb;ix+3U#jB)B%0eTFqBx~R!LOdI{~-o4(O9{7M%0&L*qz)O8@%I8<^E-Du9|S
zJXj!b*x)OJ3J8JWsF}5F#H5&5uONQKkQ8^aMi_0ka;-bqMtGUZ`O=K_ru_KbioR#6
z5UwGqR0sIJtFX33PA;f*q54C<d<DCGU<MW5ipeb7&z%f+hnVRmO$z3UB0P2>$&hzI
zVn43dQ$?Aj>`G<gs(We7SKb6>1L=m-FLQ@FM~<b&9Nfc$l{Xe($%JzoHm_Y_m~Yv3
zmWoNparP{0G5Ev6P)ca;V6UBsks^?sPyGXK_j&}vuGFcCd0Q^-6|Dp}U%qdpJnPMC
zpw#)4??D}5aNUuL_4VJZj>Ib9Ac16&VRm~Ut`kw;jQ(;!K?meK)Q0o~--NOEY3DuC
z$hxW&BsBuswkRpMT((T_HN`y0BN%Q#OE^+fJ2x23q26E8%}!ntCK`A~EZO^9x}NX-
zipQJGY1?pITv4L{J*P`9)xL2Z1_xu#?**-MYyXJ+l{?ekDa{p_+O4tVKzLj97(|H}
zcycGGwnWtxMRl3lpBJ9yP0KB?LIgkdiB&eJDXnt9DR?R4i&nILVx?>Pu$iVK1|_rB
z>26%Vp>yE{1`}O|x$dVjnW^Q7x1jFeFK72=!))RSy-@FX%P)oXFynZ)uxQ0T3P~dh
zx|plhjp%=eOs&gvHuouDJN!|;VM?ve(z3}RJqZe|h!iDm7NNq5v4QBt5sJd;>xwx3
zRjV9%h_EKUiPfKQ$3<$x979O~hj_Y4GDH}_KW<=jqBBSLJuY1H&cEw>c~(Ykpj^7Y
z_B6QMwO_P@Qk>o-<%vCH$g0T^rFiJV9s{~Rdo6rONv2Wa;*@xMTRHm5!<Hh*@1H_U
zKUF=jDVn6|?VI5hqr=-;Gn~~pC{Ehc-ztX%z+aIQXk*N)ww!2kLRP3dTJ9TYn&`x#
zkyGSc5I)45aC~SfdqpK}<9_0@Q}~lzY&r>Z-K%}Kn{ft>S=Oo-TD2~adECqD5}UGg
z1M_2XeKfh>Eb$k+ulPC=0)J(@B`sD*+(%_rLE<B%pL}p8H)}D$=W1|u#Bl=6Oep-Y
z?ro%{3)1NXSkH~864%;%(^}I%=j-+c5<tfcWCT{pbo*&Ae%<tpbi&W^5ny6yajOFQ
H;Q8MGK86oe

literal 0
HcmV?d00001

diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_add_connection.png b/mobile/src/main/res/drawable-xxhdpi/ic_add_connection.png
new file mode 100644
index 0000000000000000000000000000000000000000..9df731cfbff654d8099cdbfab0aadaba59ee7f3a
GIT binary patch
literal 3982
zcmcInXH=6*yL|(O4k|<sihvxd5Co+}I!IG$q!YRlAQC`n(j_24;UFr#2b3Oa0-}H@
zh}2L+=y*g7p#(lb0)pTT_x||qy8q5v-<`GgnwkA$*7MBF-p|YvxP>t<*Lf}g0C;cS
zFt7pu5abvfY)oeLUSBw~<GgpnF$e&}t{nqpn0dvWNrHl`jIRT=Ll;(<lM~*0=6V3o
zkjnkb0}KEs#cvwu*@S`U^IG?WCeL8M5JWP|tgQuJqZeh#X8Foxa;-R<>4f~N4O31V
zU`A%7n8i85W4W}1G^5}<(n_~;u<}}-dD*MaBR{fop4gZc-G|mEM;GN3fExg@>n)-i
zpBLmkdCjEKNW@u-S>f5WVJ8M5Vtk`D<^C<m*FoQnSM%1W$@>xX=g@b}M=qaDS}%|J
zejXOSQTI?{ax)-rqkOXCS@)z!>3kv4SErp(34O=tB1X!*evs2#okK@^J<N37Hi_`p
zkANPsZ<fuAqkebs8ce;&E1H;}j$hfvW40y015bXCg~kGMX^%K52{D<GE~YDJ-tOEh
zh^Be-S!C_1!lbRCyWdhSqCYp{{IwpG21$jz6&HlL9WAgs#wcvt*lih$%?Y@(I=m9Y
zo8brAuUqF1M2HZheAGtW)wWoCY}Ey1&PvRDX-ZSmqz9AQ!^^MZ+_l1*1mp#_<GB!#
zp9u=&E(p|k43vP+Zg&)~+~6LC(Qi_JBJ#qalUlTW(Lk}f$nhNpcY8aZ7LBIh+qtGH
ze4qSW{cv#jsfEZ=TrssbGltqz&6k-0HZe?*FxLMPz5KwBUy!D;88mk<+ch3ZtSTEB
z%hOa%yzUDLiC_8@6jX4FnJ`8`$~<rTyryMMDza^TXttCB9~1qlTk9(sBAv4$gbx_J
zIjLS0i_ATT_qkeWIWX+uf7{C`lV9d_MMhhc_|iTJ#{db+nT~J7Ns(}eNU|N`WIDF#
zg+(wF6z$H+9};iak==wAHc3WsL)IoJIt;y(#5K_aNj(<jNkxaom!-E5oRI3wXt9ZH
zeV-Wsw9XwhbG~8>At0j($J-+W>Sg7d(sppw){imTcSqc&O)7||W!y}|NuHPd)ZBaV
zn_IWKyMp^3SxUg2R3I+W5|f;*#04*R8os#%d1VqYq7W*dTr53>Rd93v{eD;}F<84#
z`VnXS1v?6n?S(Jz1%t$!)x>2rzhS=v$!cfNUILM4D7{Bryl(!^!;e~^`ap){XOiM5
zBPaCz!lE-PAp8m$E{UA!T<Wc|97g-u16rlaT#k-0{>X!;bDcFt;rZj0MT!ufAH##W
z*9pX~(2kWy<DXt?u5`ECQbl)~3G9M0LW<$}YOhFzpW-j2uynJ$getpo#A?5RsxfdV
z$>LC)LtYiM;hL!+?VKC|xmK!)9xEDqg<T}Y*qXY01nXXqYwa2Gkl#)%Ekj^#)1jN5
z9a+BF%oWB3BHF3L7V~A6NSs4R`FfVh1}EEyyd8G8yCcw}rp&V7yvg)kU(0JSc88O8
zne7xKCWpdJb+#;&w3H8OfGEisr~th^;eiwOw!BE2z;#^!FD^gpKVH5R9)p`&SE~~b
zHM3@Su(WG#rx>H;OYzu6$x&oqGRWa1;!``Kzc<oK6@Hg&Avgh|WM_O=DClx>mG7=D
z4(s}uHHZacKlHza!6awn962DSA^}<_r0PLkiy1%BZYH(Z#hQ8}`Uycnxoy`!dam2e
zaX|7omq{AMp)5RUFplj)7x(pypUebaWmtn04Hh1!V*66KdZTb*O=)+i1wfalxc0(y
zZ!1A(kUfb(qrQ0jPQZQ2;_5ESZcY%~Uwg^7{q@Y3twzpt{v=ZmfVDi?Vb;8+Cck&5
z)GUv5^Xt`f0NKyJlbvaUu^}b)N7aaHV1T;vQMGmT@7g2hsRDvM3t0|ZFmv=sDH$}_
zIKdHI@5N~ANKQYq%bllw0NwrgBes<VD1$1z*bTXz2ZKgQ0g7D+=)w!OStO>@CK6Cv
z2#<cC3~w{_gzJNzeYI6J@s&aTaf?mS*;N&tIRW?C0(!q2#k}rkN%(RbP;*7TREE29
z0MI~!9&2~2Gn)#8NvfjX{;_`>3ysZxfu6#@ZN37Kjc@>m{yzZWd2<7xtF&}n8;%=3
z*A*Hq9f^~%00UR&=5DYTdY^=JyMSVO6kyp?Y!`VjEdLP<VgX61w7x{tZtdY-U5U&)
zf%kg2i*n$;S=6riOpI30Zu!d5Hu3j0@W2}&$Y;x)X;0P>>zgZA0yq^Db@hgdBt@mH
z&&w8ZDH`W#_OQ(T@K5Q9de$r*SKLoE5__Ld&j0y3eG*O%Up1~2&=fqCs|j?TlKD5#
zulQOt-mq47(XRs+y9RiLRgWm)L(D|m(EcM!pi@}g|2(|(N7T~#mTHIx%6_7+==P0K
zwttw|2h18yWYHg@4#fN($|o&4k6b!0lNC2~BjE>~cwn@8X4TfIyW^JIHVk#3*lsT>
zAS;(fO1VCAiBa=8QE?@18zQsGr5>-H&Ue$J#QZ|%D{a5fXc-z0OR3YsY2}?rJ?~R8
z^IMs?$|7)q9xiy`WL(*iIE_agse!eaHln4|v;T~aO>JaPS}b&5iBLtinW#Gt)_+e5
zdsDm(Z$42_43;?bj!ySKy5#rp*@gw$TBmPo<zw^a7{fNAj;7;Sfc96kZjN7fdLSWZ
zMVK}WV&$f#ga2Rl&q(3reK!D?gZ4*54DX8pBe7XR%HhBxG5EhRooy!dat=dYxysKo
z@vwCN_KFTS+raVpE(8@SF*%)ahDG<C7zmG}D$Hl=;<5tjpmJ$1eC8d$J0B(vT=}M&
zl#?nUDtlf^w7e&uThUuTmWTVV&!x><?1A&Yrp;zkSB@TX{CyD)?`L^*N>Bd(2JpXw
z`KRMcOi5TUbZ_Nz0iI!RK>s62z~N8fZ{gWmaL65|3}LV_%<?p=;eGr6zP3`$pns(I
zV{dqg3Cz$?%rR4Cnp!$Co~@sIS&%8~o&jufqttL73y|D~4lBk4e!0*l4%GKn7dxYH
z&Z<%Tu^!v9LiYaU=tfB<J%Cl>O;=jJXf6V%%?=&fBco+H&HxTewyOQUGJ}SoXJ01Z
zL#jz7EhZm|g$d)K&)EhmH+Hgt*ankN80W<Pr)_*$1NPz1MTmLL!gnQr+{X2(GshVV
zwvbhCYjXjlIC@nNBu5(6gV(+f^NUmvwSjDM$Lg6*-}8ipK=x$5b*}unlk`UVudxj+
zN6l1kon23$3n#9I+6~_D7nVBGMt1o`^!(ZatN$Sh3vQDGu<Nc=ZBmlZ^3EW8|C1&9
z6=SfV)SB^p5TEGq(Z7tS?*5^8Y#%GLq-aR?_y;E(*B$kP_H6?euwYr@&|%LdCI5Wq
zd?%Kz-taB2s{J_uAl?JH;Pl&5Oztd8w^2~rX<>y*054rPSoF;(rrofrXXwz0Y!&NK
zQBiP#x-rO>B$@h}vhMxY9<WC0Z?V@HE#+!-5l3c?3aafYEwbWu<iEPoKl*;y!&r@G
zZN&yf#qM|_Tkq2iY+YujO#iGY)jSKVRp8O7CQmciO$_A??NKEwtoYM%;|m7OU#o)l
zxhi8oHAlb9x0d&41}!>6mj0j-9Xm=#2;ZdanytA=gBzUkBfP)j<Vb)WwkT6`sotWy
z_$u6H-%y>pZW}_B-g^$vl<1Fkj6#Uwp->ev7v!bsa%9%T2;q5-A@`4G87_4?HUq!j
zk!>{Kvbox;Vgw&dOv6<tyK{oD6>&c+{T$V3K2woSFa;A6PFR{M&iFYaYaC7`1uqOL
zI7Gr#zkqdN)9~+6Iu(pOXnA*Wm+4z~znQ{vdQJ_D6IZ^zT0D$56P1saYP(!n)Lgd)
ztvQK1@ahkSSyqo$L4=!hVLp!QbRT>|U(l?e6`S3Sfxped(R9;y_sh}3p^^**>IP+D
zv7yF^+np1A%2303*}f*=8^Y-e^O-KI&Xu0`v@Thd9<*_CM0<^Uv@ttx=zCx%LN?i(
zzamBVC*o{k`mz>E{T(k(TZoHNi*4Lq4|bVizA1$;R+&iz;@c2iKk(x_-z+DUDs%gb
zYZ8nL>WVAaic5mke~U%Sy{9|6^|8)Y4INFM`q`GEux-bJls$YtbI!*5w3PY46(v6m
z6-}lpRr2vqtp0tY8dGw&`CA#sSzK9;z`-i<gtG1@zg?GR5t%9vfg9~SnZ$yz9+oyr
zJxZyGc+_8dqMtnYmfPGeY@EAAwCRc$-;aa>h1YVE+c#G;i%Q8RUh*n%@*w|VByZ7-
zNuBZt@{F%~mSdmH>KH4spZ|dbZ?4{(@yaHyUXIiIwd+B6Z;&a0N(!@8+2?gUeGtE?
zLUY(!xTr-(^vpL=13eB*TWfynDFj>6+%xc-`Y@Lf+SB=k#@YRERg=8C6v&v@!wH|t
z7^-pg#(4)voY}NcnCFL*fLz!BMd;^r;q+Q_UL<_~Fwpet980@hSA;BmYz_C9=l7<8
z%MVU{`?H;KI0tf3(4TQD*o>)tTj&}oLCPC2M-B%yXunsr4BpW`kX~f(H}RF&wiA)D
zR{Br^w(UYP^n+}-unjE&l!RSJ3gR`TzMLe|e%Ky-uf9YHb5*4s;lXvb<_t{;{~^$E
z3vxEB^X=5oPATp9Q+BH6Okr;bsVU8TZwTC<Zu=l4Ncv5~4++Y%7`@A6^+5B_m+ul+
zquEhs{$&-rgDd*x>XtwtsHCe~-7R`G|6~Vesey!fGsaT}BHbs-#Gjh@E@Xv%t{&|R
c5q$DXXUtk&&!(co<k-b-8d@0CUU!fCFL7ucZ2$lO

literal 0
HcmV?d00001

diff --git a/mobile/src/main/res/drawable/bg_add_connection_dashed.xml b/mobile/src/main/res/drawable/bg_add_connection_dashed.xml
new file mode 100644
index 000000000..8c359f35f
--- /dev/null
+++ b/mobile/src/main/res/drawable/bg_add_connection_dashed.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="18dp"/>
+    <stroke
+        android:width="2dp"
+        android:color="@color/wa_white_80"
+        android:dashWidth="8dp"
+        android:dashGap="2dp"/>
+    <solid android:color="@android:color/transparent"/>
+</shape>
diff --git a/mobile/src/main/res/drawable/ic_add_connection.png b/mobile/src/main/res/drawable/ic_add_connection.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7506181ea4b6a06d3228239f12c0d0ddc7fc350
GIT binary patch
literal 1308
zcmV+%1>^dOP)<h;3K|Lk000e1NJLTq003M7003MF1^@s6<L}Z~00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1hGj(K~#7F?VYi5
z(@+pa*NjUHbr@*P2S5WA^gu;JT9{BX`2doh8EQO38yYI?KIzgVACR;RNe!VldzD=y
zJGLyz(%Q1`nR!@No-K5>TJ2j)Z(Fhe!{M-_FCVo%)OK52XG*tMtyb$o`+m{oM;Tw&
z(|$ee_tL&|Cfe_@ZU02F+1I{(?YE=LI~n~>wcmT~cTbmpO!@njwo7dn_MKN!l6H~K
zCh!|=5M>)1)^!lEBkN7a+Lnv0`+cA<=W=Z*7g8k<TH7uxD%HC7w`Z^nI~Z$;?SI#d
z%lA30#h#rVb7|$+7%Up6qYFCF*4LwYDjSR$+_ttCwhAr>*4~%0Ojz}oyhm}9u(NwF
zrPHpI!A>Jwa1PDNNe0l!wCWc&O#guSt*($<n6<lh`L1c^Mv5OLGQteCKh3?|n&^md
z5ANf(kVS!pZ)Un<J01Gw`02A3#C-aR`Sp=|Nn1EVzb$P84Q;*&SqRe*p)<rDALW{L
zdssu?T@e$yCRXki?nhuy`7m{ZF)au7HgVG~xQBiRLaN3`o-fDNB0nIc7A#Ec_?val
z^sNku*80yU3tb)wsRhd}LgP>H;fP9L<)xGAWG={?L*p(4-?EjLLh8bexdXuyAHK-X
zMkJe*ww+r-LZRTnQ1D<VcrYzbRxyWCFH8z9iI&|F1q**Kq&8e<+<C<zeGG}tyl4hP
z!GodT!BFsED0nc96I{cq2im?{dms%1VPQ|2#XD_JQp+Eu86-Nl@tB7+i#s!xR~py3
zZTAz(LN}6=xwy`7DSk>)@OnvfW|R^P1rLUT2SdSwq2R$#@L&o(`dt?`M1QO8ZjSCx
zQ_D~Ev!8Q(=C`)5I@b6pOJ?qq$PpkfBL9c$b#bhMzm_FKml90Nr@-(jF_u9ImvY~h
z;UbQ6d}iq`#dQ{c=tmj?e73e<*7Er8mB4kTO9_U82SdSwq2R$#@L(u-Fc{kJ3yC1n
zxy|1)V{o0@Hi@D%=-2x{GnQAHk<P0yv@e3C0epn{VHGlfd2pRqB0XCK6L{%azp^k&
z35J3PL&1Zg;K5MvU=XEj^eoANQ0Ha9N56v@>D;uDW>ayUdC?4pf(JvvgQ4KTKya^1
z!x=hjBBkvW1pjMqD0qF0=7xmeXL4=jEUr->KJ)1XT}dEgGc2=wOnuy#Dm+zegVQlp
zjLjVmZIj9HJuI9)i#w@;ZF@Z*tudFvq8k-6t(Zw-;WqoPmy&79bQn!wb}<vP@<SF*
zs)khIq}gTGCaNnjYAK1i5;xwl>*CmrK&Y-{N8_20MZpMukn7$}575))3dwxZ<uFUt
z)Eu&aX>Nw&1x#m--e;y~?W%et*LeWc*xaMF-^2_P6ZxWcCbT-rs;7~s2sNC(S0V(c
zEq0(^dM+D`jmn{o7omp8y-F%I4sRA(KJokjHau4PY7McF`Ce+DyAxXM=H357lN*>z
zfwgz_NN(G@L&?sizk++R(=IDl1MBG78I?Ks@;eN2JVCvWD8X)q-^u8Aiuu!R|9)ij
zyV8EoO<d$g5P^IvQj(|8{o&@<_x!zW7<UxmKMI$#u2v2~5$2s?pH1LWd8dCkA~70`
SFO?Vo0000<MNUMnLSTZgYiJSx

literal 0
HcmV?d00001

diff --git a/mobile/src/main/res/drawable/ic_add_home.xml b/mobile/src/main/res/drawable/ic_add_home.xml
new file mode 100644
index 000000000..270493f5c
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_add_home.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M31.237,18.377C32.132,18.377 32.857,19.104 32.857,20C32.857,20.899 32.133,21.623 31.237,21.623H21.622V31.237C21.622,32.132 20.896,32.857 20,32.857C19.1,32.857 18.377,32.134 18.377,31.237V21.623H8.762C7.867,21.623 7.143,20.896 7.143,20C7.143,19.101 7.866,18.377 8.762,18.377H18.377V8.763C18.377,7.868 19.104,7.143 20,7.143C20.899,7.143 21.622,7.866 21.622,8.763V18.377H31.237Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.9"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/mobile/src/main/res/layout/activity_documentation_settings.xml b/mobile/src/main/res/layout/activity_documentation_settings.xml
index 1d10e0668..b50ae37e5 100644
--- a/mobile/src/main/res/layout/activity_documentation_settings.xml
+++ b/mobile/src/main/res/layout/activity_documentation_settings.xml
@@ -247,6 +247,19 @@
                     </LinearLayout>
                 </LinearLayout>
 
+
+                <org.hzontal.shared_ui.switches.TellaSwitchWithMessage
+                    android:id="@+id/nearby_sharing_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/activity_vertical_margin"
+                    android:background="@drawable/rounded_light_purple_background"
+                    app:explainText="@string/nearby_sharing_description"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/data_share_layout"
+                    app:titleText="@string/nearby_sharing_title" />
+
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </RelativeLayout>
diff --git a/mobile/src/main/res/layout/activity_settings.xml b/mobile/src/main/res/layout/activity_settings.xml
index 1f42657af..ecaed4dda 100644
--- a/mobile/src/main/res/layout/activity_settings.xml
+++ b/mobile/src/main/res/layout/activity_settings.xml
@@ -4,27 +4,27 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/dark_purple"
     android:fitsSystemWindows="true"
     android:textDirection="locale"
-    android:background="@color/dark_purple"
     tools:context="org.horizontal.tella.mobile.views.activity.SettingsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintBottom_toTopOf="@+id/my_nav_host_fragment"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/my_nav_host_fragment"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        app:layout_constraintTop_toTopOf="parent">
 
         <org.hzontal.shared_ui.appbar.ToolbarComponent
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:arrowBackIconContentDescription="@string/action_go_back"
-            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp" />
+            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+            app:arrowBackIconContentDescription="@string/action_go_back" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -39,5 +39,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/appbar"
-        app:navGraph="@navigation/settings_navigation"/>
+        app:navGraph="@navigation/settings_navigation" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/mobile/src/main/res/layout/item_add_connection_card.xml b/mobile/src/main/res/layout/item_add_connection_card.xml
new file mode 100644
index 000000000..bdd64106f
--- /dev/null
+++ b/mobile/src/main/res/layout/item_add_connection_card.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="100dp"
+    android:layout_height="96dp"
+    android:layout_marginEnd="12dp"
+    android:background="@drawable/bg_add_connection_dashed"
+    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:padding="0dp">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/add_img"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/ic_add_home"
+        android:tint="@color/wa_white"
+        android:scaleType="centerInside"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/sender_manual_connection.xml b/mobile/src/main/res/layout/sender_manual_connection.xml
index 5c064362a..8beee87d1 100644
--- a/mobile/src/main/res/layout/sender_manual_connection.xml
+++ b/mobile/src/main/res/layout/sender_manual_connection.xml
@@ -71,7 +71,7 @@
                 android:hint="@string/ip_address"
                 android:imeOptions="actionNext"
                 android:importantForAutofill="no"
-                android:inputType="textNoSuggestions"
+                android:inputType="number"
                 android:maxLines="1"
                 android:textColor="@color/wa_white"
                 android:textDirection="ltr"
diff --git a/mobile/src/main/res/values/config.xml b/mobile/src/main/res/values/config.xml
index c7aebe470..dcd384e03 100644
--- a/mobile/src/main/res/values/config.xml
+++ b/mobile/src/main/res/values/config.xml
@@ -10,6 +10,7 @@
     <string name="config_analytics_learn_url" translatable="false">https://tella-app.org/security-and-privacy#analytics?</string>
     <string name="config_organizations_url" translatable="false">https://tella-app.org/for-organizations</string>
     <string name="config_connections_url" translatable="false">https://tella-app.org/for-organizations</string>
+    <string name="config_nearby_sharing_url" translatable="false">https://tella-app.org/nearby-sharing</string>
     <string-array name="ra_lang_codes" translatable="false">
         <item>ar</item>
         <item>be</item>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index b8b24ec18..40b4585fa 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1097,4 +1097,8 @@ Would you like to share analytics with the Tella team?</string>
 1.\tMake sure that this sequence matches what\n \t\tis shown on the recipient’s device.\n2.\tYou need to confirm the connection first.\n3.\tAfter that, the recipient will be able to\n \t\tconfirm the connection and start receiving\n\t\tfiles.\n\nIf the sequence on your device does not match the sequence on the sender’s device,\nthe connection may not be secure and should be discarded.
 </string>
 
+    <string name="nearby_sharing_title">Nearby Sharing</string>
+    <string name="nearby_sharing_description">Enable this feature to share files with devices near you, without an Internet connection.</string>
+
+
 </resources>

From 6ecc850ca18a774c2ca89d6394001a46f0fd5f6e Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Mon, 8 Sep 2025 16:08:57 +0100
Subject: [PATCH 130/153] Baypass ping call certificate

---
 .../data/peertopeer/FingerprintFetcher.kt     | 221 +++++++++++++++---
 .../mobile/data/peertopeer/P2PSecurity.kt     |   6 +
 .../data/peertopeer/TellaPeerToPeerClient.kt  | 205 ++++++++++++----
 .../data/peertopeer/remote/PeerApiRoutes.kt   |   8 +-
 .../SenderManualConnectionFragment.kt         |   4 +
 .../viewmodel/PeerToPeerViewModel.kt          |  12 +
 6 files changed, 376 insertions(+), 80 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/P2PSecurity.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
index 007e29c05..4bb0320f2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -2,60 +2,215 @@ package org.horizontal.tella.mobile.data.peertopeer
 
 import android.content.Context
 import android.net.ConnectivityManager
+import android.net.Network
 import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.os.Build
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 import org.horizontal.tella.mobile.certificate.CertificateUtils
+import timber.log.Timber
+import java.io.IOException
+import java.net.InetSocketAddress
 import java.net.Socket
 import java.net.SocketTimeoutException
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
-import javax.net.ssl.*
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLHandshakeException
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+import kotlin.coroutines.resume
 
 object FingerprintFetcher {
 
-    suspend fun fetch(context: Context, ip: String, port: Int): Result<String> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            createBoundSSLSocket(context, ip, port).use { socket ->
-                val cert = socket.session.peerCertificates[0] as X509Certificate
-                val fingerprint = CertificateUtils.getPublicKeyHash(cert)
-                Result.success(fingerprint)
+    /**
+     * Connects via TLS over (preferably) validated Wi-Fi, returns SPKI SHA-256 hex (lowercase).
+     * Produces descriptive failures (HTTP vs TLS, route, timeout).
+     */
+    suspend fun fetch(context: Context, ip: String, port: Int): Result<String> =
+        withContext(Dispatchers.IO) {
+            try {
+                // 0) Pick a Wi-Fi network (validated if possible)
+                val wifi = getWifiNetworkPreferringValidated(context)
+                if (wifi != null) {
+                    Timber.d("FingerprintFetcher using Wi-Fi network: $wifi")
+                } else {
+                    Timber.w("FingerprintFetcher: no Wi-Fi network bound (falling back to default route)")
+                }
+
+                // 1) Quick TCP probe – fail fast if nothing is listening
+                probeTcp(ip, port, wifi)
+
+                // 2) TLS handshake to read cert
+                createBoundTlsSocket(ip, port, wifi).use { tls ->
+                    val cert = tls.session.peerCertificates.first() as X509Certificate
+                    val fp = CertificateUtils.getPublicKeyHash(cert).lowercase()
+                    return@withContext Result.success(fp)
+                }
+            } catch (e: SSLHandshakeException) {
+                // Common when the server speaks plain HTTP on this port
+                val msg = e.message.orEmpty()
+                return@withContext if (
+                    msg.contains("unexpected_message", true) ||
+                    msg.contains("unrecognized_name", true) ||
+                    msg.contains("EOF", true) ||
+                    msg.contains("received fatal alert", true)
+                ) {
+                    Result.failure(IllegalStateException("Server on $port appears to be plain HTTP or wrong TLS config (plain HTTP on TLS port). ${e.message}"))
+                } else {
+                    Result.failure(e)
+                }
+            } catch (e: SocketTimeoutException) {
+                return@withContext Result.failure(RuntimeException("Connection timed out to $ip:$port", e))
+            } catch (e: IOException) {
+                return@withContext Result.failure(IOException("I/O error to $ip:$port: ${e.message}", e))
+            } catch (e: Exception) {
+                return@withContext Result.failure(e)
             }
-        } catch (e: SocketTimeoutException) {
-            Result.failure(RuntimeException("Connection timed out", e))
-        } catch (e: Exception) {
-            Result.failure(e)
         }
-    }
 
-    private fun createBoundSSLSocket(context: Context, ip: String, port: Int): SSLSocket {
-        val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(null, arrayOf(TrustAllCerts()), SecureRandom())
-        val factory = sslContext.socketFactory as SSLSocketFactory
+    // ---- Internals ----
 
-        // Create plain socket
-        val plainSocket: Socket = factory.createSocket() as SSLSocket
-        plainSocket.soTimeout = 5000
+    private fun createBoundTlsSocket(ip: String, port: Int, wifi: Network?): SSLSocket {
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf<TrustManager>(TrustAllCerts()), SecureRandom())
+        }
+        val factory = sslContext.socketFactory as SSLSocketFactory
 
-        // Bind to Wi-Fi network if available
-        val connectivityManager =
-            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val s = factory.createSocket() as SSLSocket
+        s.soTimeout = 7000
+        // Offer both; server chooses
+        s.enabledProtocols = arrayOf("TLSv1.3", "TLSv1.2")
 
-        connectivityManager.allNetworks.firstOrNull { network ->
-            connectivityManager.getNetworkCapabilities(network)
-                ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
-        }?.bindSocket(plainSocket)
+        // Bind to selected Wi-Fi path if we have one
+        try {
+            wifi?.bindSocket(s)
+        } catch (bindErr: Exception) {
+            Timber.w(bindErr, "bindSocket failed, continuing on default route")
+        }
 
-        // Connect and handshake
-        plainSocket.connect(java.net.InetSocketAddress(ip, port), 5000)
-        (plainSocket as SSLSocket).startHandshake()
+        s.connect(InetSocketAddress(ip, port), 7000)
+        s.startHandshake()
+        return s
+    }
 
-        return plainSocket
+    /**
+     * Short TCP probe to distinguish "port closed / no route" from TLS errors.
+     */
+    private fun probeTcp(ip: String, port: Int, wifi: Network?) {
+        val sock = Socket()
+        try {
+            wifi?.bindSocket(sock)
+        } catch (_: Exception) {
+        }
+        try {
+            sock.connect(InetSocketAddress(ip, port), 2500)
+        } finally {
+            try { sock.close() } catch (_: Exception) {}
+        }
     }
 
     class TrustAllCerts : X509TrustManager {
-        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
-        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
-        override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+        override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
     }
+
+    /**
+     * Prefer a VALIDATED Wi-Fi network; if not delivered within ~4–5s,
+     * fallback to a connected Wi-Fi with INTERNET capability.
+     */
+    @Suppress("DEPRECATION")
+    private suspend fun getWifiNetworkPreferringValidated(ctx: Context): Network? =
+        withContext(Dispatchers.IO) {
+            val cm = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+            // Fast path: active VALIDATED Wi-Fi (API 23+)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                cm.activeNetwork?.let { n ->
+                    cm.getNetworkCapabilities(n)?.let { c ->
+                        if (c.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+                            c.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                            c.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                        ) return@withContext n
+                    }
+                }
+            } else {
+                // API 21–22: pick any connected Wi-Fi with INTERNET
+                cm.allNetworks.firstOrNull { n ->
+                    val info = cm.getNetworkInfo(n)
+                    val caps = cm.getNetworkCapabilities(n)
+                    info?.isConnected == true &&
+                            caps?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true &&
+                            caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                }?.let { return@withContext it }
+            }
+
+            // Try to request a validated Wi-Fi, but time-bound
+            val request = NetworkRequest.Builder()
+                .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .build()
+
+            val validated: Network? = try {
+                withTimeout(4_000) {
+                    suspendCancellableCoroutine { cont ->
+                        val cb = object : ConnectivityManager.NetworkCallback() {
+                            override fun onAvailable(network: Network) {
+                                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                                    if (cont.isActive) {
+                                        cm.unregisterNetworkCallback(this)
+                                        cont.resume(network)
+                                    }
+                                }
+                            }
+                            override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                                    caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+                                    caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                                    caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                                ) {
+                                    if (cont.isActive) {
+                                        cm.unregisterNetworkCallback(this)
+                                        cont.resume(network)
+                                    }
+                                }
+                            }
+                            override fun onUnavailable() {
+                                if (cont.isActive) {
+                                    cm.unregisterNetworkCallback(this)
+                                    cont.resume(null)
+                                }
+                            }
+                        }
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            cm.requestNetwork(request, cb, 4_000)
+                        } else {
+                            cm.requestNetwork(request, cb) // guarded by withTimeout
+                        }
+                        cont.invokeOnCancellation { runCatching { cm.unregisterNetworkCallback(cb) } }
+                    }
+                }
+            } catch (_: Exception) { null }
+
+            if (validated != null) return@withContext validated
+
+            // Last resort: any connected Wi-Fi with INTERNET (even if not VALIDATED yet)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                cm.allNetworks.firstOrNull { n ->
+                    cm.getNetworkCapabilities(n)?.let { c ->
+                        c.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+                                c.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                    } == true
+                }
+            } else {
+                // Already handled above for 21–22
+                null
+            }
+        }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/P2PSecurity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/P2PSecurity.kt
new file mode 100644
index 000000000..c3fa007d6
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/P2PSecurity.kt
@@ -0,0 +1,6 @@
+package org.horizontal.tella.mobile.data.peertopeer
+
+object P2PSecurity {
+    /** Allow trust-all TLS only for the *manual connect handshake* (e.g., /ping). */
+    @JvmStatic var allowInsecureManualHandshake: Boolean = false
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index 5776eae8e..af6d6b0a8 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
+import android.os.Build
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -12,9 +13,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
+import okhttp3.Protocol
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.TlsVersion
 import org.horizontal.tella.mobile.certificate.CertificateUtils
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE
 import org.horizontal.tella.mobile.data.peertopeer.PeerToPeerConstants.CONTENT_TYPE_JSON
@@ -33,6 +37,7 @@ import java.io.InputStream
 import java.security.SecureRandom
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
+import java.util.Collections
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
@@ -42,12 +47,10 @@ import javax.net.ssl.X509TrustManager
 class TellaPeerToPeerClient @Inject constructor(
     @ApplicationContext private val appContext: Context
 ) {
-
-
     suspend fun registerPeerDevice(
         ip: String,
         port: String,
-        expectedFingerprint: String, // DER SHA-256 HEX from getPublicKeyHash
+        expectedFingerprint: String,
         pin: String,
     ): RegisterPeerResult = withContext(Dispatchers.IO) {
         val url = PeerApiRoutes.buildUrl(ip, port, PeerApiRoutes.REGISTER)
@@ -66,24 +69,32 @@ class TellaPeerToPeerClient @Inject constructor(
             .url(url)
             .post(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+            // Encourage short-lived TLS sessions to avoid half-closed sockets across platforms.
+            .addHeader("Connection", "close")
             .build()
 
         return@withContext try {
             client.newCall(request).execute().use { response ->
                 val body = response.body?.string().orEmpty()
+                Timber.d("registerPeerDevice: code=%d headers=%s body=%s",
+                    response.code, response.headers, body.take(600))
 
                 if (response.isSuccessful) {
-                    return@use parseSessionIdFromResponse(body)
-                }
-
-                return@use when (response.code) {
-                    400 -> RegisterPeerResult.InvalidFormat
-                    401 -> RegisterPeerResult.InvalidPin
-                    403 -> RegisterPeerResult.RejectedByReceiver
-                    409 -> RegisterPeerResult.Conflict
-                    429 -> RegisterPeerResult.TooManyRequests
-                    500 -> RegisterPeerResult.ServerError
-                    else -> RegisterPeerResult.Failure(Exception("Unhandled error ${response.code}: $body"))
+                    when (val parsed = parseSessionIdFromResponse(body)) {
+                        is RegisterPeerResult.Success -> parsed
+                        is RegisterPeerResult.Failure -> parsed
+                        else -> RegisterPeerResult.Failure(Exception("Unexpected success response shape"))
+                    }
+                } else {
+                    when (response.code) {
+                        400 -> RegisterPeerResult.InvalidFormat
+                        401 -> RegisterPeerResult.InvalidPin
+                        403 -> RegisterPeerResult.RejectedByReceiver
+                        409 -> RegisterPeerResult.Conflict
+                        429 -> RegisterPeerResult.TooManyRequests
+                        500 -> RegisterPeerResult.ServerError
+                        else -> RegisterPeerResult.Failure(Exception("Unhandled error ${response.code}: $body"))
+                    }
                 }
             }
         } catch (e: Exception) {
@@ -95,7 +106,7 @@ class TellaPeerToPeerClient @Inject constructor(
     suspend fun prepareUpload(
         ip: String,
         port: String,
-        expectedFingerprint: String, // DER HEX
+        expectedFingerprint: String, // SPKI SHA-256 hex
         title: String,
         files: List<VaultFile>,
         sessionId: String
@@ -124,11 +135,13 @@ class TellaPeerToPeerClient @Inject constructor(
                 .url(url)
                 .post(requestBody)
                 .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+                .addHeader("Connection", "close")
                 .build()
 
             client.newCall(request).execute().use { response ->
                 val responseBody = response.body?.string().orEmpty()
-                return@withContext if (response.isSuccessful) {
+                Timber.d("prepareUpload: code=%d body=%s", response.code, responseBody.take(600))
+                if (response.isSuccessful) {
                     parseTransmissionId(responseBody)
                 } else {
                     Timber.e("Server error ${response.code}: ${response.message}")
@@ -144,7 +157,7 @@ class TellaPeerToPeerClient @Inject constructor(
     suspend fun uploadFileWithProgress(
         ip: String,
         port: String,
-        expectedFingerprint: String, // DER HEX
+        expectedFingerprint: String, // SPKI SHA-256 hex
         sessionId: String,
         fileId: String,
         transmissionId: String,
@@ -153,7 +166,7 @@ class TellaPeerToPeerClient @Inject constructor(
         fileName: String,
         onProgress: (bytesWritten: Long, totalBytes: Long) -> Unit
     ): Boolean = withContext(Dispatchers.IO) {
-        Timber.d("session id from the client = $sessionId")
+        Timber.d("session id from the client = %s", sessionId)
         val url = PeerApiRoutes.buildUploadUrl(ip, port, sessionId, fileId, transmissionId)
 
         val client = getClientWithFingerprintValidation(ip, expectedFingerprint)
@@ -163,20 +176,17 @@ class TellaPeerToPeerClient @Inject constructor(
             .url(url)
             .put(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_OCTET)
+            .addHeader("Connection", "close")
             .build()
 
         return@withContext try {
             client.newCall(request).execute().use { response ->
-                if (response.isSuccessful) {
-                    Timber.d("Upload successful for $fileId")
-                    true
-                } else {
-                    Timber.e("Upload failed for $fileId with code ${response.code}")
-                    false
-                }
+                val ok = response.isSuccessful
+                Timber.d("uploadFileWithProgress(%s): %s", fileId, if (ok) "OK" else "FAIL ${response.code}")
+                ok
             }
         } catch (e: Exception) {
-            Timber.e(e, "Exception while uploading $fileId")
+            Timber.e(e, "Exception while uploading %s", fileId)
             false
         }
     }
@@ -197,10 +207,14 @@ class TellaPeerToPeerClient @Inject constructor(
             .url(url)
             .post(requestBody)
             .addHeader(CONTENT_TYPE, CONTENT_TYPE_JSON)
+            .addHeader("Connection", "close")
             .build()
 
         return@withContext try {
-            client.newCall(request).execute().use { response ->
+            client.newCall(request)
+
+                .execute().use { response ->
+                Timber.d("closeConnection: code=%d", response.code)
                 response.isSuccessful
             }
         } catch (e: Exception) {
@@ -211,14 +225,31 @@ class TellaPeerToPeerClient @Inject constructor(
 
     // ---------------- Internals ----------------
 
-    private fun parseSessionIdFromResponse(body: String): RegisterPeerResult =
-        try {
+    private fun parseSessionIdFromResponse(body: String): RegisterPeerResult {
+        return try {
             val json = JSONObject(body)
-            RegisterPeerResult.Success(json.getString("sessionId"))
+
+            // Optional: some servers send { success: true/false }
+            val successFlag = json.optBoolean("success", true)
+
+            // Required: non-empty sessionId
+            val sessionId = json.optString("sessionId", "").trim()
+
+            when {
+                !successFlag -> {
+                    val msg = json.optString("message", json.optString("error", "Registration rejected"))
+                    RegisterPeerResult.Failure(Exception(msg))
+                }
+                sessionId.isEmpty() -> {
+                    RegisterPeerResult.Failure(Exception("Missing or empty sessionId"))
+                }
+                else -> RegisterPeerResult.Success(sessionId)
+            }
         } catch (e: Exception) {
             Timber.e(e, "Malformed JSON response: %s", body)
             RegisterPeerResult.Failure(Exception("Malformed JSON: ${e.message}"))
         }
+    }
 
     private fun parseTransmissionId(body: String): PrepareUploadResult =
         try {
@@ -239,10 +270,11 @@ class TellaPeerToPeerClient @Inject constructor(
         }
 
     /**
-     * Build an OkHttp client that:
-     *  - Validates the server by DER-hash HEX (your getPublicKeyHash).
-     *  - Routes sockets over Wi-Fi (LAN).
-     *  - Relaxes hostname verification (safe because we hard-pin).
+     * OkHttp client that:
+     *  - Pins the server by SPKI SHA-256 hex (your CertificateUtils.getPublicKeyHash).
+     *  - Optionally binds sockets to a Wi-Fi Network if one is active/validated.
+     *  - Relaxes hostname verification (IP literal + hard pin).
+     *  - Uses TLS 1.2/1.3 spec to ease cross-platform handshakes (iOS -9816).
      */
     private fun getClientWithFingerprintValidation(
         ip: String,
@@ -252,15 +284,13 @@ class TellaPeerToPeerClient @Inject constructor(
 
         val trustManager = object : X509TrustManager {
             override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
-            override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String?) = Unit
-            override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String?) {
-                val serverCert = chain.firstOrNull()
+            override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
+            override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {
+                val serverCert = chain?.firstOrNull()
                     ?: throw CertificateException("Empty certificate chain")
                 val actualHex = normalizeHex(CertificateUtils.getPublicKeyHash(serverCert))
                 if (actualHex != expected) {
-                    throw CertificateException(
-                        "Certificate DER hash mismatch.\nExpected: $expected\nGot:      $actualHex"
-                    )
+                    throw CertificateException("Certificate DER hash mismatch. Expected: $expected, Got: $actualHex")
                 }
             }
         }
@@ -269,26 +299,111 @@ class TellaPeerToPeerClient @Inject constructor(
             init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
         }
 
+        val tlsSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+            .tlsVersions(TlsVersion.TLS_1_3, TlsVersion.TLS_1_2)
+            .allEnabledCipherSuites()
+            .build()
+
         val builder = OkHttpClient.Builder()
             .sslSocketFactory(sslContext.socketFactory, trustManager)
-            .hostnameVerifier { _, _ -> true } // IP literal + pinning → OK
+            .hostnameVerifier { _, _ -> true }
+            .connectionSpecs(listOf(tlsSpec, ConnectionSpec.CLEARTEXT))
+            .protocols(listOf(Protocol.HTTP_1_1))
             .connectTimeout(5, TimeUnit.SECONDS)
             .readTimeout(20, TimeUnit.SECONDS)
             .writeTimeout(20, TimeUnit.SECONDS)
 
-        // Route over Wi-Fi (same network path as FingerprintFetcher)
-        findWifiNetwork(appContext)?.let { builder.socketFactory(it.socketFactory) }
+        pickWifiNetwork(appContext)?.let { network ->
+            builder.socketFactory(network.socketFactory)
+        }
 
         return builder.build()
     }
 
-    private fun findWifiNetwork(context: Context): Network? {
+
+    @Suppress("DEPRECATION")
+    private fun pickWifiNetwork(context: Context): Network? {
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        // Prefer active validated Wi-Fi on API 23+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            cm.activeNetwork?.let { n ->
+                cm.getNetworkCapabilities(n)?.let { caps ->
+                    if (caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+                        caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                        caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                    ) return n
+                }
+            }
+        }
+
+        // Otherwise, any Wi-Fi with INTERNET capability
         return cm.allNetworks.firstOrNull { n ->
-            cm.getNetworkCapabilities(n)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+            cm.getNetworkCapabilities(n)?.let { caps ->
+                caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+                        caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            } == true
         }
     }
 
     private fun normalizeHex(hexLike: String): String =
         hexLike.trim().replace(":", "").replace("\\s".toRegex(), "").lowercase()
+
+
+
+    /** Trust-all, *only* for manual handshake like /ping before we have a pin. */
+    private fun newInsecureClientForHandshake(network: Network?): OkHttpClient {
+        val trustAll = object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
+            override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
+            override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
+        }
+
+        val ssl = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf<TrustManager>(trustAll), SecureRandom())
+        }
+
+        val tlsSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+            .tlsVersions(TlsVersion.TLS_1_3, TlsVersion.TLS_1_2)
+            .allEnabledCipherSuites()
+            .build()
+
+        return OkHttpClient.Builder()
+            .sslSocketFactory(ssl.socketFactory, trustAll)
+            .hostnameVerifier { _, _ -> true }
+            .connectionSpecs(listOf(tlsSpec))
+            .protocols(listOf(Protocol.HTTP_1_1))
+            .apply { network?.let { socketFactory(it.socketFactory) } }
+            .connectTimeout(3, TimeUnit.SECONDS)
+            .readTimeout(5, TimeUnit.SECONDS)
+            .build()
+    }
+
+    suspend fun pingBeforeRegister(ip: String, port: String): Boolean = withContext(Dispatchers.IO) {
+        val network = pickWifiNetwork(appContext)
+        val client = newInsecureClientForHandshake(network)
+
+        // Use the real path your server exposes; many backends use /api/v1/ping
+        val url = PeerApiRoutes.buildUrl(ip, port, "/api/v1/ping", secure = true)
+
+        val req = Request.Builder()
+            .url(url)
+            .get()
+            .addHeader("Connection", "close")
+            .build()
+
+        runCatching {
+            client.newCall(req).execute().use { resp ->
+                // consider any HTTP code as “host reachable”
+                Timber.d("pingBeforeRegister $url -> HTTP %d", resp.code)
+                resp.code in 100..599
+            }
+        }.getOrElse {
+            Timber.w(it, "Ping failed for $url")
+            false
+        }
+    }
+
+
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
index 4090ec4d7..21eafcaa9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/remote/PeerApiRoutes.kt
@@ -8,10 +8,14 @@ object PeerApiRoutes {
     const val CLOSE = "/api/v1/close-connection"
 
 
-    fun buildUrl(ip: String, port: String, endpoint: String): String {
-        return "https://$ip:$port$endpoint"
+    fun buildUrl(ip: String, port: String, endpoint: String, secure: Boolean = true): String {
+        val scheme = if (secure) "https" else "http"
+        // Ensure endpoint starts with "/"
+        val normalized = if (endpoint.startsWith("/")) endpoint else "/$endpoint"
+        return "$scheme://$ip:$port$normalized"
     }
 
+
     fun buildUploadUrl(ip: String, port: String, sessionId: String, fileId: String, transmissionId: String): String {
         val baseUrl = buildUrl(ip, port, UPLOAD)
         return "$baseUrl?sessionId=$sessionId&fileId=$fileId&transmissionId=$transmissionId"
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
index b5053820f..d54cad1d1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderManualConnectionFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.activityViewModels
 import com.hzontal.tella_locking_ui.common.extensions.onChange
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
+import org.horizontal.tella.mobile.data.peertopeer.P2PSecurity
 import org.horizontal.tella.mobile.data.peertopeer.PeerKeyProvider
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.SenderManualConnectionBinding
@@ -31,6 +32,7 @@ class SenderManualConnectionFragment :
         peerServerStarterManager.stopServer()
         PeerKeyProvider.reset()
         viewModel.p2PState.clear()
+        P2PSecurity.allowInsecureManualHandshake = true
         initView()
         initListeners()
         initObservers()
@@ -66,6 +68,8 @@ class SenderManualConnectionFragment :
 
     private fun initObservers() {
         viewModel.getHashSuccess.observe(viewLifecycleOwner) { hash ->
+            P2PSecurity.allowInsecureManualHandshake = false
+
             bundle.putString("payload", hash)
             navManager().navigateFromSenderManualConnectionToConnectManuallyVerification()
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 0d30a688d..ada6c6dd9 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -151,6 +151,16 @@ class PeerToPeerViewModel @Inject constructor(
 
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
+            // Optional fast reachability check
+            val reachable = runCatching { peerClient.pingBeforeRegister(ip, port) }.getOrDefault(false)
+            if (!reachable) {
+                bottomSheetError.postValue(
+                    "Connection failed" to "Host not reachable on this Wi-Fi. Check IP/Port and that both devices are on the same network."
+                )
+                return@launch
+            }
+
+            // Then do the real cert fetch (still needed to get the SPKI hash)
             FingerprintFetcher.fetch(context, ip, port.toInt())
                 .onSuccess { hash ->
                     p2PState.hash = hash
@@ -167,6 +177,8 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+
+
     // -------------------- SAVE-ON-ARRIVAL CORE --------------------
 
     private fun initCountersIfNeeded() {

From 91bc1819e9e2e03ab96e2c2cd3972715a7cfc2a1 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 9 Sep 2025 19:31:04 +0100
Subject: [PATCH 131/153] add new custom tips card view

---
 .../shared_ui/textviews/TipsCardView.kt       | 64 +++++++++++++++++++
 shared-ui/src/main/res/drawable/tips_bg.xml   | 16 +++++
 .../main/res/layout/view_collapsible_text.xml | 45 +------------
 .../src/main/res/layout/view_tips_card.xml    | 60 +++++++++++++++++
 shared-ui/src/main/res/values/attrs.xml       | 12 ++++
 5 files changed, 153 insertions(+), 44 deletions(-)
 create mode 100644 shared-ui/src/main/java/org/hzontal/shared_ui/textviews/TipsCardView.kt
 create mode 100644 shared-ui/src/main/res/drawable/tips_bg.xml
 create mode 100644 shared-ui/src/main/res/layout/view_tips_card.xml

diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/TipsCardView.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/TipsCardView.kt
new file mode 100644
index 000000000..d7dfd1f4e
--- /dev/null
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/textviews/TipsCardView.kt
@@ -0,0 +1,64 @@
+package org.hzontal.shared_ui.textviews
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.core.content.withStyledAttributes
+import com.google.android.material.card.MaterialCardView
+import org.hzontal.shared_ui.R
+import org.hzontal.shared_ui.databinding.ViewTipsCardBinding
+
+class TipsCardView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewTipsCardBinding.inflate(LayoutInflater.from(context), this, true)
+
+    init {
+        context.withStyledAttributes(attrs, R.styleable.TipsCardView) {
+            title = getString(R.styleable.TipsCardView_tipsTitle) ?: title
+            description = getString(R.styleable.TipsCardView_tipsDescription) ?: description
+
+            getResourceId(R.styleable.TipsCardView_tipsIcon, 0).takeIf { it != 0 }?.let { setIcon(it) }
+            getColor(R.styleable.TipsCardView_tipsCardColor, 0).takeIf { it != 0 }?.let { setCardColor(it) }
+            getColor(R.styleable.TipsCardView_tipsTitleColor, 0).takeIf { it != 0 }?.let { setTitleColor(it) }
+            getColor(R.styleable.TipsCardView_tipsTextColor, 0).takeIf { it != 0 }?.let { setTextColor(it) }
+
+        }
+        isClickable = true
+        isFocusable = true
+    }
+
+    var title: CharSequence
+        get() = binding.tipsTitle.text
+        set(value) { binding.tipsTitle.text = value }
+
+    var description: CharSequence
+        get() = binding.tipsDescription.text
+        set(value) { binding.tipsDescription.text = value }
+
+    fun setOnTipsClick(listener: OnClickListener) {
+        binding.tipsIcon.setOnClickListener(listener)
+    }
+
+    private fun setIcon(@DrawableRes resId: Int) {
+        binding.tipsIcon.setImageResource(resId)
+    }
+
+    private fun setCardColor(@ColorInt color: Int) {
+        (binding.root as MaterialCardView).setCardBackgroundColor(color)
+    }
+
+    private fun setTitleColor(@ColorInt color: Int) {
+        binding.tipsTitle.setTextColor(color)
+    }
+
+    fun setTextColor(@ColorInt color: Int) {
+        binding.tipsDescription.setTextColor(color)
+    }
+}
\ No newline at end of file
diff --git a/shared-ui/src/main/res/drawable/tips_bg.xml b/shared-ui/src/main/res/drawable/tips_bg.xml
new file mode 100644
index 000000000..9f1a0bef2
--- /dev/null
+++ b/shared-ui/src/main/res/drawable/tips_bg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+    <solid
+        android:color="#14FFFFFF"
+        >
+    </solid>
+    <corners
+        android:radius="20dp"
+        >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/shared-ui/src/main/res/layout/view_collapsible_text.xml b/shared-ui/src/main/res/layout/view_collapsible_text.xml
index 3697d290e..f81340d71 100644
--- a/shared-ui/src/main/res/layout/view_collapsible_text.xml
+++ b/shared-ui/src/main/res/layout/view_collapsible_text.xml
@@ -1,44 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:id="@+id/collapsibleRoot"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin"
-        android:background="@drawable/bg_dual_text_check"
-        android:animateLayoutChanges="true">
-
-        <RelativeLayout
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/titleText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Tella_Main_White_Text.Meduim"
-                tools:text="Tips to connect" />
-
-            <ImageView
-                android:id="@+id/arrowIcon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:src="@drawable/right_icon"
-                android:contentDescription="Toggle" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/collapsibleText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            style="@style/Tella_Main_White_Text.Small"
-            android:layout_marginTop="8dp" />
-    </LinearLayout>
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

    <LinearLayout
        android:id="@+id/collapsibleRoot"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:padding="@dimen/activity_horizontal_margin"
        android:background="@drawable/bg_dual_text_check"
        android:animateLayoutChanges="true">

        <RelativeLayout
            android:id="@+id/header"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

            <TextView
                android:id="@+id/titleText"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                style="@style/Tella_Main_White_Text.Meduim"
                tools:text="Tips to connect" />

            <ImageView
                android:id="@+id/arrowIcon"
                android:layout_width="24dp"
                android:layout_height="24dp"
                android:layout_alignParentEnd="true"
                android:layout_centerVertical="true"
                android:src="@drawable/right_icon"
                android:contentDescription="Toggle" />
        </RelativeLayout>

        <TextView
            android:id="@+id/collapsibleText"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            style="@style/Tella_Main_White_Text.Small"
            android:layout_marginTop="8dp" />
    </LinearLayout>
</merge>
\ No newline at end of file
diff --git a/shared-ui/src/main/res/layout/view_tips_card.xml b/shared-ui/src/main/res/layout/view_tips_card.xml
new file mode 100644
index 000000000..37fbc8d54
--- /dev/null
+++ b/shared-ui/src/main/res/layout/view_tips_card.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tipsCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?attr/selectableItemBackground"
+    android:background="@drawable/tips_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:gravity="center_vertical">
+
+        <!-- Badge -->
+        <FrameLayout
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+          >
+            <ImageView
+                android:id="@+id/tipsIcon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="7dp"
+                android:contentDescription="@null"/>
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tipsTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Tella_Main_White_TextLargeBold"
+                tools:text="TIPS TO CONNECT"
+                android:textAllCaps="true"
+                android:textStyle="bold"
+                android:textSize="18sp"
+                android:letterSpacing="0.02"
+                android:textColor="@color/wa_white"/>
+
+            <TextView
+                android:id="@+id/tipsDescription"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Tella_Main_White_Text.Small"
+                android:layout_marginTop="6dp"
+                tools:text="Learn more about connecting to Wi-Fi for Nearby Sharing."
+                android:lineSpacingExtra="2dp"
+                android:textColor="@color/wa_white"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/shared-ui/src/main/res/values/attrs.xml b/shared-ui/src/main/res/values/attrs.xml
index 03c401889..0bb9348a7 100644
--- a/shared-ui/src/main/res/values/attrs.xml
+++ b/shared-ui/src/main/res/values/attrs.xml
@@ -139,4 +139,16 @@
         <attr name="collapsibleBody" format="string" />
         <attr name="defaultExpanded" format="boolean" />
     </declare-styleable>
+
+    <declare-styleable name="TipsCardView">
+        <attr name="tipsTitle" format="string" />
+        <attr name="tipsDescription" format="string" />
+        <attr name="tipsIcon" format="reference" />
+        <attr name="tipsCardDescription" format="reference"/>
+        <attr name="tipsCardTitle" format="reference"/>
+        <attr name="tipsCardColor" format="color|reference" />
+        <attr name="tipsTitleColor" format="color|reference" />
+        <attr name="tipsTextColor" format="color|reference" />
+        <attr name="tipsCornerRadius" format="dimension" />
+    </declare-styleable>
 </resources>
\ No newline at end of file

From e6659c1887ca384c31dc012b410a423c528f6c3e Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 9 Sep 2025 19:33:23 +0100
Subject: [PATCH 132/153] add new fragment tips logic + layout

---
 .../tella/mobile/util/NavigationManager.kt    |   4 +
 .../peertopeer/common/TipsConnectFragment.kt  |  22 ++++
 .../main/res/layout/fragment_tips_connect.xml | 113 ++++++++++++++++++
 mobile/src/main/res/values/config.xml         |   1 +
 mobile/src/main/res/values/strings.xml        |  17 +++
 5 files changed, 157 insertions(+)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/common/TipsConnectFragment.kt
 create mode 100644 mobile/src/main/res/layout/fragment_tips_connect.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
index 847dab4fc..e77139b38 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/NavigationManager.kt
@@ -238,6 +238,10 @@ class NavigationManager(
         navigateToWithBundle(R.id.action_recipientSuccessFragment_to_recipientUploadFilesFragment)
     }
 
+    fun navigateFromConnectHotspotScreenToTipsToConnectFragment() {
+        navigateToWithBundle(R.id.action_connectHotspotScreen_to_tipsToConnectFragment)
+    }
+
     fun navigateBackToStartNearBySharingFragmentAndClearBackStack() {
         navControllerProvider.navController.navigate(
             R.id.startNearBySharingFragment,
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/common/TipsConnectFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/common/TipsConnectFragment.kt
new file mode 100644
index 000000000..dc3dd5dad
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/common/TipsConnectFragment.kt
@@ -0,0 +1,22 @@
+package org.horizontal.tella.mobile.views.fragment.peertopeer.common
+
+import android.os.Bundle
+import android.view.View
+import androidx.activity.addCallback
+import org.horizontal.tella.mobile.databinding.FragmentTipsConnectBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class TipsConnectFragment :
+    BaseBindingFragment<FragmentTipsConnectBinding>(FragmentTipsConnectBinding::inflate) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        binding.toolbar.backClickListener =
+            { requireActivity().onBackPressedDispatcher.onBackPressed() }
+
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            isEnabled = false
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_tips_connect.xml b/mobile/src/main/res/layout/fragment_tips_connect.xml
new file mode 100644
index 000000000..613ecab58
--- /dev/null
+++ b/mobile/src/main/res/layout/fragment_tips_connect.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple">
+
+    <!-- Top app bar -->
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <org.hzontal.shared_ui.appbar.ToolbarComponent
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
+            app:startTitle="@string/get_connected" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <!-- Content -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="20dp">
+
+                <!-- Section: Setting up -->
+                <TextView
+                    android:id="@+id/section1Title"
+                    style="@style/Tella_Main_White_Text.MeduimbBold"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/white"
+                    android:text="@string/tips_section_setup" />
+
+                <TextView
+                    android:id="@+id/section1Body"
+                    style="@style/Tella_Main_White_Text.Meduim"
+                    android:layout_marginTop="8dp"
+                    android:textColor="@color/wa_white"
+                    android:lineSpacingExtra="2dp"
+                    android:text="@string/tips_setup_intro" />
+
+                <!-- Numbered list -->
+
+                <TextView
+                    android:id="@+id/section1List"
+                    style="@style/Tella_Main_White_Text.Meduim"
+                    android:layout_marginTop="6dp"
+                    android:lineSpacingExtra="3dp"
+                    android:text="@string/tips_setup_list"
+                    android:textColor="@color/wa_white" />
+
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginVertical="@dimen/activity_vertical_margin"
+                    app:dividerColor="@color/wa_white_20"  />
+
+                <!-- Section: Joining same network -->
+                <TextView
+                    android:id="@+id/section2Title"
+                    style="@style/Tella_Main_White_Text.MeduimbBold"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/white"
+                    android:text="@string/tips_section_join" />
+
+                <TextView
+                    android:id="@+id/section2Body"
+                    style="@style/Tella_Main_White_Text.Meduim"
+                    android:layout_marginTop="8dp"
+                    android:textColor="@color/wa_white"
+                    android:lineSpacingExtra="2dp"
+                    android:text="@string/tips_join_body" />
+
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginVertical="@dimen/activity_vertical_margin"
+                    app:dividerColor="@color/wa_white_20" />
+
+                <!-- Section: More tips -->
+                <TextView
+                    android:id="@+id/section3Title"
+                    style="@style/Tella_Main_White_Text.MeduimbBold"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/white"
+                    android:text="@string/tips_section_more" />
+
+                <!-- Bullets -->
+                <TextView
+                    android:id="@+id/section3Bullets"
+                    style="@style/Tella_Main_White_Text.Meduim"
+                    android:layout_marginTop="8dp"
+                    android:textColor="@color/wa_white"
+                    android:lineSpacingExtra="3dp"
+                    android:text="@string/tips_more_bullets" />
+            </LinearLayout>
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/mobile/src/main/res/values/config.xml b/mobile/src/main/res/values/config.xml
index dcd384e03..6d074abfc 100644
--- a/mobile/src/main/res/values/config.xml
+++ b/mobile/src/main/res/values/config.xml
@@ -13,6 +13,7 @@
     <string name="config_nearby_sharing_url" translatable="false">https://tella-app.org/nearby-sharing</string>
     <string-array name="ra_lang_codes" translatable="false">
         <item>ar</item>
+        <item>az</item>
         <item>be</item>
         <item>en</item>
         <item>es</item>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 40b4585fa..65bf3b7b2 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1099,6 +1099,23 @@ Would you like to share analytics with the Tella team?</string>
 
     <string name="nearby_sharing_title">Nearby Sharing</string>
     <string name="nearby_sharing_description">Enable this feature to share files with devices near you, without an Internet connection.</string>
+    <string name="nearby_sharing_intro">Share files directly with a device near you, with or without an Internet connection.\n\nTo get started, join the same Wi-Fi network as the recipient. Nearby Sharing will work even if the Wi-Fi network is not connected to the Internet.</string>
+    <string name="tips_to_connect_wifi">Learn more about connecting to Wi-Fi for Nearby Sharing.</string>
+    <string name="tips_section_setup">Setting up</string>
+    <string name="tips_setup_intro">
+        There are 2 ways to connect your devices through Wi-Fi:
+    </string>
+    <string name="tips_setup_list">
+1. Using a Wi-Fi router, such as at home or work\n2. Setting up a Wi-Fi hotspot from a device, such as a phone, tablet, or computer\n\ta. One user creates a hotspot connection by going to \ttheir device’s settings.\n\tb. The other user connects to that hotspot.
+</string>
+
+    <string name="tips_section_join">Joining the same network</string>
+    <string name="tips_join_body">
+        Once the Wi-Fi network is set up, go to your devices’ settings and verify that you are both on the same Wi-Fi network.
+    </string>
 
+    <string name="tips_section_more">More tips</string>
+    <string name="tips_more_bullets">• The Wi-Fi network does not need to have internet access. As long as the Wi-Fi router or hotspot is powered on and functioning, it can be used for Nearby Sharing even without being online
+• Make sure to disable any active VPN connections.</string>
 
 </resources>

From 6018782a65fbbb41228c12d9949ac23cb14bbd3b Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 9 Sep 2025 19:34:18 +0100
Subject: [PATCH 133/153] Adjust new logic removal for wifi + tips

---
 .../receipentflow/ConnectHotspotFragment.kt   | 78 ++-----------------
 mobile/src/main/res/drawable/ic_p2p_small.xml | 28 +++++++
 .../res/layout/connect_hotspot_layout.xml     | 47 ++++-------
 .../res/navigation/peer_to_peer_graph.xml     | 10 +++
 4 files changed, 60 insertions(+), 103 deletions(-)
 create mode 100644 mobile/src/main/res/drawable/ic_p2p_small.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index d1e971b72..83586500a 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -1,33 +1,15 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 
-import android.Manifest.permission.ACCESS_FINE_LOCATION
-import android.Manifest.permission.ACCESS_NETWORK_STATE
-import android.Manifest.permission.ACCESS_WIFI_STATE
-import android.app.AlertDialog
-import android.content.Context
-import android.content.Intent
-import android.content.IntentSender
-import android.content.pm.PackageManager
-import android.location.LocationManager
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import android.view.View
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
-import com.google.android.datatransport.Priority
-import com.google.android.gms.common.api.ResolvableApiException
-import com.google.android.gms.location.LocationRequest
-import com.google.android.gms.location.LocationServices
-import com.google.android.gms.location.LocationSettingsRequest
 import com.hzontal.tella_locking_ui.ui.pin.pinview.ResourceUtils.getColor
 import dagger.hilt.android.AndroidEntryPoint
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.ConnectHotspotLayoutBinding
 import org.horizontal.tella.mobile.util.ConnectionType
-import org.horizontal.tella.mobile.util.LocationProvider.isLocationEnabled
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
 import org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerParticipant
 import org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel.PeerToPeerViewModel
@@ -39,22 +21,12 @@ class ConnectHotspotFragment :
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var isCheckboxChecked = false
 
-    @RequiresApi(Build.VERSION_CODES.M)
-    private val requestPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
-            if (granted) {
-                checkLocationSettings()
-            } else {
-                baseActivity.showToast(getString(R.string.location_permission_is_required_to_get_wifi_ssid))
-            }
-        }
 
     @RequiresApi(Build.VERSION_CODES.M)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initObservers()
         initListeners()
-        checkAndRequestPermissions()
     }
 
     private fun initObservers() {
@@ -62,12 +34,10 @@ class ConnectHotspotFragment :
             viewModel.currentNetworkInfo = info
             when (info.connectionType) {
                 ConnectionType.HOTSPOT, ConnectionType.WIFI, ConnectionType.CELLULAR -> {
-                    binding.currentWifiText.setRightText(info.ssid ?: "Unknown")
                     updateNextButtonState(info.connectionType)
                 }
 
                 ConnectionType.NONE -> {
-                    binding.currentWifiText.setRightText("No network connected")
                     updateNextButtonState(ConnectionType.NONE)
                 }
             }
@@ -82,6 +52,9 @@ class ConnectHotspotFragment :
         }
 
         binding.toolbar.backClickListener = { baseActivity.onBackPressed() }
+        binding.tipsCard.setOnTipsClick {
+            navManager().navigateFromConnectHotspotScreenToTipsToConnectFragment()
+        }
     }
 
     private fun updateNextButtonState(connectionType: ConnectionType?) {
@@ -102,51 +75,10 @@ class ConnectHotspotFragment :
     }
 
     private fun onNextClicked() {
-        if(viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
-        navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
+        if (viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
+            navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
         else navManager().navigateFromActionConnectHotspotScreenToScanQrCodeScreen()
 
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun checkAndRequestPermissions() {
-        if (ContextCompat.checkSelfPermission(baseActivity, ACCESS_FINE_LOCATION)
-            != PackageManager.PERMISSION_GRANTED
-        ) {
-            baseActivity.maybeChangeTemporaryTimeout {
-                requestPermissionLauncher.launch(ACCESS_FINE_LOCATION)
-            }
-        } else {
-            checkLocationSettings()
-        }
-    }
-
-    private fun checkLocationSettings() {
-        val locationRequest = LocationRequest.create()
-            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
-
-        val builder = LocationSettingsRequest.Builder()
-            .addLocationRequest(locationRequest)
-            .setAlwaysShow(true)
-
-        val settingsClient = LocationServices.getSettingsClient(requireActivity())
-        settingsClient.checkLocationSettings(builder.build())
-            .addOnSuccessListener {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    viewModel.updateNetworkInfo()
-                }
-            }
-            .addOnFailureListener { exception ->
-                if (exception is ResolvableApiException) {
-                    try {
-                        exception.startResolutionForResult(requireActivity(), 1001)
-                    } catch (sendEx: IntentSender.SendIntentException) {
-                        baseActivity.showToast(getString(R.string.failed_to_open_location_settings))
-                    }
-                } else {
-                    baseActivity.showToast(getString(R.string.location_permission_is_required_to_get_wifi_ssid))
-                }
-            }
-    }
-
 }
diff --git a/mobile/src/main/res/drawable/ic_p2p_small.xml b/mobile/src/main/res/drawable/ic_p2p_small.xml
new file mode 100644
index 000000000..689212efc
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_p2p_small.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <group>
+    <clip-path
+        android:pathData="M1.197,4.8h36v36h-36z"/>
+    <path
+        android:pathData="M8.376,37.3C7.548,37.3 6.838,37.005 6.248,36.415C5.658,35.825 5.363,35.116 5.363,34.287V11.979C5.363,11.151 5.658,10.442 6.248,9.852C6.838,9.262 7.548,8.967 8.376,8.967H16.357C17.185,8.967 17.895,9.262 18.485,9.852C19.074,10.442 19.369,11.151 19.369,11.979V19.672H16.87V16.322H7.863V29.944H19.369V34.287C19.369,35.116 19.074,35.825 18.485,36.415C17.895,37.005 17.185,37.3 16.357,37.3H8.376ZM25.892,40.633C25.103,40.633 24.428,40.352 23.866,39.791C23.305,39.229 23.024,38.553 23.024,37.764V29.944H25.523V33.277H34.53V19.672H23.024V15.313C23.024,14.484 23.319,13.775 23.909,13.185C24.499,12.595 25.208,12.3 26.036,12.3H34.017C34.846,12.3 35.555,12.595 36.145,13.185C36.735,13.775 37.03,14.484 37.03,15.313V37.62C37.03,38.449 36.735,39.158 36.145,39.748C35.555,40.338 34.846,40.633 34.017,40.633H25.892ZM7.863,32.444V34.287C7.863,34.437 7.911,34.56 8.007,34.656C8.104,34.752 8.226,34.8 8.376,34.8H16.357C16.507,34.8 16.629,34.752 16.725,34.656C16.822,34.56 16.87,34.437 16.87,34.287V32.444H7.863ZM25.523,35.777V37.62C25.523,37.77 25.572,37.893 25.668,37.989C25.764,38.085 25.887,38.133 26.036,38.133H34.017C34.167,38.133 34.29,38.085 34.386,37.989C34.482,37.893 34.53,37.77 34.53,37.62V35.777H25.523ZM7.863,13.822H16.87V11.979C16.87,11.83 16.822,11.707 16.725,11.611C16.629,11.515 16.507,11.467 16.357,11.467H8.376C8.226,11.467 8.104,11.515 8.007,11.611C7.911,11.707 7.863,11.83 7.863,11.979V13.822ZM25.523,17.172H34.53V15.313C34.53,15.163 34.482,15.04 34.386,14.944C34.29,14.848 34.167,14.8 34.017,14.8H26.036C25.887,14.8 25.764,14.848 25.668,14.944C25.572,15.04 25.523,15.163 25.523,15.313V17.172Z"
+        android:fillColor="#ffffff"/>
+  </group>
+  <path
+      android:pathData="M15.084,26.704L16.808,28.428L15.084,29.29L11.637,25.842L15.084,22.395L16.808,23.257L15.084,24.98H21.979V26.704H15.084Z"
+      android:fillColor="#D6933B"/>
+  <path
+      android:pathData="M28.068,24.956L26.344,23.232L28.068,22.37L31.516,25.818L28.068,29.265L26.344,28.403L28.068,26.68H21.173V24.956H28.068Z"
+      android:fillColor="#D6933B"/>
+  <path
+      android:pathData="M37.947,12.09C37.929,11.954 38.003,11.842 38.114,11.747C39.049,10.939 39.983,10.132 40.915,9.325C42.061,8.331 43.207,7.337 44.352,6.343C44.671,6.067 44.991,5.793 45.306,5.514C45.478,5.362 45.661,5.352 45.859,5.448C46.023,5.524 46.169,5.635 46.286,5.775C46.402,5.914 46.487,6.079 46.534,6.255C46.565,6.347 46.568,6.446 46.54,6.538C46.513,6.631 46.457,6.712 46.38,6.771C44.235,8.627 42.091,10.484 39.949,12.344C39.694,12.565 39.435,12.778 39.185,13.008C39.123,13.069 39.044,13.112 38.959,13.13C38.874,13.147 38.786,13.141 38.704,13.109C38.329,12.991 37.948,12.494 37.947,12.09Z"
+      android:fillColor="#D6933B"/>
+  <path
+      android:pathData="M36.186,5.386C36.408,5.384 36.626,5.439 36.815,5.546C37.008,5.655 37.105,5.806 37.078,6.032C36.914,7.368 36.76,8.706 36.603,10.043C36.569,10.336 36.419,10.485 36.112,10.532C35.72,10.591 35.356,10.545 35.054,10.278C35.007,10.238 34.971,10.186 34.95,10.13C34.929,10.073 34.923,10.012 34.934,9.952C35.094,8.61 35.252,7.267 35.409,5.924C35.455,5.539 35.678,5.386 36.186,5.386Z"
+      android:fillColor="#D6933B"/>
+  <path
+      android:pathData="M45.696,14.523C45.685,15.099 45.532,15.212 45.165,15.291C43.86,15.566 42.557,15.853 41.254,16.14C41.05,16.185 40.891,16.128 40.769,15.948C40.658,15.79 40.583,15.607 40.549,15.413C40.515,15.219 40.523,15.018 40.573,14.828C40.591,14.736 40.634,14.652 40.698,14.587C40.761,14.523 40.841,14.481 40.927,14.467C42.292,14.173 43.658,13.877 45.023,13.578C45.239,13.531 45.46,13.691 45.576,13.988C45.646,14.17 45.707,14.361 45.696,14.523Z"
+      android:fillColor="#D6933B"/>
+</vector>
diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
index 2d57d9188..62fa68c87 100644
--- a/mobile/src/main/res/layout/connect_hotspot_layout.xml
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -19,14 +19,14 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
-            app:startTitle="@string/wifi" />
+            app:startTitle="@string/get_connected" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView
         android:id="@+id/deviceImg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/icon_wifi"
+        android:background="@drawable/ic_p2p_sharing"
         app:layout_constraintBottom_toTopOf="@+id/titleTextView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -42,7 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:gravity="center"
-        android:text="@string/get_connected"
+        android:text="@string/nearby_sharing"
         android:textColor="@android:color/white"
         app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
         app:layout_constraintEnd_toEndOf="parent"
@@ -58,46 +58,35 @@
         android:layout_marginTop="@dimen/activity_horizontal_small_margin"
         android:gravity="start"
         android:paddingHorizontal="@dimen/activity_horizontal_margin"
-        android:text="@string/wifi_connection_instruction"
+        android:text="@string/nearby_sharing_intro"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
 
-    <org.hzontal.shared_ui.textviews.CollapsibleTextView
-        android:id="@+id/tipsTextView"
+    <org.hzontal.shared_ui.textviews.TipsCardView
+        android:id="@+id/tipsCard"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        android:paddingVertical="@dimen/activity_horizontal_margin"
-        app:collapsibleBody="@string/tips_to_connect_body"
-        app:collapsibleTitle="@string/tips_to_connect_title"
-        app:defaultExpanded="true"
+        android:layout_height="100dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titleDescTextView" />
-
+        android:layout_marginTop="12dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        app:layout_constraintTop_toBottomOf="@id/titleDescTextView"
+        app:tipsDescription="@string/tips_to_connect_wifi"
+        app:tipsTitle="@string/tips_to_connect_title"
+        app:tipsIcon="@drawable/orange_help_24"
+        />
 
     <View
         android:id="@+id/separator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginTop="24dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:background="@color/wa_white_20"
-        app:layout_constraintTop_toBottomOf="@id/tipsTextView" />
+        app:layout_constraintTop_toBottomOf="@id/tipsCard" />
 
-    <org.hzontal.shared_ui.buttons.DualTextCheckView
-        android:id="@+id/currentWifiText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/separator"
-        app:leftText="@string/current_wifi_network" />
 
     <org.hzontal.shared_ui.buttons.DualTextCheckView
         android:id="@+id/currentWifi"
@@ -107,12 +96,10 @@
         android:layout_marginTop="12dp"
         app:checkboxVisible="true"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/currentWifiText"
+        app:layout_constraintTop_toBottomOf="@+id/separator"
         app:leftText="@string/same_wifi_text" />
 
-
     <TextView
         android:id="@+id/next_btn"
         style="@style/Unlock_White_Text_Next"
diff --git a/mobile/src/main/res/navigation/peer_to_peer_graph.xml b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
index c399df0aa..27ba11cd0 100644
--- a/mobile/src/main/res/navigation/peer_to_peer_graph.xml
+++ b/mobile/src/main/res/navigation/peer_to_peer_graph.xml
@@ -28,6 +28,9 @@
         <action
             android:id="@+id/action_connectHotspotScreen_to_scanQrCodeScreen"
             app:destination="@id/scanQrCodeScreen" />
+        <action
+            android:id="@+id/action_connectHotspotScreen_to_tipsToConnectFragment"
+            app:destination="@id/tipsToConnectFragment" />
 
     </fragment>
 
@@ -156,11 +159,18 @@
             android:id="@+id/action_uploadSenderFragment_to_peerToPeerResultFragment"
             app:destination="@id/peerToPeerResultFragment" />
     </fragment>
+
     <fragment
         android:id="@+id/peerToPeerResultFragment"
         android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.senderflow.PeerToPeerResultFragment"
         android:label="PeerToPeerResultFragment"
         tools:layout="@layout/fragment_peer_to_peer_result" />
 
+    <fragment
+        android:id="@+id/tipsToConnectFragment"
+        android:name="org.horizontal.tella.mobile.views.fragment.peertopeer.common.TipsConnectFragment"
+        android:label="TipsConnectFragment"
+        tools:layout="@layout/fragment_tips_connect" />
+
 
 </navigation>
\ No newline at end of file

From 2e5f3e0d651e9181160a469b0551ccdf94bf607b Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Tue, 9 Sep 2025 20:05:18 +0100
Subject: [PATCH 134/153] Fix network update

---
 .../tella/mobile/util/ConnectionType.kt       | 106 ++++++++----------
 .../receipentflow/ConnectHotspotFragment.kt   |  21 ++--
 .../viewmodel/PeerToPeerViewModel.kt          |   2 -
 .../res/layout/connect_hotspot_layout.xml     |   2 +-
 4 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
index 8ec1e9b82..0fdf08bfb 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/util/ConnectionType.kt
@@ -3,6 +3,8 @@ package org.horizontal.tella.mobile.util
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.ConnectivityManager
+import android.net.LinkProperties
+import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.wifi.WifiManager
 import android.os.Build
@@ -19,7 +21,6 @@ enum class ConnectionType {
 
 data class NetworkInfo(
     val connectionType: ConnectionType,
-    val ssid: String?,
     val ipAddress: String?,
     var port: String = "53317"
 )
@@ -29,87 +30,78 @@ class NetworkInfoManager(private val context: Context) {
     private val _networkInfo = MutableLiveData<NetworkInfo>()
     val networkInfo: LiveData<NetworkInfo> = _networkInfo
 
-    private var currentNetworkInfo: NetworkInfo = NetworkInfo(ConnectionType.NONE, null, null)
+    private var currentNetworkInfo: NetworkInfo = NetworkInfo(ConnectionType.NONE, null)
 
     @RequiresApi(Build.VERSION_CODES.M)
-    @SuppressLint("MissingPermission", "DiscouragedPrivateApi")
+    @SuppressLint("MissingPermission")
     fun fetchCurrentNetworkInfo() {
-        val connectivityManager =
-            ContextCompat.getSystemService(context, ConnectivityManager::class.java)
-        val network = connectivityManager?.activeNetwork
-        val capabilities = connectivityManager?.getNetworkCapabilities(network)
+        val cm = ContextCompat.getSystemService(context, ConnectivityManager::class.java)
+        val network: Network? = cm?.activeNetwork
+        val caps: NetworkCapabilities? = cm?.getNetworkCapabilities(network)
 
-        when {
-            capabilities == null -> {
-                _networkInfo.postValue(NetworkInfo(ConnectionType.NONE, null, null))
-            }
-
-            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
-                val wifiManager =
-                    context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
-
-                val wifiInfo = wifiManager?.connectionInfo
-                val ssid = when {
-                    wifiInfo?.ssid != null && wifiInfo.ssid != WifiManager.UNKNOWN_SSID ->
-                        wifiInfo.ssid.trim('"')
-                    else -> "Unknown WiFi"
-                }
+        if (caps == null) {
+            post(ConnectionType.NONE, null)
+            return
+        }
 
-                val ipAddress = getLocalIpAddress()
-                _networkInfo.postValue(NetworkInfo(ConnectionType.WIFI, ssid, ipAddress))
-            }
+        val ip = getActiveIpv4(cm, network) ?: getFallbackIpv4()
 
-            isDeviceHotspotEnabled(context) -> {
-                val hotspotSSID = getDeviceHotspotSSID(context) ?: "Hotspot"
-                val hotspotIpAddress = getLocalIpAddress() // more reliable than hardcoded
-                _networkInfo.postValue(NetworkInfo(ConnectionType.HOTSPOT, hotspotSSID, hotspotIpAddress))
+        when {
+            caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
+                post(ConnectionType.WIFI, ip)
             }
 
-            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
-                _networkInfo.postValue(NetworkInfo(ConnectionType.CELLULAR, null, null))
+            caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
+                if (isDeviceHotspotEnabled(context)) {
+                    post(ConnectionType.HOTSPOT, ip) // treat hotspot + cellular as HOTSPOT
+                } else {
+                    post(ConnectionType.NONE, null)   // cellular alone → NONE
+                }
             }
 
             else -> {
-                _networkInfo.postValue(NetworkInfo(ConnectionType.NONE, null, null))
+                post(ConnectionType.NONE, null)
             }
         }
+    }
 
-        currentNetworkInfo = _networkInfo.value ?: NetworkInfo(ConnectionType.NONE, null, null)
+    private fun post(type: ConnectionType, ip: String?) {
+        val info = NetworkInfo(type, ip)
+        _networkInfo.postValue(info)
+        currentNetworkInfo = info
     }
 
-    private fun isDeviceHotspotEnabled(context: Context): Boolean {
-        val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-        return try {
-            val method = wifiManager.javaClass.getDeclaredMethod("isWifiApEnabled")
-            method.isAccessible = true
-            method.invoke(wifiManager) as? Boolean ?: false
-        } catch (e: Exception) {
-            e.printStackTrace()
-            false
-        }
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun getActiveIpv4(cm: ConnectivityManager?, network: Network?): String? {
+        if (cm == null || network == null) return null
+        val lp: LinkProperties = cm.getLinkProperties(network) ?: return null
+        return lp.linkAddresses
+            .mapNotNull { it.address }
+            .firstOrNull { it is Inet4Address && !it.isLoopbackAddress }
+            ?.hostAddress
     }
 
-    private fun getDeviceHotspotSSID(context: Context): String? {
-        val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+    private fun getFallbackIpv4(): String? {
         return try {
-            val method = wifiManager.javaClass.getDeclaredMethod("getWifiApConfiguration")
-            method.isAccessible = true
-            val config = method.invoke(wifiManager)
-            val ssidField = config?.javaClass?.getDeclaredField("SSID")
-            ssidField?.isAccessible = true
-            ssidField?.get(config) as? String
-        } catch (e: Exception) {
-            e.printStackTrace()
+            NetworkInterface.getNetworkInterfaces()
+                .toList()
+                .flatMap { it.inetAddresses.toList() }
+                .firstOrNull { it is Inet4Address && !it.isLoopbackAddress }
+                ?.hostAddress
+        } catch (_: Exception) {
             null
         }
     }
 
-    private fun getLocalIpAddress(): String? {
+    private fun isDeviceHotspotEnabled(context: Context): Boolean {
+        val wifiManager =
+            context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
         return try {
-            NetworkInterface.getNetworkInterfaces().toList().flatMap { it.inetAddresses.toList() }
-                .firstOrNull { !it.isLoopbackAddress && it is Inet4Address }?.hostAddress
+            val method = wifiManager.javaClass.getDeclaredMethod("isWifiApEnabled")
+            method.isAccessible = true
+            method.invoke(wifiManager) as? Boolean ?: false
         } catch (e: Exception) {
-            null
+            false
         }
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
index 83586500a..08d72989f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/ConnectHotspotFragment.kt
@@ -25,6 +25,7 @@ class ConnectHotspotFragment :
     @RequiresApi(Build.VERSION_CODES.M)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        viewModel.updateNetworkInfo()
         initObservers()
         initListeners()
     }
@@ -59,21 +60,27 @@ class ConnectHotspotFragment :
 
     private fun updateNextButtonState(connectionType: ConnectionType?) {
         val isEligibleConnection =
-            connectionType != ConnectionType.NONE && connectionType != ConnectionType.CELLULAR
+            connectionType == ConnectionType.WIFI || connectionType == ConnectionType.HOTSPOT
+
+        binding.currentWifi.setCheckboxEnabled(isEligibleConnection)
+
         val shouldEnable = isEligibleConnection && isCheckboxChecked
 
-        binding.nextBtn.setOnClickListener(if (shouldEnable) {
-            { onNextClicked() }
-        } else {
-            { }
-        })
+        binding.nextBtn.isEnabled = shouldEnable
+        binding.nextBtn.isClickable = shouldEnable
+
+        binding.nextBtn.alpha = if (shouldEnable) 1f else 0.5f
+
+        binding.nextBtn.setOnClickListener(
+            if (shouldEnable) { { onNextClicked() } } else { { /* no-op */ } }
+        )
 
         binding.nextBtn.setTextColor(
             getColor(baseActivity, if (shouldEnable) R.color.wa_white else R.color.wa_white_40)
         )
-        binding.currentWifi.setCheckboxEnabled(isEligibleConnection)
     }
 
+
     private fun onNextClicked() {
         if (viewModel.peerToPeerParticipant == PeerToPeerParticipant.RECIPIENT)
             navManager().navigateFromActionConnectHotspotScreenToQrCodeScreen()
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index ada6c6dd9..6cd072346 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -88,8 +88,6 @@ class PeerToPeerViewModel @Inject constructor(
     private val _closeConnection = SingleLiveEvent<Boolean>()
     val closeConnection: SingleLiveEvent<Boolean> get() = _closeConnection
 
-    // ---------- Save-on-arrival state ----------
-    // Track files being saved/done by transmissionId to prevent duplicate saves.
     private val savingOrDone: MutableSet<String> =
         Collections.newSetFromMap(ConcurrentHashMap<String, Boolean>())
     private var totalFilesExpected = 0
diff --git a/mobile/src/main/res/layout/connect_hotspot_layout.xml b/mobile/src/main/res/layout/connect_hotspot_layout.xml
index 62fa68c87..221094c99 100644
--- a/mobile/src/main/res/layout/connect_hotspot_layout.xml
+++ b/mobile/src/main/res/layout/connect_hotspot_layout.xml
@@ -92,7 +92,7 @@
         android:id="@+id/currentWifi"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:layout_marginTop="12dp"
         app:checkboxVisible="true"
         app:layout_constraintEnd_toEndOf="parent"

From 821e45ac1b814754765fa04b999b21e57c49f442 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 10 Sep 2025 14:49:29 +0100
Subject: [PATCH 135/153] new T-And-1676 - Update Onboarding with p2p info

---
 .../OnBoardNearbySharingFragment.kt           | 34 ++++++++
 .../activity/onboarding/OnBoardingActivity.kt |  7 +-
 .../onboard_nearby_sharing_fragment.xml       | 86 +++++++++++++++++++
 mobile/src/main/res/values/strings.xml        |  2 +-
 4 files changed, 126 insertions(+), 3 deletions(-)
 create mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
 create mode 100644 mobile/src/main/res/layout/onboard_nearby_sharing_fragment.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
new file mode 100644
index 000000000..81459c376
--- /dev/null
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
@@ -0,0 +1,34 @@
+package org.horizontal.tella.mobile.views.activity.onboarding
+
+hhhimport android.os.Bundle
+import android.view.View
+import org.horizontal.tella.mobile.databinding.OnboardNearbySharingFragmentBinding
+import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
+
+class OnBoardNearbySharingFragment :
+    BaseBindingFragment<OnboardNearbySharingFragmentBinding>(OnboardNearbySharingFragmentBinding::inflate) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initView()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (baseActivity as OnBoardActivityInterface).enableSwipe(
+            isSwipeable = true, isTabLayoutVisible = true
+        )
+        (baseActivity as OnBoardActivityInterface).showButtons(
+            isNextButtonVisible = true, isBackButtonVisible = true
+        )
+    }
+
+    private fun initView() {
+        binding.backBtn.setOnClickListener {
+            baseActivity.onBackPressed()
+        }
+        binding.nextBtn.setOnClickListener {
+            (baseActivity as OnBoardingActivity).onNextPressed()
+        }
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardingActivity.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardingActivity.kt
index 4d2a95c32..95a560307 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardingActivity.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardingActivity.kt
@@ -39,7 +39,9 @@ private const val ONBOARDING_CAMERA_VIEW_INDEX = 1
 private const val ONBOARDING_RECORDER_VIEW_INDEX = 2
 private const val ONBOARDING_FILES_VIEW_INDEX = 3
 private const val ONBOARDING_COLLECT_DATA_VIEW = 4
-private const val ONBOARDING_LOCK_VIEW_INDEX = 5
+private const val ONBOARDING_NEARBY_SHARING_VIEW_INDEX = 5
+private const val ONBOARDING_LOCK_VIEW_INDEX = 6
+
 
 @AndroidEntryPoint
 class OnBoardingActivity : BaseActivity(), OnBoardActivityInterface,
@@ -62,7 +64,7 @@ class OnBoardingActivity : BaseActivity(), OnBoardActivityInterface,
         setContentView(binding.root)
         applyEdgeToEdge(binding.root)
         // Instantiate a ViewPager and a Tablayout
-        if (!isOnboardLockSet && !isFromSettings) initViewPager(6)
+        if (!isOnboardLockSet && !isFromSettings) initViewPager(7)
 
         // Instantiate next and back buttons
         initButtons()
@@ -349,6 +351,7 @@ class OnBoardingActivity : BaseActivity(), OnBoardActivityInterface,
                 ONBOARDING_RECORDER_VIEW_INDEX -> OnBoardRecorderFragment()
                 ONBOARDING_FILES_VIEW_INDEX -> OnBoardFilesFragment()
                 ONBOARDING_COLLECT_DATA_VIEW -> OnboardCollectDataFragment()
+                ONBOARDING_NEARBY_SHARING_VIEW_INDEX -> OnBoardNearbySharingFragment()
                 ONBOARDING_LOCK_VIEW_INDEX -> OnBoardLockFragment()
                 else -> OnBoardIntroFragment()
             }
diff --git a/mobile/src/main/res/layout/onboard_nearby_sharing_fragment.xml b/mobile/src/main/res/layout/onboard_nearby_sharing_fragment.xml
new file mode 100644
index 000000000..093117740
--- /dev/null
+++ b/mobile/src/main/res/layout/onboard_nearby_sharing_fragment.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wa_purple">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineCenter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineBottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.95" />
+
+    <ImageView
+        android:layout_width="119dp"
+        android:layout_height="82dp"
+        android:layout_marginBottom="@dimen/hide_tella_big_margin"
+        android:src="@drawable/ic_p2p_sharing"
+        android:textColor="@color/wa_white"
+        app:layout_constraintBottom_toTopOf="@+id/sheet_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/sheet_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/hide_tella_big_margin"
+        android:layout_marginBottom="@dimen/hide_tella_big_margin"
+        android:fontFamily="@font/open_sans"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:padding="6dp"
+        android:text="@string/nearby_sharing"
+        android:textColor="@color/wa_white"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/sheet_subtitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="RtlSymmetry" />
+
+    <TextView
+        android:id="@+id/sheet_subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/open_sans"
+        android:gravity="center"
+        android:padding="@dimen/hide_tella_small_margin"
+        android:text="@string/onboard.nearby_sharing_expl"
+        android:textColor="@color/wa_white"
+        android:textSize="14sp"
+        android:paddingHorizontal="21dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guidelineCenter"
+        tools:ignore="RtlSymmetry" />
+
+
+    <TextView
+        style="@style/Unlock_White_Text_Back"
+        android:id="@+id/back_btn"
+        android:text="@string/LockSelect_Action_Back"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <TextView
+        style="@style/Unlock_White_Text_Back"
+        android:id="@+id/next_btn"
+        android:text="@string/action_next"
+        android:visibility="gone"
+        android:layout_marginEnd="34dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index e51d6dddc..82471a080 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -396,6 +396,7 @@ connecting to a server</string>
     <string name="onboard.hide_behind_calculator_not_possible">The Calculator camouflage is only possible if you use a PIN lock.</string>
     <string name="onboard.calculator_button">Select calculator</string>
     <string name="onboard.calculator_expl">Tella will be hidden behind a functional Calculator app. Unlock Tella by entering your PIN on the calculator followed by =</string>
+    <string name="onboard.nearby_sharing_expl">Share files with devices near you, without an Internet connection.</string>
     <string name="settings.general_recent_files_switch_title">Recent files</string>
     <string name="settings.general_recent_files_switch_expl">Show previews of and a shortcut to your recent files on Tella’s homescreen.</string>
     <string name="settings.general_favorite_forms_switch_title">Favorite forms</string>
@@ -1118,5 +1119,4 @@ Would you like to share analytics with the Tella team?</string>
     <string name="tips_more_bullets">• The Wi-Fi network does not need to have internet access. As long as the Wi-Fi router or hotspot is powered on and functioning, it can be used for Nearby Sharing even without being online
 • Make sure to disable any active VPN connections.</string>
     <string name="error_file_not_found">The file you are trying to import is no longer available. Please try again.</string>
-
 </resources>

From 0daf2389994470796bfc926f2002d7d1fadd5306 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 10 Sep 2025 14:51:51 +0100
Subject: [PATCH 136/153] make nearby sharing home button visible by default

---
 .../horizontal/tella/mobile/data/sharedpref/Preferences.java    | 2 +-
 .../views/activity/onboarding/OnBoardNearbySharingFragment.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
index 06357b892..c95a87fc0 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/sharedpref/Preferences.java
@@ -127,7 +127,7 @@ public static void setEraseForms(boolean value) {
     }
 
     public static boolean isEnableHomeNearby() {
-        return getBoolean(SharedPrefs.ENABLE_HOME_NEARBY_SHARING, false);
+        return getBoolean(SharedPrefs.ENABLE_HOME_NEARBY_SHARING, true);
     }
 
     public static void setEnableHomeNearby(boolean value) {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
index 81459c376..c0fec77a6 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/activity/onboarding/OnBoardNearbySharingFragment.kt
@@ -1,6 +1,6 @@
 package org.horizontal.tella.mobile.views.activity.onboarding
 
-hhhimport android.os.Bundle
+import android.os.Bundle
 import android.view.View
 import org.horizontal.tella.mobile.databinding.OnboardNearbySharingFragmentBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment

From 6d2f30e2e05b02b623197add5e72479187199b6d Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 10 Sep 2025 15:04:16 +0100
Subject: [PATCH 137/153] Remove text all caps redundant

---
 mobile/src/main/res/layout/connect_manually_verification.xml   | 2 --
 .../src/main/res/layout/drop_box_connected_server_fragment.xml | 1 -
 mobile/src/main/res/layout/fragment_peer_to_peer_result.xml    | 1 -
 mobile/src/main/res/layout/fragment_recipient_success.xml      | 2 --
 mobile/src/main/res/layout/scan_qrcode_fragment.xml            | 1 -
 mobile/src/main/res/layout/start_near_by_sharing_fragment.xml  | 2 --
 mobile/src/main/res/layout/verification_info_fragment.xml      | 1 -
 .../src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt | 3 +--
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index 1116d8f08..d056a60d7 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -68,7 +68,6 @@
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:background="@drawable/bg_round_orange_btn"
         app:text_color="@color/btn_dark_letter"
-        app:text_all_caps="true"
         app:check_state="false"
         app:layout_constraintTop_toBottomOf="@id/warningTextView"
         app:layout_constraintBottom_toTopOf="@+id/discardBtn"
@@ -82,7 +81,6 @@
         android:layout_height="54dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        app:check_state="false"
         app:text_all_caps="true"
         app:layout_constraintTop_toBottomOf="@id/confirmAndConnectBtn"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml b/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
index 07a01f5dd..de80445f6 100644
--- a/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
+++ b/mobile/src/main/res/layout/drop_box_connected_server_fragment.xml
@@ -74,7 +74,6 @@
         android:background="@drawable/bg_round_orange_btn"
         app:text_color="@color/btn_dark_letter"
         app:text="@string/go_to_dropbox"
-        app:text_all_caps="true"
         app:check_state="false"
         app:layout_constraintTop_toBottomOf="@+id/sheet_subtitle"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
index 3b7e91b3d..68e5072a2 100644
--- a/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
+++ b/mobile/src/main/res/layout/fragment_peer_to_peer_result.xml
@@ -63,7 +63,6 @@
         app:text_color="@color/btn_dark_letter"
         android:text="@string/view_files"
         app:check_state="true"
-        app:text_all_caps="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/mobile/src/main/res/layout/fragment_recipient_success.xml b/mobile/src/main/res/layout/fragment_recipient_success.xml
index 2835e1fc5..ddd7d88d5 100644
--- a/mobile/src/main/res/layout/fragment_recipient_success.xml
+++ b/mobile/src/main/res/layout/fragment_recipient_success.xml
@@ -68,7 +68,6 @@
             app:text_color="@color/btn_dark_letter"
             app:text="@string/accept"
             app:check_state="false"
-            app:text_all_caps="true"
             app:layout_constraintBottom_toTopOf="@+id/reject_btn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,7 +82,6 @@
             android:layout_marginTop="10dp"
             android:gravity="center"
             app:text="@string/reject"
-            app:text_all_caps="true"
             app:layout_constraintTop_toBottomOf="@+id/accept_btn" />
 
 
diff --git a/mobile/src/main/res/layout/scan_qrcode_fragment.xml b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
index 1ef50953d..64e8336e2 100644
--- a/mobile/src/main/res/layout/scan_qrcode_fragment.xml
+++ b/mobile/src/main/res/layout/scan_qrcode_fragment.xml
@@ -86,7 +86,6 @@
         app:circularflow_radiusInDP="25px"
         android:backgroundTint="@color/light_purple"
         android:textColor="@android:color/white"
-        app:text_all_caps="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/helpTextView"
diff --git a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
index 4449cde65..613ddbc65 100644
--- a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
+++ b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
@@ -73,7 +73,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/shareFilesDescriptionTv"
         app:text="@string/send_files"
-        app:text_all_caps="true"
         app:text_round_bold="true" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
@@ -87,7 +86,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintTop_toBottomOf="@+id/sendFilesBtn"
         app:text="@string/receive_files"
-        app:text_all_caps="true"
         app:text_round_bold="true"
         tools:layout_editor_absoluteX="24dp" />
 
diff --git a/mobile/src/main/res/layout/verification_info_fragment.xml b/mobile/src/main/res/layout/verification_info_fragment.xml
index a8c269056..c2a6ca2d6 100644
--- a/mobile/src/main/res/layout/verification_info_fragment.xml
+++ b/mobile/src/main/res/layout/verification_info_fragment.xml
@@ -109,7 +109,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/connect_btn"
         app:text="@string/discard_and_start_over"
-        app:text_all_caps="true"
         />
 
 
diff --git a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
index 82376aefe..674c9ca82 100644
--- a/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
+++ b/shared-ui/src/main/java/org/hzontal/shared_ui/buttons/RoundButton.kt
@@ -52,7 +52,7 @@ class RoundButton @JvmOverloads constructor(
                 mChecked = typedArray.getBoolean(R.styleable.RoundButton_check_state, false)
                 tintColor = typedArray.getColor(R.styleable.RoundButton_tint_color, -1)
                 textColor = typedArray.getColor(R.styleable.RoundButton_text_color, -1)
-                isTextAllCaps = typedArray.getBoolean(R.styleable.RoundButton_text_all_caps, false)
+                isTextAllCaps = typedArray.getBoolean(R.styleable.RoundButton_text_all_caps, true)
                 isTextBold = typedArray.getBoolean(R.styleable.RoundButton_text_round_bold, false)
                 defaultBackground = typedArray.getResourceId(
                     R.styleable.RoundButton_default_background,
@@ -136,7 +136,6 @@ class RoundButton @JvmOverloads constructor(
         else ContextCompat.getDrawable(context, defaultBackground)
     }
 
-    //TODO FIX TEXT ALLCAPS EVERY WHERE
     private fun setTextCaps(isTextAllCaps: Boolean) {
         binding.sheetTextView.isAllCaps = isTextAllCaps
     }

From 9c2904e254ca1f6bb101840322ec80ef800b048f Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Mon, 15 Sep 2025 11:39:25 +0100
Subject: [PATCH 138/153] apply protocol fixes

---
 .../data/peertopeer/TellaPeerToPeerServer.kt  | 65 ++++++++++++-------
 .../viewmodel/FileTransferViewModel.kt        |  5 +-
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
index 990c16f17..32cfc8a38 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerServer.kt
@@ -68,20 +68,15 @@ class TellaPeerToPeerServer(
         val keyStore = KeyStore.getInstance("PKCS12").apply {
             load(null, null)
             setKeyEntry(
-                keyStoreConfig.alias,
-                keyPair.private,
-                keyStoreConfig.password,
-                arrayOf(certificate)
+                keyStoreConfig.alias, keyPair.private, keyStoreConfig.password, arrayOf(certificate)
             )
         }
 
         engine = embeddedServer(Netty, environment = applicationEngineEnvironment {
-            sslConnector(
-                keyStore = keyStore,
+            sslConnector(keyStore = keyStore,
                 keyAlias = keyStoreConfig.alias,
                 keyStorePassword = { keyStoreConfig.password },
-                privateKeyPassword = { keyStoreConfig.password }
-            ) {
+                privateKeyPassword = { keyStoreConfig.password }) {
                 this.host = ip
                 this.port = serverPort
             }
@@ -138,7 +133,9 @@ class TellaPeerToPeerServer(
                         }
 
                         if (!accepted) {
-                            call.respond(HttpStatusCode.Forbidden, "Receiver rejected the registration")
+                            call.respond(
+                                HttpStatusCode.Forbidden, "Receiver rejected the registration"
+                            )
                             return@post
                         }
 
@@ -172,19 +169,21 @@ class TellaPeerToPeerServer(
                         }
 
                         val session = P2PSession(
-                            title = request.title,
-                            sessionId = request.sessionId
+                            title = request.title, sessionId = request.sessionId
                         ).also { it.status = SessionStatus.SENDING }
 
                         val responseFiles = request.files.map { file ->
                             val transmissionId = UUID.randomUUID().toString()
-                            val receivingFile = ProgressFile(file = file, transmissionId = transmissionId)
+                            val receivingFile =
+                                ProgressFile(file = file, transmissionId = transmissionId)
                             session.files[transmissionId] = receivingFile
                             FileInfo(id = file.id, transmissionId = transmissionId)
                         }
 
                         p2PSharedState.session = session
-                        call.respond(HttpStatusCode.OK, PeerPrepareUploadResponse(files = responseFiles))
+                        call.respond(
+                            HttpStatusCode.OK, PeerPrepareUploadResponse(files = responseFiles)
+                        )
                     }
 
                     // 3) Upload each file (transport-only; recipient will SAVE later)
@@ -195,6 +194,8 @@ class TellaPeerToPeerServer(
 
                         Timber.d("UPLOAD: session=$sessionId, fileId=$fileId, tx=$transmissionId")
 
+
+
                         if (sessionId == null || fileId == null || transmissionId == null) {
                             call.respond(HttpStatusCode.BadRequest, "Missing path parameters")
                             return@put
@@ -207,11 +208,22 @@ class TellaPeerToPeerServer(
                         }
 
                         val progressFile = session.files[transmissionId]
-                        if (progressFile == null || progressFile.file.id != fileId) {
+
+                        if (transmissionId != progressFile?.transmissionId) {
+                            call.respond(HttpStatusCode.Forbidden, "Invalid transmission ID")
+                            return@put
+                        }
+
+                        if (progressFile.file.id != fileId) {
                             call.respond(HttpStatusCode.NotFound, "File not found in session")
                             return@put
                         }
 
+                        if (progressFile.status == P2PFileStatus.FINISHED) {
+                            call.respond(HttpStatusCode.Conflict, "Transfer already completed")
+                            return@put
+                        }
+
                         // temp file for the recipient VM to persist into Vault later
                         val tmpFile = File.createTempFile(fileId, ".tmp")
                         val output = tmpFile.outputStream().buffered()
@@ -230,8 +242,10 @@ class TellaPeerToPeerServer(
                                 progressFile.bytesTransferred = bytesRead.toInt()
 
                                 // Broadcast “transport” progress; keep status = SENDING
-                                val totalTransferred = session.files.values.sumOf { it.bytesTransferred }
-                                val percent = if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
+                                val totalTransferred =
+                                    session.files.values.sumOf { it.bytesTransferred }
+                                val percent =
+                                    if (totalSize > 0) ((totalTransferred * 100) / totalSize).toInt() else 0
 
                                 PeerEventManager.onUploadProgressState(
                                     UploadProgressState(
@@ -244,12 +258,15 @@ class TellaPeerToPeerServer(
                             }
 
                             progressFile.status = P2PFileStatus.FINISHED       // network finished
-                            progressFile.path = tmpFile.path                    // handoff path to recipient
+                            progressFile.path =
+                                tmpFile.path                    // handoff path to recipient
 
                             // Emit one last transport-progress tick (still SENDING)
-                            val totalTransferred2 = session.files.values.sumOf { it.bytesTransferred }
+                            val totalTransferred2 =
+                                session.files.values.sumOf { it.bytesTransferred }
                             val totalSize2 = session.files.values.sumOf { it.file.size }
-                            val percent2 = if (totalSize2 > 0) ((totalTransferred2 * 100) / totalSize2).toInt() else 0
+                            val percent2 =
+                                if (totalSize2 > 0) ((totalTransferred2 * 100) / totalSize2).toInt() else 0
 
                             PeerEventManager.onUploadProgressState(
                                 UploadProgressState(
@@ -273,7 +290,9 @@ class TellaPeerToPeerServer(
                                 )
                             )
 
-                            call.respond(HttpStatusCode.InternalServerError, "Upload failed: ${e.message}")
+                            call.respond(
+                                HttpStatusCode.InternalServerError, "Upload failed: ${e.message}"
+                            )
                         } finally {
                             output.close()
                         }
@@ -284,13 +303,15 @@ class TellaPeerToPeerServer(
                         val payload = try {
                             call.receive<Map<String, String>>()
                         } catch (e: Exception) {
-                            call.respond(HttpStatusCode.BadRequest, "Missing or invalid JSON payload")
+                            call.respond(
+                                HttpStatusCode.BadRequest, "Missing or invalid JSON payload"
+                            )
                             return@post
                         }
 
                         val sessionId = payload["sessionId"]
                         if (sessionId.isNullOrBlank()) {
-                            call.respond(HttpStatusCode.BadRequest, "Missing session ID")
+                            call.respond(HttpStatusCode.BadRequest, "Invalid request format")
                             return@post
                         }
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
index 7a137db12..41b2df3e1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/FileTransferViewModel.kt
@@ -1,8 +1,5 @@
 package org.horizontal.tella.mobile.views.fragment.peertopeer.viewmodel
 
-import android.annotation.SuppressLint
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hzontal.tella_vault.VaultFile
@@ -82,7 +79,7 @@ class FileTransferViewModel @Inject constructor(
 
                 is PrepareUploadResult.Forbidden -> {
                     withContext(Dispatchers.Main) {
-                        Timber.w("Upload rejected by receiver")
+                        Timber.w("Rejected")
                         _prepareRejected.value = Event(true)
                     }
                 }

From 3d88c75646c3b601a74852dc4f21ead92516ec97 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Mon, 15 Sep 2025 17:57:59 +0100
Subject: [PATCH 139/153] Fix finger print fetcher

---
 .../data/peertopeer/FingerprintFetcher.kt     | 208 ++++++++++++++----
 1 file changed, 160 insertions(+), 48 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
index 4bb0320f2..8db0ca444 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/FingerprintFetcher.kt
@@ -10,14 +10,18 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
-import org.horizontal.tella.mobile.certificate.CertificateUtils
+import okhttp3.CertificatePinner
+import okhttp3.Dns
+import okhttp3.OkHttpClient
 import timber.log.Timber
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.net.SocketTimeoutException
+import java.security.MessageDigest
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
+import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLHandshakeException
 import javax.net.ssl.SSLSocket
@@ -26,34 +30,37 @@ import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 import kotlin.coroutines.resume
 
+/**
+ * Fingerprint payloads:
+ * - spkiHex : SHA-256(SPKI) in lowercase hex (optional, useful for logs)
+ * - okHttpPin: OkHttp SPKI pin string "sha256/<base64>" (optional, if you want SPKI pinning)
+ * - certHex : SHA-256(leaf certificate DER) in lowercase hex (matches iOS behavior)
+ */
+data class FingerprintResult(
+    val spkiHex: String,
+    val okHttpPin: String,
+    val certHex: String
+)
+
 object FingerprintFetcher {
 
-    /**
-     * Connects via TLS over (preferably) validated Wi-Fi, returns SPKI SHA-256 hex (lowercase).
-     * Produces descriptive failures (HTTP vs TLS, route, timeout).
-     */
-    suspend fun fetch(context: Context, ip: String, port: Int): Result<String> =
+    // ---------------------------------------------------------------------
+    // Public: PRE-PIN handshake to read cert (no HTTP), then compute hashes
+    // ---------------------------------------------------------------------
+    suspend fun fetch(context: Context, ip: String, port: Int): kotlin.Result<FingerprintResult> =
         withContext(Dispatchers.IO) {
             try {
-                // 0) Pick a Wi-Fi network (validated if possible)
                 val wifi = getWifiNetworkPreferringValidated(context)
-                if (wifi != null) {
-                    Timber.d("FingerprintFetcher using Wi-Fi network: $wifi")
-                } else {
-                    Timber.w("FingerprintFetcher: no Wi-Fi network bound (falling back to default route)")
-                }
 
-                // 1) Quick TCP probe – fail fast if nothing is listening
+                // 1) Quick TCP probe (fail fast if nothing listening)
                 probeTcp(ip, port, wifi)
 
-                // 2) TLS handshake to read cert
+                // 2) TLS handshake (trust-all) to read leaf cert
                 createBoundTlsSocket(ip, port, wifi).use { tls ->
                     val cert = tls.session.peerCertificates.first() as X509Certificate
-                    val fp = CertificateUtils.getPublicKeyHash(cert).lowercase()
-                    return@withContext Result.success(fp)
+                    return@withContext kotlin.Result.success(fingerprintFromCert(cert))
                 }
             } catch (e: SSLHandshakeException) {
-                // Common when the server speaks plain HTTP on this port
                 val msg = e.message.orEmpty()
                 return@withContext if (
                     msg.contains("unexpected_message", true) ||
@@ -61,33 +68,131 @@ object FingerprintFetcher {
                     msg.contains("EOF", true) ||
                     msg.contains("received fatal alert", true)
                 ) {
-                    Result.failure(IllegalStateException("Server on $port appears to be plain HTTP or wrong TLS config (plain HTTP on TLS port). ${e.message}"))
+                    kotlin.Result.failure(
+                        IllegalStateException("Server on $port appears to be plain HTTP or misconfigured TLS. ${e.message}")
+                    )
                 } else {
-                    Result.failure(e)
+                    kotlin.Result.failure(e)
                 }
             } catch (e: SocketTimeoutException) {
-                return@withContext Result.failure(RuntimeException("Connection timed out to $ip:$port", e))
+                kotlin.Result.failure(RuntimeException("Connection timed out to $ip:$port", e))
             } catch (e: IOException) {
-                return@withContext Result.failure(IOException("I/O error to $ip:$port: ${e.message}", e))
-            } catch (e: Exception) {
-                return@withContext Result.failure(e)
+                kotlin.Result.failure(IOException("I/O error to $ip:$port: ${e.message}", e))
+            } catch (e: Throwable) {
+                kotlin.Result.failure(e)
             }
         }
 
-    // ---- Internals ----
+    // ---------------------------------------------------------------------
+    // Public: Build clients that ENFORCE identity
+    //   A) By certificate DER hash (matches iOS) -> Interceptor based
+    //   B) By SPKI pin (OkHttp native) -> Optional
+    // ---------------------------------------------------------------------
+
+    fun buildClientPinnedByCertHash(
+        expectedCertSha256Hex: String,
+        hostForRequests: String,
+        network: Network? = null
+    ): OkHttpClient {
+        val trustAll: X509TrustManager = TrustAllCerts()
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf(trustAll), SecureRandom())
+        }
+
+        val builder = OkHttpClient.Builder()
+            .sslSocketFactory(sslContext.socketFactory, trustAll)
+            .hostnameVerifier { _, _ -> true } // connect by IP; identity enforced by our hash check
+            .addNetworkInterceptor(LeafCertHashInterceptor(expectedCertSha256Hex))
+            .connectTimeout(7, TimeUnit.SECONDS)
+            .readTimeout(7, TimeUnit.SECONDS)
+            .writeTimeout(7, TimeUnit.SECONDS)
+
+        if (network != null) {
+            builder.socketFactory(network.socketFactory)
+            builder.dns(Dns { hostname -> network.getAllByName(hostname).toList() })
+        }
+        return builder.build()
+    }
+
+    suspend fun buildClientPinnedByCertHash(
+        context: Context,
+        expectedCertSha256Hex: String,
+        hostForRequests: String
+    ): OkHttpClient {
+        val wifi = getWifiNetworkPreferringValidated(context)
+        return buildClientPinnedByCertHash(expectedCertSha256Hex, hostForRequests, wifi)
+    }
+
+    // Optional: SPKI pinning (OkHttp-native). Keep if you want SPKI instead of DER hash.
+    fun buildPinnedClientWithOkPin(
+        okHttpPin: String,              // must be "sha256/<base64>"
+        hostForPin: String,             // same host used in the URL (IP or DNS)
+        network: Network? = null
+    ): OkHttpClient {
+        require(okHttpPin.startsWith("sha256/")) { "Pin must start with 'sha256/'" }
+
+        val pinner = CertificatePinner.Builder()
+            .add(hostForPin, okHttpPin)
+            .build()
+
+        val trustAll: X509TrustManager = TrustAllCerts()
+        val sslContext = SSLContext.getInstance("TLS").apply {
+            init(null, arrayOf(trustAll), SecureRandom())
+        }
+
+        val builder = OkHttpClient.Builder()
+            .sslSocketFactory(sslContext.socketFactory, trustAll)
+            .hostnameVerifier { _, _ -> true } // connect by IP; identity enforced by pin
+            .certificatePinner(pinner)
+            .connectTimeout(7, TimeUnit.SECONDS)
+            .readTimeout(7, TimeUnit.SECONDS)
+            .writeTimeout(7, TimeUnit.SECONDS)
+
+        if (network != null) {
+            builder.socketFactory(network.socketFactory)
+            builder.dns(Dns { hostname -> network.getAllByName(hostname).toList() })
+        }
+        return builder.build()
+    }
+
+    suspend fun buildPinnedClientWithOkPin(
+        context: Context,
+        okHttpPin: String,
+        hostForPin: String
+    ): OkHttpClient {
+        val wifi = getWifiNetworkPreferringValidated(context)
+        return buildPinnedClientWithOkPin(okHttpPin, hostForPin, wifi)
+    }
+
+    // ---------------------------------------------------------------------
+    // Public helpers
+    // ---------------------------------------------------------------------
+
+    suspend fun pickWifiNetwork(context: Context): Network? =
+        getWifiNetworkPreferringValidated(context)
+
+    fun fingerprintFromCert(cert: X509Certificate): FingerprintResult {
+        val okHttpPin = CertificatePinner.pin(cert)           // "sha256/<base64>" of SPKI
+        val spkiHex   = sha256Hex(cert.publicKey.encoded)     // SPKI hex (optional)
+        val certHex   = sha256Hex(cert.encoded)               // ✅ CERT DER hex (matches iOS)
+        return FingerprintResult(spkiHex = spkiHex, okHttpPin = okHttpPin, certHex = certHex)
+    }
+
+    // ---------------------------------------------------------------------
+    // Internals used by fetch()
+    // ---------------------------------------------------------------------
 
     private fun createBoundTlsSocket(ip: String, port: Int, wifi: Network?): SSLSocket {
         val sslContext = SSLContext.getInstance("TLS").apply {
+            // Trust-all only to read the cert; real requests will be pinned
             init(null, arrayOf<TrustManager>(TrustAllCerts()), SecureRandom())
         }
         val factory = sslContext.socketFactory as SSLSocketFactory
 
         val s = factory.createSocket() as SSLSocket
         s.soTimeout = 7000
-        // Offer both; server chooses
         s.enabledProtocols = arrayOf("TLSv1.3", "TLSv1.2")
 
-        // Bind to selected Wi-Fi path if we have one
         try {
             wifi?.bindSocket(s)
         } catch (bindErr: Exception) {
@@ -99,18 +204,10 @@ object FingerprintFetcher {
         return s
     }
 
-    /**
-     * Short TCP probe to distinguish "port closed / no route" from TLS errors.
-     */
     private fun probeTcp(ip: String, port: Int, wifi: Network?) {
         val sock = Socket()
-        try {
-            wifi?.bindSocket(sock)
-        } catch (_: Exception) {
-        }
-        try {
-            sock.connect(InetSocketAddress(ip, port), 2500)
-        } finally {
+        try { wifi?.bindSocket(sock) } catch (_: Exception) {}
+        try { sock.connect(InetSocketAddress(ip, port), 2500) } finally {
             try { sock.close() } catch (_: Exception) {}
         }
     }
@@ -121,16 +218,12 @@ object FingerprintFetcher {
         override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
     }
 
-    /**
-     * Prefer a VALIDATED Wi-Fi network; if not delivered within ~4–5s,
-     * fallback to a connected Wi-Fi with INTERNET capability.
-     */
     @Suppress("DEPRECATION")
     private suspend fun getWifiNetworkPreferringValidated(ctx: Context): Network? =
         withContext(Dispatchers.IO) {
             val cm = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-            // Fast path: active VALIDATED Wi-Fi (API 23+)
+            // Fast path: active VALIDATED Wi-Fi
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 cm.activeNetwork?.let { n ->
                     cm.getNetworkCapabilities(n)?.let { c ->
@@ -141,7 +234,6 @@ object FingerprintFetcher {
                     }
                 }
             } else {
-                // API 21–22: pick any connected Wi-Fi with INTERNET
                 cm.allNetworks.firstOrNull { n ->
                     val info = cm.getNetworkInfo(n)
                     val caps = cm.getNetworkCapabilities(n)
@@ -151,7 +243,7 @@ object FingerprintFetcher {
                 }?.let { return@withContext it }
             }
 
-            // Try to request a validated Wi-Fi, but time-bound
+            // Request a validated Wi-Fi (time-bound)
             val request = NetworkRequest.Builder()
                 .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
                 .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
@@ -191,7 +283,7 @@ object FingerprintFetcher {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                             cm.requestNetwork(request, cb, 4_000)
                         } else {
-                            cm.requestNetwork(request, cb) // guarded by withTimeout
+                            cm.requestNetwork(request, cb)
                         }
                         cont.invokeOnCancellation { runCatching { cm.unregisterNetworkCallback(cb) } }
                     }
@@ -200,7 +292,7 @@ object FingerprintFetcher {
 
             if (validated != null) return@withContext validated
 
-            // Last resort: any connected Wi-Fi with INTERNET (even if not VALIDATED yet)
+            // Last resort: any connected Wi-Fi with INTERNET
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 cm.allNetworks.firstOrNull { n ->
                     cm.getNetworkCapabilities(n)?.let { c ->
@@ -208,9 +300,29 @@ object FingerprintFetcher {
                                 c.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                     } == true
                 }
-            } else {
-                // Already handled above for 21–22
-                null
+            } else null
+        }
+
+    private fun sha256Hex(bytes: ByteArray): String =
+        MessageDigest.getInstance("SHA-256").digest(bytes)
+            .joinToString("") { "%02x".format(it) }
+
+    // Interceptor to enforce SHA-256 over the LEAF CERTIFICATE (DER), iOS-compatible
+    private class LeafCertHashInterceptor(
+        private val expectedHexLower: String
+    ) : okhttp3.Interceptor {
+        override fun intercept(chain: okhttp3.Interceptor.Chain): okhttp3.Response {
+            val resp = chain.proceed(chain.request())
+            val cert = (resp.handshake?.peerCertificates?.firstOrNull() as? X509Certificate)
+                ?: throw javax.net.ssl.SSLPeerUnverifiedException("No peer certificate")
+            val actual = sha256Hex(cert.encoded)
+            if (!actual.equals(expectedHexLower, ignoreCase = true)) {
+                resp.close()
+                throw javax.net.ssl.SSLPeerUnverifiedException(
+                    "Certificate DER hash mismatch. expected=$expectedHexLower actual=$actual"
+                )
             }
+            return resp
         }
+    }
 }

From e551780e3ed3e38a5d442c1fa15fe515989b6bf5 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Mon, 15 Sep 2025 19:37:50 +0100
Subject: [PATCH 140/153] Fix ping isse problem

---
 .../mobile/data/peertopeer/ServerPinger.kt    | 108 +++++++++++++++---
 .../data/peertopeer/TellaPeerToPeerClient.kt  |   5 +-
 .../entity/peertopeer/DeviceMetadata.kt       |  12 --
 .../viewmodel/PeerToPeerViewModel.kt          |  74 +++++++++---
 4 files changed, 152 insertions(+), 47 deletions(-)
 delete mode 100644 mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt
index 43a8acbad..4c9c30293 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/ServerPinger.kt
@@ -1,31 +1,113 @@
 package org.horizontal.tella.mobile.data.peertopeer
 
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.Dns
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
 import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
+import javax.net.ssl.X509TrustManager
 
 object ServerPinger {
-    fun notifyServer(ip: String, port: Int) {
-        val trustAllCerts = FingerprintFetcher.TrustAllCerts()
-        val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(null, arrayOf(trustAllCerts), SecureRandom())
-
-        val client = OkHttpClient.Builder()
-            .sslSocketFactory(sslContext.socketFactory, trustAllCerts)
-            .hostnameVerifier { _, _ -> true }
+
+    suspend fun pingAndExtractFingerprint(
+        context: Context,
+        ip: String,
+        port: Int
+    ): Result<FingerprintResult> = withContext(Dispatchers.IO) {
+        try {
+            val network = FingerprintFetcher.pickWifiNetwork(context)
+
+            val trustAll: X509TrustManager = FingerprintFetcher.TrustAllCerts()
+            val sslContext = SSLContext.getInstance("TLS").apply {
+                init(null, arrayOf(trustAll), SecureRandom())
+            }
+
+            val builder = OkHttpClient.Builder()
+                .sslSocketFactory(sslContext.socketFactory, trustAll)
+                .hostnameVerifier { _, _ -> true } // connect by IP
+                .connectTimeout(7, TimeUnit.SECONDS)
+                .readTimeout(7, TimeUnit.SECONDS)
+                .writeTimeout(7, TimeUnit.SECONDS)
+
+            if (network != null) {
+                builder.socketFactory(network.socketFactory)
+                builder.dns(Dns { hostname -> network.getAllByName(hostname).toList() })
+            }
+
+            val client = builder.build()
+
+            val req = Request.Builder()
+                .url("https://$ip:$port/api/v1/ping")
+                .post(RequestBody.create(null, ByteArray(0)))
+                .build()
+
+            client.newCall(req).execute().use { resp ->
+                val cert = (resp.handshake?.peerCertificates?.firstOrNull()
+                    ?: return@withContext Result.failure(IllegalStateException("No peer certificate in handshake"))
+                        ) as X509Certificate
+
+                val fp = FingerprintFetcher.fingerprintFromCert(cert)
+                // Even if HTTP code isn’t 2xx, we already got the cert.
+                return@withContext Result.success(fp)
+            }
+        } catch (t: Throwable) {
+            Result.failure(t)
+        }
+    }
+
+    /**
+     * Pinned ping using CERT DER hash (matches iOS).
+     */
+    suspend fun notifyServerPinnedByCert(
+        context: Context,
+        ip: String,
+        port: Int,
+        expectedCertSha256Hex: String
+    ) = withContext(Dispatchers.IO) {
+        val client = FingerprintFetcher.buildClientPinnedByCertHash(
+            context = context,
+            expectedCertSha256Hex = expectedCertSha256Hex,
+            hostForRequests = ip
+        )
+
+        val req = Request.Builder()
+            .url("https://$ip:$port/api/v1/ping")
+            .post(RequestBody.create(null, ByteArray(0)))
             .build()
 
-        val request = Request.Builder()
+        client.newCall(req).execute().use { resp ->
+            if (!resp.isSuccessful) error("Ping failed: HTTP ${resp.code}")
+        }
+    }
+
+    /**
+     * Optional: pinned ping using SPKI pin (OkHttp-native).
+     */
+    suspend fun notifyServerPinnedWithOkPin(
+        context: Context,
+        ip: String,
+        port: Int,
+        okHttpPin: String
+    ) = withContext(Dispatchers.IO) {
+        val client = FingerprintFetcher.buildPinnedClientWithOkPin(
+            context = context,
+            okHttpPin = okHttpPin,
+            hostForPin = ip
+        )
+
+        val req = Request.Builder()
             .url("https://$ip:$port/api/v1/ping")
             .post(RequestBody.create(null, ByteArray(0)))
             .build()
 
-        client.newCall(request).execute().use { response ->
-            if (!response.isSuccessful) {
-                throw RuntimeException("Failed to notify server: ${response.code}")
-            }
+        client.newCall(req).execute().use { resp ->
+            if (!resp.isSuccessful) error("Ping failed: HTTP ${resp.code}")
         }
     }
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index af6d6b0a8..c31c8eafd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -387,9 +387,8 @@ class TellaPeerToPeerClient @Inject constructor(
         val url = PeerApiRoutes.buildUrl(ip, port, "/api/v1/ping", secure = true)
 
         val req = Request.Builder()
-            .url(url)
-            .get()
-            .addHeader("Connection", "close")
+            .url("https://$ip:$port/api/v1/ping")
+            .post(okhttp3.RequestBody.create(null, ByteArray(0))) // or "".toRequestBody(null)
             .build()
 
         runCatching {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt
deleted file mode 100644
index 90662f51a..000000000
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/entity/peertopeer/DeviceMetadata.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.horizontal.tella.mobile.domain.entity.peertopeer
-
-data class DeviceMetadata(
-    val deviceType: String = "mobile",
-    val version: String = "2.0",
-    val fingerprint: String,
-    val serverPort: Int = 53317,
-    val protocol: String = "https",
-    val download: Boolean = true,
-    val deviceModel: String = android.os.Build.MODEL ?: "Android",
-    val alias: String = "AndroidDevice"
-)
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 6cd072346..627dcbdb1 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.bus.SingleLiveEvent
 import org.horizontal.tella.mobile.data.peertopeer.FingerprintFetcher
+import org.horizontal.tella.mobile.data.peertopeer.FingerprintResult
 import org.horizontal.tella.mobile.data.peertopeer.ServerPinger
 import org.horizontal.tella.mobile.data.peertopeer.TellaPeerToPeerClient
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerToPeerManager
@@ -89,7 +90,7 @@ class PeerToPeerViewModel @Inject constructor(
     val closeConnection: SingleLiveEvent<Boolean> get() = _closeConnection
 
     private val savingOrDone: MutableSet<String> =
-        Collections.newSetFromMap(ConcurrentHashMap<String, Boolean>())
+        Collections.newSetFromMap(ConcurrentHashMap())
     private var totalFilesExpected = 0
     private var savedCount = 0
     private var targetFolderId: String? = null
@@ -149,8 +150,9 @@ class PeerToPeerViewModel @Inject constructor(
 
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
-            // Optional fast reachability check
-            val reachable = runCatching { peerClient.pingBeforeRegister(ip, port) }.getOrDefault(false)
+            // 1) Optional fast reachability (your existing TCP probe inside peerClient)
+            val reachable =
+                runCatching { peerClient.pingBeforeRegister(ip, port) }.getOrDefault(false)
             if (!reachable) {
                 bottomSheetError.postValue(
                     "Connection failed" to "Host not reachable on this Wi-Fi. Check IP/Port and that both devices are on the same network."
@@ -158,27 +160,58 @@ class PeerToPeerViewModel @Inject constructor(
                 return@launch
             }
 
-            // Then do the real cert fetch (still needed to get the SPKI hash)
-            FingerprintFetcher.fetch(context, ip, port.toInt())
-                .onSuccess { hash ->
-                    p2PState.hash = hash
-                    _getHashSuccess.postValue(hash)
-                    runCatching { ServerPinger.notifyServer(ip, port.toInt()) }
-                        .onFailure { Timber.e(it, "Failed to ping server after fetching hash") }
+            // 2) PRE-PIN TLS handshake (no HTTP): read leaf cert → compute hashes
+            val fpRes: Result<FingerprintResult> =
+                FingerprintFetcher.fetch(context, ip, port.toInt())
+            if (fpRes.isFailure) {
+                val e = fpRes.exceptionOrNull()
+                bottomSheetError.postValue(
+                    "Connection failed" to ("Couldn’t read peer certificate. " + (e?.message ?: ""))
+                )
+                return@launch
+            }
+
+            val fp = fpRes.getOrNull()!! 
+
+            p2PState.hash = fp.certHex
+            _getHashSuccess.postValue(fp.certHex)
+
+            // 3) Pinned ping using CERT hash (verifies no MITM and that server cert didn’t change)
+            val pinnedPingOk = runCatching {
+                ServerPinger.notifyServerPinnedByCert(
+                    context = context,
+                    ip = ip,
+                    port = port.toInt(),
+                    expectedCertSha256Hex = fp.certHex
+                )
+            }.isSuccess
+
+
+            // 4) Register (make sure peerClient internally uses the same CERT-hash pinning)
+            when (val reg = peerClient.registerPeerDevice(ip, port, fp.certHex, pin)) {
+                is RegisterPeerResult.Success -> {
+                    if (p2PState.session == null) p2PState.session =
+                        P2PSharedState.createNewSession()
+                    p2PState.session?.sessionId = reg.sessionId
+                    _registrationSuccess.postValue(true)
                 }
-                .onFailure {
+
+                RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
+                RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
+                RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")
+                RegisterPeerResult.TooManyRequests -> bottomMessageError.postValue("Too many requests, try again later")
+                RegisterPeerResult.ServerError -> bottomMessageError.postValue("Server error, try again later")
+                RegisterPeerResult.RejectedByReceiver -> bottomMessageError.postValue("Receiver rejected the registration")
+                is RegisterPeerResult.Failure -> {
+                    Timber.e(reg.exception, "Connection failure")
                     bottomSheetError.postValue(
-                        "Connection failed" to
-                                "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
+                        "Connection failed" to "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
                     )
                 }
+            }
         }
     }
 
-
-
-    // -------------------- SAVE-ON-ARRIVAL CORE --------------------
-
     private fun initCountersIfNeeded() {
         val session = p2PState.session ?: return
         if (totalFilesExpected == 0) {
@@ -222,7 +255,6 @@ class PeerToPeerViewModel @Inject constructor(
     }
 
 
-
     private fun obtainTargetFolderId(): String {
         targetFolderId?.let { return it }
         val title = (p2PState.session?.title ?: "").trim()
@@ -275,9 +307,11 @@ class PeerToPeerViewModel @Inject constructor(
                             MediaFileHandler.saveJpegPhoto(bytes, folderId).blockingGet()
                         }
                     }
+
                     isVideoFileType(pf.file.fileType) -> {
                         MediaFileHandler.saveMp4Video(f, folderId)
                     }
+
                     else -> {
                         vault.builder(f.inputStream())
                             .setName(f.name)
@@ -392,10 +426,12 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
-                    if (p2PState.session == null) p2PState.session = P2PSharedState.createNewSession()
+                    if (p2PState.session == null) p2PState.session =
+                        P2PSharedState.createNewSession()
                     p2PState.session?.sessionId = result.sessionId
                     _registrationSuccess.postValue(true)
                 }
+
                 RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
                 RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
                 RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")

From 0a950fc7417416d45c1427f2bd5c449f24a087b7 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 16 Sep 2025 21:18:48 +0100
Subject: [PATCH 141/153] Apply design changes

---
 .../layout/connect_manually_verification.xml  |  2 +-
 .../main/res/layout/fragment_tips_connect.xml | 13 +++----------
 .../layout/start_near_by_sharing_fragment.xml |  2 +-
 mobile/src/main/res/values/strings.xml        | 19 ++++++++++---------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index d056a60d7..ecc45722c 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -73,7 +73,7 @@
         app:layout_constraintBottom_toTopOf="@+id/discardBtn"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:text="@string/waiting_for_the_sender" />
+        app:text="@string/confirm_and_connect" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
         android:id="@+id/discardBtn"
diff --git a/mobile/src/main/res/layout/fragment_tips_connect.xml b/mobile/src/main/res/layout/fragment_tips_connect.xml
index 613ecab58..25d145d28 100644
--- a/mobile/src/main/res/layout/fragment_tips_connect.xml
+++ b/mobile/src/main/res/layout/fragment_tips_connect.xml
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:arrowBackIcon="@drawable/ic_arrow_back_white_24dp"
-            app:startTitle="@string/get_connected" />
+            app:startTitle="@string/tips_to_connect_title" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <!-- Content -->
@@ -44,15 +44,8 @@
                     style="@style/Tella_Main_White_Text.MeduimbBold"
                     android:textStyle="bold"
                     android:textColor="@android:color/white"
-                    android:text="@string/tips_section_setup" />
+                    android:text="@string/nearbysharing_tips_to_connect_settingup" />
 
-                <TextView
-                    android:id="@+id/section1Body"
-                    style="@style/Tella_Main_White_Text.Meduim"
-                    android:layout_marginTop="8dp"
-                    android:textColor="@color/wa_white"
-                    android:lineSpacingExtra="2dp"
-                    android:text="@string/tips_setup_intro" />
 
                 <!-- Numbered list -->
 
@@ -61,7 +54,7 @@
                     style="@style/Tella_Main_White_Text.Meduim"
                     android:layout_marginTop="6dp"
                     android:lineSpacingExtra="3dp"
-                    android:text="@string/tips_setup_list"
+                    android:text="@string/nearbysharing_tips_to_connect_settingup_expl"
                     android:textColor="@color/wa_white" />
 
                 <com.google.android.material.divider.MaterialDivider
diff --git a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
index 613ddbc65..8e0def14d 100644
--- a/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
+++ b/mobile/src/main/res/layout/start_near_by_sharing_fragment.xml
@@ -52,7 +52,7 @@
     <TextView
         android:id="@+id/shareFilesDescriptionTv"
         style="@style/Tella_Main_White_Text.Meduim"
-        android:paddingHorizontal="@dimen/activity_horizontal_margin"
+        android:paddingHorizontal="@dimen/activity_horizontal_large_margin"
         android:text="@string/share_files_description"
         android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/sendFilesBtn"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 82471a080..555728fc0 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1100,23 +1100,24 @@ Would you like to share analytics with the Tella team?</string>
 
     <string name="nearby_sharing_title">Nearby Sharing</string>
     <string name="nearby_sharing_description">Enable this feature to share files with devices near you, without an Internet connection.</string>
-    <string name="nearby_sharing_intro">Share files directly with a device near you, with or without an Internet connection.\n\nTo get started, join the same Wi-Fi network as the recipient. Nearby Sharing will work even if the Wi-Fi network is not connected to the Internet.</string>
+    <string name="nearby_sharing_intro">Share files directly with a device near you, with\nor without an Internet connection.\n\nTo get started, join the same Wi-Fi network as the recipient. Nearby Sharing will work even if the Wi-Fi network is not connected to the Internet.</string>
     <string name="tips_to_connect_wifi">Learn more about connecting to Wi-Fi for Nearby Sharing.</string>
-    <string name="tips_section_setup">Setting up</string>
-    <string name="tips_setup_intro">
-        There are 2 ways to connect your devices through Wi-Fi:
-    </string>
-    <string name="tips_setup_list">
-1. Using a Wi-Fi router, such as at home or work\n2. Setting up a Wi-Fi hotspot from a device, such as a phone, tablet, or computer\n\ta. One user creates a hotspot connection by going to \ttheir device’s settings.\n\tb. The other user connects to that hotspot.
+    <string name="nearbysharing_tips_to_connect_settingup">Setting up</string>
+    <string name="nearbysharing_tips_to_connect_settingup_expl">
+    There are 2 ways to connect your devices \nthrough Wi-Fi:\n
+    1. Using a Wi-Fi router, such as at home \n\t or work\n
+    2. Setting up a Wi-Fi hotspot from a device,\n\t such as a phone, tablet, or computer\n
+       \t\ta. One user creates a hotspot connection\n\t\t by going to their device’s settings.\n
+       \t\tb. The other user connects to that hotspot.
 </string>
 
     <string name="tips_section_join">Joining the same network</string>
     <string name="tips_join_body">
-        Once the Wi-Fi network is set up, go to your devices’ settings and verify that you are both on the same Wi-Fi network.
+        Once the Wi-Fi network is set up, go to your\ndevices’ settings and verify that you are both \non the same Wi-Fi network.
     </string>
 
     <string name="tips_section_more">More tips</string>
-    <string name="tips_more_bullets">• The Wi-Fi network does not need to have internet access. As long as the Wi-Fi router or hotspot is powered on and functioning, it can be used for Nearby Sharing even without being online
+    <string name="tips_more_bullets">• The Wi-Fi network does not need to have\n \t internet access. As long as the Wi-Fi router\n \t or hotspot is powered on and functioning,\n \t it can be used for Nearby Sharing even\n \t without being online\n
 • Make sure to disable any active VPN connections.</string>
     <string name="error_file_not_found">The file you are trying to import is no longer available. Please try again.</string>
 </resources>

From 1467771f5fa6b9bdd699d31100df8c1987a346e3 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Tue, 16 Sep 2025 21:40:35 +0100
Subject: [PATCH 142/153] WIP WAITING/ACCEPT validation

---
 .../receipentflow/WaitingReceiverFragment.kt  |  29 +-
 .../viewmodel/PeerToPeerViewModel.kt          | 293 ++++++++++--------
 2 files changed, 188 insertions(+), 134 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
index 3a234cbc0..72c4a860f 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/WaitingReceiverFragment.kt
@@ -3,8 +3,11 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.databinding.FragmentWaitingBinding
 import org.horizontal.tella.mobile.views.base_ui.BaseBindingFragment
@@ -20,6 +23,7 @@ class WaitingReceiverFragment :
     BaseBindingFragment<FragmentWaitingBinding>(FragmentWaitingBinding::inflate) {
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
+    private var navigated = false
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setupToolbar()
@@ -34,20 +38,25 @@ class WaitingReceiverFragment :
                 navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
             }
         }
-
         binding.waitingText.text = getString(R.string.waiting_for_the_sender_to_share_files)
     }
 
     private fun observeIncomingPrepareRequest() {
-        viewModel.incomingPrepareRequest.observe(viewLifecycleOwner) { request ->
-            if (request != null && !viewModel.hasNavigatedToSuccessFragment) {
-                viewModel.hasNavigatedToSuccessFragment = true
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(androidx.lifecycle.Lifecycle.State.RESUMED) {
+                viewModel.incomingPrepareRequest.collect { request ->
+                    if (!navigated &&
+                        isAdded &&
+                        findNavController().currentDestination?.id == R.id.waitingReceiverFragment
+                    ) {
+                        navigated = true
 
-                val fileCount = request.files.size
-                bundle.putInt("fileCount", fileCount)
-                bundle.putString("sessionId", request.sessionId)
+                        bundle.putInt("fileCount", request.files.size)
+                        bundle.putString("sessionId", request.sessionId)
 
-                navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
+                        navManager().navigateFromWaitingReceiverFragmentToRecipientSuccessFragment()
+                    }
+                }
             }
         }
     }
@@ -67,8 +76,4 @@ class WaitingReceiverFragment :
             }
     }
 
-    override fun onStop() {
-        super.onStop()
-        viewModel.clearPrepareRequest()
-    }
 }
\ No newline at end of file
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
index 627dcbdb1..c4da1bfb4 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/viewmodel/PeerToPeerViewModel.kt
@@ -13,8 +13,11 @@ import com.hzontal.utils.MediaFile.isVideoFileType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.MyApplication
 import org.horizontal.tella.mobile.bus.SingleLiveEvent
@@ -52,27 +55,31 @@ class PeerToPeerViewModel @Inject constructor(
     val p2PState: P2PSharedState
 ) : ViewModel() {
 
+    // ------------------- Public state / deps -------------------
     var peerToPeerParticipant: PeerToPeerParticipant = PeerToPeerParticipant.SENDER
     var isManualConnection: Boolean = true
     var hasNavigatedToSuccessFragment = false
     var currentNetworkInfo: NetworkInfo? = null
 
+    val clientHash = peerToPeerManager.clientConnected
+    private val networkInfoManager = NetworkInfoManager(context)
+    val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
+
+    // ------------------- Events to the UI -------------------
     private val _registrationSuccess = SingleLiveEvent<Boolean>()
     val registrationSuccess: SingleLiveEvent<Boolean> get() = _registrationSuccess
 
+    private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
+    val registrationServerSuccess: SingleLiveEvent<Boolean> get() = _registrationServerSuccess
+
     private val _getHashSuccess = SingleLiveEvent<String>()
     val getHashSuccess: SingleLiveEvent<String> get() = _getHashSuccess
 
     val bottomMessageError = SingleLiveEvent<String>()
     val bottomSheetError = SingleLiveEvent<Pair<String, String>>()
 
-    val clientHash = peerToPeerManager.clientConnected
-
-    private val _registrationServerSuccess = SingleLiveEvent<Boolean>()
-    val registrationServerSuccess: SingleLiveEvent<Boolean> get() = _registrationServerSuccess
-
-    private val _incomingPrepareRequest = SingleLiveEvent<PrepareUploadRequest?>()
-    val incomingPrepareRequest: SingleLiveEvent<PrepareUploadRequest?> get() = _incomingPrepareRequest
+    private val _incomingPrepareRequest = MutableSharedFlow<PrepareUploadRequest>(replay = 1, extraBufferCapacity = 1)
+    val incomingPrepareRequest: SharedFlow<PrepareUploadRequest> = _incomingPrepareRequest.asSharedFlow()
 
     private val _incomingRequest = MutableStateFlow<IncomingRegistration?>(null)
     val incomingRequest: StateFlow<IncomingRegistration?> get() = _incomingRequest
@@ -80,22 +87,39 @@ class PeerToPeerViewModel @Inject constructor(
     private val _uploadProgress = SingleLiveEvent<UploadProgressState?>()
     val uploadProgress: SingleLiveEvent<UploadProgressState?> get() = _uploadProgress
 
-    private val networkInfoManager = NetworkInfoManager(context)
-    val networkInfo: LiveData<NetworkInfo> get() = networkInfoManager.networkInfo
-
     private val _bottomSheetProgress = MutableLiveData<BottomSheetProgressState>()
     val bottomSheetProgress: LiveData<BottomSheetProgressState> get() = _bottomSheetProgress
 
     private val _closeConnection = SingleLiveEvent<Boolean>()
     val closeConnection: SingleLiveEvent<Boolean> get() = _closeConnection
 
+    // ------------------- Manual verify UI flags -------------------
+    private val _canTapConfirm = MutableLiveData(false)
+    val canTapConfirm: LiveData<Boolean> get() = _canTapConfirm
+
+    private val _waitingForOtherSide = MutableLiveData(false)
+    val waitingForOtherSide: LiveData<Boolean> get() = _waitingForOtherSide
+
+    // Cache for "pre-accept" when recipient taps before the request arrives
+    private var preConfirmRegistration: Boolean = false
+
+    // Keep connection params until user taps Confirm (sender path)
+    private data class PendingConnectParams(
+        val ip: String,
+        val port: String,
+        val hash: String,
+        val pin: String
+    )
+    private var pendingParams: PendingConnectParams? = null
+
+    // ------------------- Save counters -------------------
     private val savingOrDone: MutableSet<String> =
         Collections.newSetFromMap(ConcurrentHashMap())
     private var totalFilesExpected = 0
     private var savedCount = 0
     private var targetFolderId: String? = null
-    // -------------------------------------------
 
+    // ------------------- Init: subscribe to streams -------------------
     init {
         observePrepareUploadEvents()
         observeRegistrationEvents()
@@ -104,12 +128,11 @@ class PeerToPeerViewModel @Inject constructor(
         observeCloseConnectionEvents()
     }
 
+    // ------------------- Observers -------------------
     private fun observePrepareUploadEvents() {
         viewModelScope.launch {
-            PeerEventManager.prepareUploadEvents.collect {
-                PeerEventManager.getPendingPrepareUploadRequest()?.let { request ->
-                    _incomingPrepareRequest.postValue(request)
-                }
+            PeerEventManager.prepareUploadRequests.collect { request ->
+                _incomingPrepareRequest.tryEmit(request)   // your _incomingPrepareRequest already has replay = 1
             }
         }
     }
@@ -118,6 +141,10 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             PeerEventManager.registrationEvents.collect { success ->
                 _registrationServerSuccess.postValue(success)
+                if (success) {
+                    _waitingForOtherSide.postValue(false)
+                    _canTapConfirm.postValue(false) // will navigate away
+                }
             }
         }
     }
@@ -126,7 +153,6 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             PeerEventManager.closeConnectionEvent.collect { success ->
                 if (success) {
-                    // Set CLOSED now; final emission will happen when all files are saved/failed
                     p2PState.session?.status = SessionStatus.CLOSED
                     emitFinalIfReady(SessionStatus.CLOSED)
                 }
@@ -138,21 +164,61 @@ class PeerToPeerViewModel @Inject constructor(
         viewModelScope.launch {
             PeerEventManager.registrationRequests.collect { (registrationId, payload) ->
                 if (registrationId.isEmpty()) return@collect
+
                 _incomingRequest.value = IncomingRegistration(registrationId, payload)
+
                 if (!p2PState.isUsingManualConnection) {
+                    // Auto mode: accept immediately
                     PeerEventManager.confirmRegistration(registrationId, true)
                     _registrationSuccess.postValue(true)
                     PeerEventManager.clearRegistrationRequest()
+                    return@collect
+                }
+
+                // Manual mode: if the recipient tapped confirm earlier, accept now.
+                if (preConfirmRegistration) {
+                    PeerEventManager.confirmRegistration(registrationId, true)
+                    PeerEventManager.clearRegistrationRequest()
+                    preConfirmRegistration = false
+                } else {
+                    // Otherwise, allow tapping now (if UI wants to reflect it)
+                    _canTapConfirm.postValue(true)
+                }
+            }
+        }
+    }
+
+    private fun observeUploadProgress() {
+        viewModelScope.launch {
+            PeerEventManager.uploadProgressStateFlow.collect { state ->
+                initCountersIfNeeded()
+                _uploadProgress.postValue(state)
+
+                // Save each FINISHED file exactly once (by transmissionId)
+                state.files.forEach { pf ->
+                    val txId = pf.transmissionId
+                    if (txId != null &&
+                        pf.status == P2PFileStatus.FINISHED &&
+                        !savingOrDone.contains(txId)
+                    ) {
+                        viewModelScope.launch(Dispatchers.IO) { saveOneFile(pf) }
+                    }
                 }
+
+                emitFinalIfReady(state.sessionStatus)
             }
         }
     }
 
+    // ------------------- Manual verification entry points -------------------
+
+    /**
+     * Called after IP/port/PIN are entered and TLS cert is fetched.
+     * In manual mode we DO NOT auto-register. We enable the "Confirm & connect" button instead.
+     */
     fun handleCertificate(ip: String, port: String, pin: String) {
         viewModelScope.launch {
-            // 1) Optional fast reachability (your existing TCP probe inside peerClient)
-            val reachable =
-                runCatching { peerClient.pingBeforeRegister(ip, port) }.getOrDefault(false)
+            val reachable = runCatching { peerClient.pingBeforeRegister(ip, port) }.getOrDefault(false)
             if (!reachable) {
                 bottomSheetError.postValue(
                     "Connection failed" to "Host not reachable on this Wi-Fi. Check IP/Port and that both devices are on the same network."
@@ -160,23 +226,18 @@ class PeerToPeerViewModel @Inject constructor(
                 return@launch
             }
 
-            // 2) PRE-PIN TLS handshake (no HTTP): read leaf cert → compute hashes
-            val fpRes: Result<FingerprintResult> =
-                FingerprintFetcher.fetch(context, ip, port.toInt())
+            val fpRes: Result<FingerprintResult> = FingerprintFetcher.fetch(context, ip, port.toInt())
             if (fpRes.isFailure) {
-                val e = fpRes.exceptionOrNull()
                 bottomSheetError.postValue(
-                    "Connection failed" to ("Couldn’t read peer certificate. " + (e?.message ?: ""))
+                    "Connection failed" to ("Couldn’t read peer certificate. " + (fpRes.exceptionOrNull()?.message ?: ""))
                 )
                 return@launch
             }
 
-            val fp = fpRes.getOrNull()!! 
-
+            val fp = fpRes.getOrNull()!!
             p2PState.hash = fp.certHex
             _getHashSuccess.postValue(fp.certHex)
 
-            // 3) Pinned ping using CERT hash (verifies no MITM and that server cert didn’t change)
             val pinnedPingOk = runCatching {
                 ServerPinger.notifyServerPinnedByCert(
                     context = context,
@@ -186,16 +247,85 @@ class PeerToPeerViewModel @Inject constructor(
                 )
             }.isSuccess
 
+            // Manual verification path: wait for user tap
+            p2PState.isUsingManualConnection = true
+            pendingParams = PendingConnectParams(ip, port, fp.certHex, pin)
+            _canTapConfirm.postValue(true)
+            _waitingForOtherSide.postValue(false)
+        }
+    }
+
+    /** Sender tapped confirm: actually initiate /register on peer (using cached params). */
+    // In PeerToPeerViewModel
+    fun onUserTappedConfirmAndConnect() {
+        _canTapConfirm.postValue(false)
+        _waitingForOtherSide.postValue(true)
+
+        val params = pendingParams
+        if (params != null) {
+            startRegistration(params.ip, params.port, params.hash, params.pin)
+            return
+        }
 
-            // 4) Register (make sure peerClient internally uses the same CERT-hash pinning)
-            when (val reg = peerClient.registerPeerDevice(ip, port, fp.certHex, pin)) {
+        // Fallback: try using current state or re-run handshake
+        val ip = p2PState.ip
+        val port = p2PState.port
+        val pin = p2PState.pin.orEmpty()
+        val hash = p2PState.hash
+
+        if (hash.isNotBlank()) {
+            startRegistration(ip, port, hash, pin)
+        } else {
+            viewModelScope.launch {
+                handleCertificate(ip, port, pin)
+                pendingParams?.let { startRegistration(it.ip, it.port, it.hash, it.pin) }
+                    ?: run {
+                        _waitingForOtherSide.postValue(false)
+                        _canTapConfirm.postValue(true)
+                    }
+            }
+        }
+    }
+
+
+
+    /** Recipient tapped confirm: allow pre-accept before request arrives. */
+    fun onRecipientConfirmTapped() {
+        _canTapConfirm.postValue(false)
+        _waitingForOtherSide.postValue(true) // "Waiting for the sender…"
+
+        val current = _incomingRequest.value
+        if (current != null) {
+            onUserConfirmedRegistration(current.registrationId)
+        } else {
+            preConfirmRegistration = true
+        }
+    }
+
+    /** Recipient send acceptance to server. Do NOT post local registrationSuccess here. */
+    fun onUserConfirmedRegistration(registrationId: String) {
+        viewModelScope.launch {
+            PeerEventManager.confirmRegistration(registrationId, true)
+            PeerEventManager.clearRegistrationRequest()
+        }
+    }
+
+    fun onUserRejectedRegistration(registrationId: String) {
+        viewModelScope.launch {
+            PeerEventManager.confirmRegistration(registrationId, false)
+            PeerEventManager.clearRegistrationRequest()
+        }
+    }
+
+    /** Sender/initiator path: call server /register */
+    fun startRegistration(ip: String, port: String, hash: String, pin: String) {
+        viewModelScope.launch {
+            when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
                 is RegisterPeerResult.Success -> {
-                    if (p2PState.session == null) p2PState.session =
-                        P2PSharedState.createNewSession()
-                    p2PState.session?.sessionId = reg.sessionId
-                    _registrationSuccess.postValue(true)
+                    if (p2PState.session == null) p2PState.session = P2PSharedState.createNewSession()
+                    p2PState.session?.sessionId = result.sessionId
+                    _registrationSuccess.postValue(true) // Used by sender UI
                 }
-
                 RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
                 RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
                 RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")
@@ -203,7 +333,7 @@ class PeerToPeerViewModel @Inject constructor(
                 RegisterPeerResult.ServerError -> bottomMessageError.postValue("Server error, try again later")
                 RegisterPeerResult.RejectedByReceiver -> bottomMessageError.postValue("Receiver rejected the registration")
                 is RegisterPeerResult.Failure -> {
-                    Timber.e(reg.exception, "Connection failure")
+                    Timber.e(result.exception, "Connection failure")
                     bottomSheetError.postValue(
                         "Connection failed" to "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
                     )
@@ -212,17 +342,16 @@ class PeerToPeerViewModel @Inject constructor(
         }
     }
 
+    // ------------------- Prepare/Upload/Save logic (unchanged from your version) -------------------
+
     private fun initCountersIfNeeded() {
         val session = p2PState.session ?: return
         if (totalFilesExpected == 0) {
             totalFilesExpected = session.files.size
             savedCount = session.files.values.count { it.status == P2PFileStatus.SAVED }
-            // Mark already terminal as “done” to avoid reprocessing
             session.files.values.forEach { pf ->
                 val tx = pf.transmissionId
-                if (!tx.isNullOrBlank() &&
-                    (pf.status == P2PFileStatus.SAVED || pf.status == P2PFileStatus.FAILED)
-                ) {
+                if (!tx.isNullOrBlank() && (pf.status == P2PFileStatus.SAVED || pf.status == P2PFileStatus.FAILED)) {
                     savingOrDone.add(tx)
                 }
             }
@@ -237,7 +366,6 @@ class PeerToPeerViewModel @Inject constructor(
         val final = when (session.status) {
             SessionStatus.CLOSED -> SessionStatus.CLOSED
             SessionStatus.SENDING, SessionStatus.SAVING -> computeFinalStatus()
-            // If server already marked FINISHED/FINISHED_WITH_ERRORS we keep it
             SessionStatus.FINISHED, SessionStatus.FINISHED_WITH_ERRORS -> session.status
             else -> computeFinalStatus()
         }
@@ -247,14 +375,13 @@ class PeerToPeerViewModel @Inject constructor(
         _uploadProgress.postValue(
             UploadProgressState(
                 title = session.title.orEmpty(),
-                sessionStatus = final,     // <-- TERMINAL
+                sessionStatus = final,
                 files = session.files.values.toList(),
                 percent = 100
             )
         )
     }
 
-
     private fun obtainTargetFolderId(): String {
         targetFolderId?.let { return it }
         val title = (p2PState.session?.title ?: "").trim()
@@ -273,10 +400,8 @@ class PeerToPeerViewModel @Inject constructor(
 
     private fun saveOneFile(pf: ProgressFile) {
         val txId = pf.transmissionId ?: return
-        // Guard to avoid duplicate saves
         if (!savingOrDone.add(txId)) return
 
-        // First save → switch session to SAVING (so UI doesn’t navigate early)
         if (p2PState.session?.status == SessionStatus.SENDING) {
             p2PState.session?.status = SessionStatus.SAVING
             _uploadProgress.postValue(
@@ -284,7 +409,7 @@ class PeerToPeerViewModel @Inject constructor(
                     title = p2PState.session?.title.orEmpty(),
                     sessionStatus = SessionStatus.SAVING,
                     files = p2PState.session?.files?.values?.toList().orEmpty(),
-                    percent = 100 // transport might have reached 100; keep UI bar full while saving
+                    percent = 100
                 )
             )
         }
@@ -307,11 +432,9 @@ class PeerToPeerViewModel @Inject constructor(
                             MediaFileHandler.saveJpegPhoto(bytes, folderId).blockingGet()
                         }
                     }
-
                     isVideoFileType(pf.file.fileType) -> {
                         MediaFileHandler.saveMp4Video(f, folderId)
                     }
-
                     else -> {
                         vault.builder(f.inputStream())
                             .setName(f.name)
@@ -326,8 +449,6 @@ class PeerToPeerViewModel @Inject constructor(
                 null
             }
 
-            // Mark SAVED only after DB write succeeds
-            // NOTE: use transmissionId key; ensure your session map is keyed accordingly.
             val txKey = pf.transmissionId
             if (txKey != null) {
                 p2PState.session?.files?.get(txKey)?.status = P2PFileStatus.SAVED
@@ -339,7 +460,6 @@ class PeerToPeerViewModel @Inject constructor(
         } catch (e: Exception) {
             Timber.e(e, "Saving to vault failed for file ${pf.file.fileName}")
             pf.status = P2PFileStatus.FAILED
-            // do not increment savedCount on failure
         } finally {
             postBottomSheetProgress()
             maybeFinalizeAfterSave()
@@ -374,10 +494,6 @@ class PeerToPeerViewModel @Inject constructor(
 
     private fun emitFinalIfReady(triggerStatus: SessionStatus) {
         val session = p2PState.session ?: return
-
-        // Only finish when:
-        // - session is terminal (by sender or by logic), AND
-        // - all files are saved/failed locally
         if (!sessionIsTerminal(triggerStatus)) return
         if (!allFilesSavedOrFailed()) return
 
@@ -397,79 +513,12 @@ class PeerToPeerViewModel @Inject constructor(
         )
     }
 
-    private fun observeUploadProgress() {
-        viewModelScope.launch {
-            PeerEventManager.uploadProgressStateFlow.collect { state ->
-                initCountersIfNeeded()
-
-                // Forward raw transport progress (SENDING) from the server
-                _uploadProgress.postValue(state)
-
-                // Save each FINISHED file exactly once (by transmissionId)
-                state.files.forEach { pf ->
-                    val txId = pf.transmissionId
-                    if (txId != null &&
-                        pf.status == P2PFileStatus.FINISHED &&
-                        !savingOrDone.contains(txId)
-                    ) {
-                        viewModelScope.launch(Dispatchers.IO) { saveOneFile(pf) }
-                    }
-                }
-
-                // If the sender is done/cancelled, finalize when all files are saved/failed
-                emitFinalIfReady(state.sessionStatus)
-            }
-        }
-    }
-
-    fun startRegistration(ip: String, port: String, hash: String, pin: String) {
-        viewModelScope.launch {
-            when (val result = peerClient.registerPeerDevice(ip, port, hash, pin)) {
-                is RegisterPeerResult.Success -> {
-                    if (p2PState.session == null) p2PState.session =
-                        P2PSharedState.createNewSession()
-                    p2PState.session?.sessionId = result.sessionId
-                    _registrationSuccess.postValue(true)
-                }
-
-                RegisterPeerResult.InvalidPin -> bottomMessageError.postValue("Invalid PIN")
-                RegisterPeerResult.InvalidFormat -> bottomMessageError.postValue("Invalid request format")
-                RegisterPeerResult.Conflict -> bottomMessageError.postValue("Active session already exists")
-                RegisterPeerResult.TooManyRequests -> bottomMessageError.postValue("Too many requests, try again later")
-                RegisterPeerResult.ServerError -> bottomMessageError.postValue("Server error, try again later")
-                RegisterPeerResult.RejectedByReceiver -> bottomMessageError.postValue("Receiver rejected the registration")
-                is RegisterPeerResult.Failure -> {
-                    Timber.e(result.exception, "Connection failure")
-                    bottomSheetError.postValue(
-                        "Connection failed" to
-                                "Please make sure your connection details are correct and that you are on the same Wi-Fi network."
-                    )
-                }
-            }
-        }
-    }
-
-    fun onUserConfirmedRegistration(registrationId: String) {
-        viewModelScope.launch {
-            PeerEventManager.confirmRegistration(registrationId, true)
-            _registrationSuccess.postValue(true)
-            PeerEventManager.clearRegistrationRequest()
-        }
-    }
-
-    fun onUserRejectedRegistration(registrationId: String) {
-        viewModelScope.launch {
-            PeerEventManager.confirmRegistration(registrationId, false)
-            PeerEventManager.clearRegistrationRequest()
-        }
-    }
-
+    // ------------------- Misc -------------------
     fun confirmPrepareUpload(sessionId: String, accepted: Boolean) {
         PeerEventManager.resolveUserDecision(sessionId, accepted)
     }
 
     fun clearPrepareRequest() {
-        _incomingPrepareRequest.value = null
         hasNavigatedToSuccessFragment = false
     }
 

From ab099252389bc3b3c131570e7937271823b254a3 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Wed, 17 Sep 2025 10:49:31 +0100
Subject: [PATCH 143/153] Fix

---
 .../domain/peertopeer/PeerEventManager.kt     | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index caf92a6b8..6595a15c2 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -32,12 +32,11 @@ object PeerEventManager {
     )
     val registrationRequests = _registrationRequests.asSharedFlow()
 
-    // Optional: refactor this one later too
-    private val _prepareUploadEvents = MutableSharedFlow<Unit>(
-        replay = 0,
-        extraBufferCapacity = 1
-    )
-    val prepareUploadEvents = _prepareUploadEvents.asSharedFlow()
+
+    private val _prepareUploadRequests =
+        MutableSharedFlow<PrepareUploadRequest>(replay = 1, extraBufferCapacity = 1)
+    val prepareUploadRequests = _prepareUploadRequests.asSharedFlow()
+
 
     private var pendingPrepareUploadRequest: PrepareUploadRequest? = null
 
@@ -61,20 +60,13 @@ object PeerEventManager {
         closeConnectionEvent.emit(true)
     }
 
-    // Trigger upload preparation request, storing the data separately
     suspend fun emitPrepareUploadRequest(request: PrepareUploadRequest): Boolean {
         val deferred = CompletableDeferred<Boolean>()
         decisionMap[request.sessionId] = deferred
-        pendingPrepareUploadRequest = request
-        _prepareUploadEvents.emit(Unit)
-        return deferred.await()
+        _prepareUploadRequests.emit(request)  // emit actual payload; late subscribers will receive it
+        return deferred.await()               // await user decision on recipient
     }
 
-    fun getPendingPrepareUploadRequest(): PrepareUploadRequest? {
-        return pendingPrepareUploadRequest.also {
-            pendingPrepareUploadRequest = null // Clear once accessed
-        }
-    }
 
     fun resolveUserDecision(sessionId: String, accepted: Boolean) {
         decisionMap.remove(sessionId)?.complete(accepted)

From b28efc12014c1990a4bd266d5031ca53139669f8 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 17 Sep 2025 11:25:18 +0100
Subject: [PATCH 144/153] Fix server/receipient flow

---
 .../RecipientVerificationFragment.kt          | 62 +++++++++++--------
 .../senderflow/SenderVerificationFragment.kt  | 42 ++++++++-----
 2 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index c65daeeb2..4511557db 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -3,12 +3,8 @@ package org.horizontal.tella.mobile.views.fragment.peertopeer.receipentflow
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import org.horizontal.tella.mobile.R
 import org.horizontal.tella.mobile.data.peertopeer.managers.PeerServerStarterManager
 import org.horizontal.tella.mobile.databinding.ConnectManuallyVerificationBinding
@@ -24,6 +20,7 @@ class RecipientVerificationFragment :
 
     private val viewModel: PeerToPeerViewModel by activityViewModels()
     private var payload: PeerConnectionPayload? = null
+
     @Inject
     lateinit var peerServerStarterManager: PeerServerStarterManager
 
@@ -34,47 +31,60 @@ class RecipientVerificationFragment :
             payload = Gson().fromJson(payloadJson, PeerConnectionPayload::class.java)
         }
 
+        initUI()
         initListeners()
         initObservers()
     }
 
+    private fun initUI() = with(binding) {
+        // Simpler instruction text (update your string as needed)
+        warningTextView.text = getString(R.string.hash_receipient_description)
+        hashContentTextView.text = viewModel.p2PState.hash.formatHash()
+
+        // IMPORTANT: button is enabled immediately
+        confirmAndConnectBtn.isEnabled = true
+        confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
+    }
+
     private fun initListeners() = with(binding) {
         toolbar.backClickListener = { navigateBackAndStopServer() }
         discardBtn.setOnClickListener { navigateBackAndStopServer() }
 
-        confirmAndConnectBtn.setOnClickListener(null)
+        // Tap immediately — even if no incoming request yet
+        confirmAndConnectBtn.setOnClickListener {
+            confirmAndConnectBtn.isEnabled = false
+            confirmAndConnectBtn.setText(getString(R.string.waiting_for_the_sender))
+            viewModel.onRecipientConfirmTapped()
+        }
     }
 
     private fun initObservers() = with(binding) {
-        hashContentTextView.text = viewModel.p2PState.hash.formatHash()
+        // Manual mode so we don't auto-accept
         viewModel.p2PState.isUsingManualConnection = true
 
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                viewModel.incomingRequest.collect { request ->
-                    if (request != null) {
-                        confirmAndConnectBtn.isEnabled = true
-                        confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
-                        confirmAndConnectBtn.setOnClickListener {
-                            viewModel.onUserConfirmedRegistration(request.registrationId)
-                        }
-                    } else {
-                        confirmAndConnectBtn.isEnabled = false
-                        confirmAndConnectBtn.setOnClickListener(null)
-                    }
-                }
-            }
-        }
 
-        viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
+        // Navigate ONLY after server confirms (both sides done)
+        viewModel.registrationServerSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
                 navManager().navigateFromRecipientVerificationScreenToWaitingReceiverFragment()
             }
         }
 
         viewModel.closeConnection.observe(viewLifecycleOwner) { closeConnection ->
-            if (closeConnection) {
-                navigateBackAndStopServer()
+            if (closeConnection) navigateBackAndStopServer()
+        }
+
+        // Optional: reflect VM UI flags if you want the button text/state to be VM-driven
+        viewModel.waitingForOtherSide.observe(viewLifecycleOwner) { waiting ->
+            if (waiting) {
+                confirmAndConnectBtn.isEnabled = false
+                confirmAndConnectBtn.setText(getString(R.string.waiting_for_the_sender))
+            }
+        }
+        viewModel.canTapConfirm.observe(viewLifecycleOwner) { canTap ->
+            if (canTap) {
+                confirmAndConnectBtn.isEnabled = true
+                confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
             }
         }
     }
@@ -83,4 +93,6 @@ class RecipientVerificationFragment :
         peerServerStarterManager.stopServer()
         navManager().navigateBackToStartNearBySharingFragmentAndClearBackStack()
     }
+
+
 }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 142745212..14c6aa666 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -34,20 +34,15 @@ class SenderVerificationFragment :
     private fun initView() {
         binding.warningTextView.text = getString(R.string.hash_sender_description)
         binding.confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
+        binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
     }
 
     private fun initListeners() {
-
-        binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
-
         binding.confirmAndConnectBtn.setOnClickListener {
+            // Disable & show waiting immediately
+            binding.confirmAndConnectBtn.isEnabled = false
             binding.confirmAndConnectBtn.setText(getString(R.string.waiting_for_the_recipient))
-            viewModel.startRegistration(
-                ip = viewModel.p2PState.ip,
-                port = viewModel.p2PState.port,
-                hash = viewModel.p2PState.hash,
-                pin = viewModel.p2PState.pin.toString()
-            )
+            viewModel.onUserTappedConfirmAndConnect()
         }
 
         binding.discardBtn.setOnClickListener {
@@ -56,14 +51,30 @@ class SenderVerificationFragment :
     }
 
     private fun initObservers() {
+        // Manual mode
         viewModel.isManualConnection = true
+
+        // Button enable/disable from VM
+        viewModel.canTapConfirm.observe(viewLifecycleOwner) { canTap ->
+            binding.confirmAndConnectBtn.isEnabled = canTap
+            if (canTap) {
+                binding.confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
+            }
+        }
+        viewModel.waitingForOtherSide.observe(viewLifecycleOwner) { waiting ->
+            if (waiting) {
+                binding.confirmAndConnectBtn.isEnabled = false
+                binding.confirmAndConnectBtn.setText(getString(R.string.waiting_for_the_recipient))
+            }
+        }
+
         viewModel.registrationSuccess.observe(viewLifecycleOwner) { success ->
             if (success) {
-                findNavController().currentBackStackEntry?.savedStateHandle
-                    ?.set("registrationSuccess", true)
+                findNavController().currentBackStackEntry?.savedStateHandle?.set("registrationSuccess", true)
                 navManager().navigateConnectManuallyVerificationFragmentToprepareUploadFragment()
             }
         }
+
         viewModel.bottomMessageError.observe(viewLifecycleOwner) { message ->
             DialogUtils.showBottomMessage(baseActivity, message, true)
         }
@@ -77,12 +88,9 @@ class SenderVerificationFragment :
                 getString(R.string.try_again),
                 null
             ) {
-                viewModel.startRegistration(
-                    ip = viewModel.p2PState.ip,
-                    port = viewModel.p2PState.port,
-                    hash = viewModel.p2PState.hash,
-                    pin = viewModel.p2PState.pin.toString()
-                )
+                // Allow retry: re-enable confirm
+                binding.confirmAndConnectBtn.isEnabled = true
+                binding.confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
             }
         }
     }

From 3ab1050470f9616474e0c162c86bb4ce1ed8b175 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Wed, 17 Sep 2025 15:49:42 +0100
Subject: [PATCH 145/153] Release 3.0.0 "211"

---
 mobile/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 99ad9a437..6fb9b4013 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 205
+        versionCode 211
         versionName "3.0.0"
         multiDexEnabled true
 
@@ -30,7 +30,7 @@ android {
         String dropboxKey = localProperties['DROPBOX_APP_KEY']
         if (dropboxKey == null) {
             logger.warn("No value provided for DROPBOX_APP_KEY.  Specify a value in a examples/android/local.properties file. You can register for one at https://developers.dropbox.com/")
-            dropboxKey = ""
+            dropboxKey = "2j6ouobejsb3n82"
         }
         buildConfigField "String", "DROPBOX_APP_KEY", "\"${dropboxKey}\""
         manifestPlaceholders = [dropboxKey: dropboxKey]
@@ -55,12 +55,12 @@ android {
     buildTypes {
         debug {
             debuggable true
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             debuggable false
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

From 2870d08facedf2ba1bbe18474c4565255a15d414 Mon Sep 17 00:00:00 2001
From: Ahlem <ahlem.jarrar@hotmail.com>
Date: Thu, 18 Sep 2025 14:47:45 +0100
Subject: [PATCH 146/153] Revert "Release 3.0.0 "211""

This reverts commit 3ab1050470f9616474e0c162c86bb4ce1ed8b175.
---
 mobile/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 6fb9b4013..99ad9a437 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 211
+        versionCode 205
         versionName "3.0.0"
         multiDexEnabled true
 
@@ -30,7 +30,7 @@ android {
         String dropboxKey = localProperties['DROPBOX_APP_KEY']
         if (dropboxKey == null) {
             logger.warn("No value provided for DROPBOX_APP_KEY.  Specify a value in a examples/android/local.properties file. You can register for one at https://developers.dropbox.com/")
-            dropboxKey = "2j6ouobejsb3n82"
+            dropboxKey = ""
         }
         buildConfigField "String", "DROPBOX_APP_KEY", "\"${dropboxKey}\""
         manifestPlaceholders = [dropboxKey: dropboxKey]
@@ -55,12 +55,12 @@ android {
     buildTypes {
         debug {
             debuggable true
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             debuggable false
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

From 0263f01de8370eb9d68f8173efc50af959124286 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 18 Sep 2025 16:05:14 +0100
Subject: [PATCH 147/153] fix upload problem related to duplicated
 files/folders

---
 .../tella/mobile/domain/peertopeer/PeerEventManager.kt |  5 +----
 .../peertopeer/senderflow/SenderUploadFilesFragment.kt |  1 -
 .../main/java/com/hzontal/tella_vault/BaseVault.java   | 10 ++++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
index 6595a15c2..a93549c11 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/PeerEventManager.kt
@@ -34,12 +34,9 @@ object PeerEventManager {
 
 
     private val _prepareUploadRequests =
-        MutableSharedFlow<PrepareUploadRequest>(replay = 1, extraBufferCapacity = 1)
+        MutableSharedFlow<PrepareUploadRequest>(replay = 0, extraBufferCapacity = 1)
     val prepareUploadRequests = _prepareUploadRequests.asSharedFlow()
 
-
-    private var pendingPrepareUploadRequest: PrepareUploadRequest? = null
-
     private val decisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
     private val registrationDecisionMap = mutableMapOf<String, CompletableDeferred<Boolean>>()
 
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
index 0b24c21f0..21d55b483 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderUploadFilesFragment.kt
@@ -23,7 +23,6 @@ class SenderUploadFilesFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.uploadAllFiles()
         viewModel.peerToPeerParticipant = PeerToPeerParticipant.SENDER
         showFormEndView()
         observeUploadProgress()
diff --git a/tella-vault/src/main/java/com/hzontal/tella_vault/BaseVault.java b/tella-vault/src/main/java/com/hzontal/tella_vault/BaseVault.java
index 8ddb38f61..5a1587f88 100644
--- a/tella-vault/src/main/java/com/hzontal/tella_vault/BaseVault.java
+++ b/tella-vault/src/main/java/com/hzontal/tella_vault/BaseVault.java
@@ -226,10 +226,12 @@ protected VaultFile baseCreate(BaseVaultFileBuilder<?, ?> builder, String parent
             }
 
             // Check for duplicate using hash
-            VaultFile existing = database.getByHash(vaultFile.hash);
-            if (existing != null) {
-                throw new DuplicateVaultFileException(existing);
-            }
+            // commented this because we had an issue of uploading in the peertopeer
+            /* todo fix this later*/
+ //           VaultFile existing = database.getByHash(vaultFile.hash);
+//            if (existing != null) {
+//                throw new DuplicateVaultFileException(existing);
+//            }
 
             return database.create(parentId, vaultFile);
 

From c807bc5f1d1075da7f1e8af7fdbca82a025f43b1 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 18 Sep 2025 16:19:14 +0100
Subject: [PATCH 148/153] update version code

---
 mobile/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 99ad9a437..03fe2a35a 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 205
+        versionCode 211
         versionName "3.0.0"
         multiDexEnabled true
 

From 9199dc625bf20fbd080a7e5f9cff3216c97f7517 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Thu, 18 Sep 2025 16:49:25 +0100
Subject: [PATCH 149/153] Fix gradle problem

---
 build.gradle                                                    | 2 +-
 .../tella/mobile/views/base_ui/BaseBindingDialogFragment.kt     | 2 +-
 .../tella/mobile/views/base_ui/BaseBindingFragment.kt           | 2 +-
 .../org/horizontal/tella/mobile/views/base_ui/BaseFragment.kt   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2bacd942a..9d15c22f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
     versions.coroutinesAndroid = '1.5.2'
     versions.gson = '2.9.0'
     versions.legacyV4 = '1.0.0'
-    versions.tooltip = '1.0.0-alpha06-SNAPSHOT'
+    versions.tooltip = '0.2.0'
     versions.retrofit2KotliCoroutinesAdapter = '0.9.2'
     versions.desugar = '1.1.5'
     versions.multidex = '2.0.1'
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingDialogFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingDialogFragment.kt
index 2f42a0398..19f38a8dd 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingDialogFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingDialogFragment.kt
@@ -76,7 +76,7 @@ abstract class BaseBindingDialogFragment<VB : ViewBinding>(
             .setPadding(24)
             .setDismissOnClick(true)
             .setCancelable(true)
-            .show<Tooltip>()
+            .show()
     }
 
     open fun back() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
index c49639566..2fb39e19c 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseBindingFragment.kt
@@ -78,7 +78,7 @@ abstract class BaseBindingFragment<VB : ViewBinding>(
             .setPadding(24)
             .setDismissOnClick(true)
             .setCancelable(true)
-            .show<Tooltip>()
+            .show()
     }
 
     open fun back() {
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseFragment.kt
index 13ebf5708..1ab079270 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/base_ui/BaseFragment.kt
@@ -75,7 +75,7 @@ abstract class BaseFragment : Fragment() {
                 .setPadding(24)
                 .setDismissOnClick(true)
                 .setCancelable(true)
-                .show<Tooltip>()
+                .show()
     }
 
     open fun back() {

From c542f5968cb36dcbb24eab458f55bbf7ee7f59a1 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 19 Sep 2025 16:01:52 +0100
Subject: [PATCH 150/153] fix prepareUpload request

---
 .../tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt    | 2 +-
 .../org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt | 5 ++---
 .../fragment/peertopeer/senderflow/PrepareUploadFragment.kt  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
index c31c8eafd..c7ea295d3 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/data/peertopeer/TellaPeerToPeerClient.kt
@@ -120,7 +120,7 @@ class TellaPeerToPeerClient @Inject constructor(
                 fileName = it.name,
                 size = it.size,
                 fileType = mimeType,
-                sha256 = it.hash,
+               // sha256 = it.hash,
                 thumbnail = it.thumb
             )
         }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
index 8af3d75e5..15f92e029 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/domain/peertopeer/P2PFile.kt
@@ -8,7 +8,6 @@ data class P2PFile(
     val fileName: String,
     val size: Long,
     val fileType: String,
-    val sha256: String,
     @Serializable(with = ByteArrayFlexibleSerializer::class)
     val thumbnail: ByteArray? = null
 ) {
@@ -22,7 +21,7 @@ data class P2PFile(
         if (fileName != other.fileName) return false
         if (size != other.size) return false
         if (fileType != other.fileType) return false
-        if (sha256 != other.sha256) return false
+       // if (sha256 != other.sha256) return false
         if (thumbnail != null) {
             if (other.thumbnail == null) return false
             if (!thumbnail.contentEquals(other.thumbnail)) return false
@@ -36,7 +35,7 @@ data class P2PFile(
         result = 31 * result + fileName.hashCode()
         result = 31 * result + size.hashCode()
         result = 31 * result + fileType.hashCode()
-        result = 31 * result + sha256.hashCode()
+     //   result = 31 * result + sha256.hashCode()
         result = 31 * result + (thumbnail?.contentHashCode() ?: 0)
         return result
     }
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
index 5b3650b0c..0b9319b9b 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/PrepareUploadFragment.kt
@@ -287,7 +287,7 @@ class PrepareUploadFragment :
                             fileName = vaultFile.name,
                             size = vaultFile.size,
                             fileType = vaultFile.mimeType ?: "application/octet-stream",
-                            sha256 = vaultFile.hash,
+                            //sha256 = vaultFile.hash,
                             thumbnail = vaultFile.thumb ?: ByteArray(0)
                         )
 

From 145ca5ceeed7a769da041d3d8be12c877419a3d0 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 19 Sep 2025 16:28:16 +0100
Subject: [PATCH 151/153] fix strings display

---
 mobile/build.gradle                            |  2 +-
 .../res/layout/verification_info_fragment.xml  | 18 ++++++++++++++++--
 mobile/src/main/res/values/strings.xml         |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 03fe2a35a..3c51ba238 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 211
+        versionCode 212
         versionName "3.0.0"
         multiDexEnabled true
 
diff --git a/mobile/src/main/res/layout/verification_info_fragment.xml b/mobile/src/main/res/layout/verification_info_fragment.xml
index c2a6ca2d6..d91c7143c 100644
--- a/mobile/src/main/res/layout/verification_info_fragment.xml
+++ b/mobile/src/main/res/layout/verification_info_fragment.xml
@@ -78,11 +78,25 @@
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:gravity="start"
-        android:text="@string/sequence_mismatch_warning"
+        android:text="@string/nearbySharing_verifyConnection"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/sequenceTextView" />
 
+    <TextView
+        android:id="@+id/sequenceDescTextViewWarning"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:gravity="start"
+        android:text="@string/nearbySharing_verifyConnection_warning"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sequenceDescTextView" />
+
+
     <org.hzontal.shared_ui.buttons.RoundButton
         android:id="@+id/connect_btn"
         android:layout_width="match_parent"
@@ -93,7 +107,7 @@
         app:check_state="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sequenceDescTextView"
+        app:layout_constraintTop_toBottomOf="@+id/sequenceDescTextViewWarning"
         app:text="@string/confirm_and_connect"
         app:text_color="@color/btn_dark_letter"
         app:text_all_caps="true"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 555728fc0..904793383 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1016,7 +1016,8 @@ Would you like to share analytics with the Tella team?</string>
     <string name="port">Port</string>
     <string name="verification">Verification</string>
     <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
-    <string name="sequence_mismatch_warning">If the sequence on your device does not match the sequence on the sender’s device, the connection may not be secure and should be discarded.</string>
+    <string name="nearbySharing_verifyConnection">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the other device.</string>
+    <string name="nearbySharing_verifyConnection_warning">If the sequences do not match, the connection may not be secure and should be discarded.</string>
     <string name="confirm_and_connect">Confirm and connect</string>
     <string name="wifi">Wi-Fi</string>
     <string name="get_connected">Get connected</string>
@@ -1041,7 +1042,6 @@ Would you like to share analytics with the Tella team?</string>
     <string name="enter_recipient_info">Enter the recipient’s device\n information to find it on the network</string>
     <string name="make_sure_sequence_matches">Make sure that this sequence matches what is shown on the sender’s device.</string>
     <string name="make_sure_sequence_matches_recipient">Make sure that this sequence matches what is shown on the recipient’s device.</string>
-    <string name="sequence_mismatch_warning_recipient">If the sequence on your device does not match the sequence on the recipient’s device, the connection may not be secure and should be discarded.</string>
     <string name="discard_and_start_over">Discard and start over</string>
     <string name="waiting_for_the_sender_to_share_files">Waiting for the sender to share files</string>
     <string name="prepare_upload_message">The sender is trying to send you %1$d files</string>

From 08b24a1b3445791ede828d5f101b6ccae9b16153 Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 19 Sep 2025 17:26:21 +0100
Subject: [PATCH 152/153] fix design

---
 .../RecipientVerificationFragment.kt          |   2 +-
 .../senderflow/SenderVerificationFragment.kt  |   2 +-
 .../layout/connect_manually_verification.xml  |  55 ++++----
 .../res/layout/verification_info_fragment.xml | 129 ------------------
 mobile/src/main/res/values/strings.xml        |  15 +-
 5 files changed, 36 insertions(+), 167 deletions(-)
 delete mode 100644 mobile/src/main/res/layout/verification_info_fragment.xml

diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
index 4511557db..c19974a07 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/receipentflow/RecipientVerificationFragment.kt
@@ -38,7 +38,7 @@ class RecipientVerificationFragment :
 
     private fun initUI() = with(binding) {
         // Simpler instruction text (update your string as needed)
-        warningTextView.text = getString(R.string.hash_receipient_description)
+        sequenceDescTextView.text = getString(R.string.nearbySharing_verifyConnection_recipient)
         hashContentTextView.text = viewModel.p2PState.hash.formatHash()
 
         // IMPORTANT: button is enabled immediately
diff --git a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
index 14c6aa666..94d502b17 100644
--- a/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
+++ b/mobile/src/main/java/org/horizontal/tella/mobile/views/fragment/peertopeer/senderflow/SenderVerificationFragment.kt
@@ -32,7 +32,7 @@ class SenderVerificationFragment :
     }
 
     private fun initView() {
-        binding.warningTextView.text = getString(R.string.hash_sender_description)
+        binding.sequenceDescTextView.text = getString(R.string.nearbySharing_verifyConnection_sender)
         binding.confirmAndConnectBtn.setText(getString(R.string.confirm_and_connect))
         binding.hashContentTextView.text = viewModel.p2PState.hash.formatHash()
     }
diff --git a/mobile/src/main/res/layout/connect_manually_verification.xml b/mobile/src/main/res/layout/connect_manually_verification.xml
index ecc45722c..98011d513 100644
--- a/mobile/src/main/res/layout/connect_manually_verification.xml
+++ b/mobile/src/main/res/layout/connect_manually_verification.xml
@@ -23,7 +23,6 @@
         android:layout_height="wrap_content"
         android:background="@drawable/device"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintBottom_toTopOf="@id/hashContentTextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -41,51 +40,59 @@
         tools:text="87fd 5869 a6b3 e414 112c 1934 ca00 be77 b8e4 584c 829a 4536 490b da9a 3928 be4a"
         android:background="@drawable/bg_dual_text_check"
         app:layout_constraintTop_toBottomOf="@id/deviceImg"
-        app:layout_constraintBottom_toTopOf="@+id/warningTextView" />
+        app:layout_constraintBottom_toTopOf="@+id/sequenceDescTextView" />
 
     <TextView
-        android:id="@+id/warningTextView"
+        android:id="@+id/sequenceDescTextView"
         style="@style/Tella_Main_White_Text.Meduim"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:gravity="start"
-        android:textAlignment="gravity"
-        android:text="@string/hash_receipient_description"
-        android:textColor="@android:color/white"
-        app:layout_constraintTop_toBottomOf="@id/hashContentTextView"
-        app:layout_constraintBottom_toTopOf="@+id/confirmAndConnectBtn"
+        android:text="@string/nearbySharing_verifyConnection_recipient"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/hashContentTextView" />
+
+    <TextView
+        android:id="@+id/sequenceDescTextViewWarning"
+        style="@style/Tella_Main_White_Text.Meduim"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
+        android:gravity="start"
+        android:text="@string/nearbySharing_verifyConnection_warning"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sequenceDescTextView" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
-        android:id="@+id/confirmAndConnectBtn"
+        android:id="@+id/discardBtn"
         android:layout_width="match_parent"
         android:layout_height="54dp"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:background="@drawable/bg_round_orange_btn"
-        app:text_color="@color/btn_dark_letter"
-        app:check_state="false"
-        app:layout_constraintTop_toBottomOf="@id/warningTextView"
-        app:layout_constraintBottom_toTopOf="@+id/discardBtn"
+        android:layout_marginBottom="@dimen/activity_horizontal_large_margin"
+        app:text_all_caps="true"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:text="@string/confirm_and_connect" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:text="@string/discard_and_start_over" />
 
     <org.hzontal.shared_ui.buttons.RoundButton
-        android:id="@+id/discardBtn"
+        android:id="@+id/confirmAndConnectBtn"
         android:layout_width="match_parent"
         android:layout_height="54dp"
         android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        app:text_all_caps="true"
-        app:layout_constraintTop_toBottomOf="@id/confirmAndConnectBtn"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:background="@drawable/bg_round_orange_btn"
+        app:text_color="@color/btn_dark_letter"
+        app:check_state="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:text="@string/discard_and_start_over" />
+        app:layout_constraintBottom_toTopOf="@id/discardBtn"
+        app:text="@string/confirm_and_connect" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/layout/verification_info_fragment.xml b/mobile/src/main/res/layout/verification_info_fragment.xml
deleted file mode 100644
index d91c7143c..000000000
--- a/mobile/src/main/res/layout/verification_info_fragment.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/dark_purple">
-
-
-    <org.hzontal.shared_ui.appbar.ToolbarComponent
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:arrowBackIcon="@drawable/ic_close_white"
-        app:arrowBackIconContentDescription="@string/action_go_back"
-        app:layout_constraintTop_toTopOf="parent"
-        app:popupTheme="@style/AppTheme.PopupOverlay"
-        app:startTitle="@string/connect_manually" />
-
-
-    <ImageView
-        android:id="@+id/deviceImg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/device"
-        app:layout_constraintBottom_toTopOf="@+id/titleTextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-
-    <TextView
-        android:id="@+id/titleTextView"
-        style="@style/Tella_Main_White_TextExtraLargeBold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="@string/verification"
-        android:textColor="@android:color/white"
-        app:layout_constraintBottom_toTopOf="@+id/titleDescTextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/deviceImg" />
-
-    <TextView
-        android:id="@+id/titleDescTextView"
-        style="@style/Tella_Main_White_Text.Meduim"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_horizontal_small_margin"
-        android:gravity="start"
-        android:paddingHorizontal="@dimen/activity_horizontal_margin"
-        android:text="@string/verify_sequence_match"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleTextView" />
-
-    <org.hzontal.shared_ui.buttons.InformationButton
-        android:id="@+id/sequenceTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titleDescTextView" />
-
-    <TextView
-        android:id="@+id/sequenceDescTextView"
-        style="@style/Tella_Main_White_Text.Meduim"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        android:gravity="start"
-        android:text="@string/nearbySharing_verifyConnection"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sequenceTextView" />
-
-    <TextView
-        android:id="@+id/sequenceDescTextViewWarning"
-        style="@style/Tella_Main_White_Text.Meduim"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        android:gravity="start"
-        android:text="@string/nearbySharing_verifyConnection_warning"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sequenceDescTextView" />
-
-
-    <org.hzontal.shared_ui.buttons.RoundButton
-        android:id="@+id/connect_btn"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_large_margin"
-        android:background="@drawable/bg_round_orange_btn"
-        app:check_state="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sequenceDescTextViewWarning"
-        app:text="@string/confirm_and_connect"
-        app:text_color="@color/btn_dark_letter"
-        app:text_all_caps="true"
-        />
-
-    <org.hzontal.shared_ui.buttons.RoundButton
-        android:id="@+id/discard_btn"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_horizontal_margin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/connect_btn"
-        app:text="@string/discard_and_start_over"
-        />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 904793383..103ae7ae3 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1016,7 +1016,8 @@ Would you like to share analytics with the Tella team?</string>
     <string name="port">Port</string>
     <string name="verification">Verification</string>
     <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
-    <string name="nearbySharing_verifyConnection">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the other device.</string>
+    <string name="nearbySharing_verifyConnection_recipient">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the recipient’s device.</string>
+    <string name="nearbySharing_verifyConnection_sender">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the other device.</string>
     <string name="nearbySharing_verifyConnection_warning">If the sequences do not match, the connection may not be secure and should be discarded.</string>
     <string name="confirm_and_connect">Confirm and connect</string>
     <string name="wifi">Wi-Fi</string>
@@ -1085,19 +1086,9 @@ Would you like to share analytics with the Tella team?</string>
     <string name="view_files_action">View Files</string>
     <string name="view_files">VIEW FILES</string>
     <string name="result">Results</string>
-    <string name="hash_receipient_description">1. \tMake sure that this sequence matches what\n \t\t\tis shown on the sender’s device.\n
-2. \tThe sender needs to confirm the\n   \t\t\tconnection first. \n
-3.  \tAfter that, you will be able to confirm the\n \t\t\tconnection and start sharing files \n\n
-
-    If the sequence on your device does not match \nthe sequence on the sender’s device, the\n connection may not be secure and should be\n discarded.
-  </string>
   <string name="waiting_for_the_sender">Waiting for sender …</string>
-  <string name="waiting_for_the_recipient">Waiting for recipient …</string>
-
-  <string name="hash_sender_description">
-1.\tMake sure that this sequence matches what\n \t\tis shown on the recipient’s device.\n2.\tYou need to confirm the connection first.\n3.\tAfter that, the recipient will be able to\n \t\tconfirm the connection and start receiving\n\t\tfiles.\n\nIf the sequence on your device does not match the sequence on the sender’s device,\nthe connection may not be secure and should be discarded.
-</string>
 
+    <string name="waiting_for_the_recipient">Waiting for recipient …</string>
     <string name="nearby_sharing_title">Nearby Sharing</string>
     <string name="nearby_sharing_description">Enable this feature to share files with devices near you, without an Internet connection.</string>
     <string name="nearby_sharing_intro">Share files directly with a device near you, with\nor without an Internet connection.\n\nTo get started, join the same Wi-Fi network as the recipient. Nearby Sharing will work even if the Wi-Fi network is not connected to the Internet.</string>

From ce376b9641f273d93e1a8012f5adf661fefc427f Mon Sep 17 00:00:00 2001
From: wafa <lakwafa@gmail.com>
Date: Fri, 19 Sep 2025 17:37:58 +0100
Subject: [PATCH 153/153] fix strings

---
 mobile/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 103ae7ae3..83e5b1d9d 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1016,8 +1016,8 @@ Would you like to share analytics with the Tella team?</string>
     <string name="port">Port</string>
     <string name="verification">Verification</string>
     <string name="verify_sequence_match">Make sure that this sequence matches what is shown on the sender’s device.</string>
-    <string name="nearbySharing_verifyConnection_recipient">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the recipient’s device.</string>
-    <string name="nearbySharing_verifyConnection_sender">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the other device.</string>
+    <string name="nearbySharing_verifyConnection_sender">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the recipient’s device.</string>
+    <string name="nearbySharing_verifyConnection_recipient">To ensure that the connection is safe, make sure that the sequence of numbers above matches what is shown on the other device.</string>
     <string name="nearbySharing_verifyConnection_warning">If the sequences do not match, the connection may not be secure and should be discarded.</string>
     <string name="confirm_and_connect">Confirm and connect</string>
     <string name="wifi">Wi-Fi</string>