Fixes signalapp#13852 - Contacts Refresh

Sagar0-0 · Jan 3, 2025 · 70a88eb · 70a88eb
1 parent 517aeee
commit 70a88eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -370,7 +370,7 @@ public void onFindContactsClicked() {
 
               @Override
               public void onRefreshContactsClicked() {
-                if (onRefreshListener != null) {
+                if (onRefreshListener != null && !isRefreshing()) {
                   setRefreshing(true);
                   onRefreshListener.onRefresh();
                 }
@@ -570,6 +570,10 @@ public void setRefreshing(boolean refreshing) {
     swipeRefresh.setRefreshing(refreshing);
   }
 
+  public boolean isRefreshing() {
+    return swipeRefresh.isRefreshing();
+  }
+
   public void reset() {
     contactSearchMediator.clearSelection();
     fastScroller.setVisibility(View.GONE);

diff --git a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -204,8 +204,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
   }
 
   private void handleManualRefresh() {
-    contactsFragment.setRefreshing(true);
-    onRefresh();
+    if (!contactsFragment.isRefreshing()) {
+      contactsFragment.setRefreshing(true);
+      onRefresh();
+    }
   }
 
   private void handleCreateGroup() {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
@@ -114,6 +114,13 @@ class NewCallActivity : ContactSelectionActivity(), ContactSelectionListFragment
     startActivity(Intent(this, InviteActivity::class.java))
   }
 
+  private fun handleManualRefresh() {
+    if(!contactsFragment.isRefreshing) {
+      contactsFragment.isRefreshing = true
+      onRefresh()
+    }
+  }
+
   private inner class NewCallMenuProvider : MenuProvider {
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
       menuInflater.inflate(R.menu.new_call_menu, menu)
@@ -122,7 +129,7 @@ class NewCallActivity : ContactSelectionActivity(), ContactSelectionListFragment
     override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
       when (menuItem.itemId) {
         android.R.id.home -> ActivityCompat.finishAfterTransition(this@NewCallActivity)
-        R.id.menu_refresh -> onRefresh()
+        R.id.menu_refresh -> handleManualRefresh()
         R.id.menu_invite -> startActivity(Intent(this@NewCallActivity, InviteActivity::class.java))
       }