Merge pull request #240 from jlewis13/directory_reset

Directory reset
ForstaLabs · Dec 19, 2017 · ce425e8 · ce425e8
2 parents e594ddd + 703e6b6
commit ce425e8
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/res/menu/new_conversation_activity.xml b/res/menu/new_conversation_activity.xml
@@ -6,6 +6,10 @@
           android:id="@+id/menu_refresh"
           app:showAsAction="never" />
 
+    <item android:title="@string/new_conversation_activity__reset"
+          android:id="@+id/menu_reset"
+          app:showAsAction="never" />
+
     <item android:title="@string/text_secure_normal__menu_new_group"
         android:id="@+id/menu_new_group" android:visible="false" />
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1223,6 +1223,7 @@
 
     <!-- new_conversation_activity -->
     <string name="new_conversation_activity__refresh">Refresh</string>
+    <string name="new_conversation_activity__reset">Reset Directory</string>
     <!-- redphone_audio_popup_menu -->
     <string name="redphone_audio_popup_menu__handset">Handset</string>
     <string name="redphone_audio_popup_menu__headset">Headset</string>

diff --git a/src/io/forsta/ccsm/api/CcsmApi.java b/src/io/forsta/ccsm/api/CcsmApi.java
@@ -149,6 +149,10 @@ public static JSONObject forstaRefreshToken(Context context) {
   }
 
   public static void syncForstaContacts(Context context) {
+    syncForstaContacts(context, false);
+  }
+
+  public static void syncForstaContacts(Context context, boolean removeInvalidUsers) {
     try {
       ForstaOrg org = ForstaOrg.getLocalForstaOrg(context);
       if (org.getSlug().equals("public") || org.getSlug().equals("forsta")) {
@@ -164,7 +168,7 @@ public static void syncForstaContacts(Context context) {
             threadContacts.add(user);
           }
         }
-        syncForstaContactsDb(context, threadContacts, false);
+        syncForstaContactsDb(context, threadContacts, removeInvalidUsers);
       } else {
         JSONObject orgUsers = getOrgUsers(context);
         List<ForstaUser> orgContacts = parseUsers(context, orgUsers);
@@ -179,7 +183,7 @@ public static void syncForstaContacts(Context context) {
           List<ForstaUser> threadContacts = CcsmApi.parseUsers(context, threadUsers);
           orgContacts.addAll(threadContacts);
         }
-        syncForstaContactsDb(context, orgContacts, false);
+        syncForstaContactsDb(context, orgContacts, removeInvalidUsers);
         CcsmApi.syncOrgTags(context);
       }
       ForstaPreferences.setForstaContactSync(context, new Date().getTime());

diff --git a/src/io/forsta/ccsm/database/ContactDb.java b/src/io/forsta/ccsm/database/ContactDb.java
@@ -286,6 +286,7 @@ public void updateUsers(List<ForstaUser> users, boolean removeExisting) {
       db.endTransaction();
     }
     if (removeExisting) {
+      Log.w(TAG, "Reseting directory. Removing " + uids.size() + " entries.");
       db.beginTransaction();
       try {
         // Now remove entries that are no longer valid.

diff --git a/src/io/forsta/securesms/ContactSelectionActivity.java b/src/io/forsta/securesms/ContactSelectionActivity.java
@@ -136,7 +136,11 @@ protected void updateToggleBar() {
 
   @Override
   public void onRefresh() {
-    new RefreshDirectoryTask(this).execute(getApplicationContext());
+    new RefreshDirectoryTask(this, false).execute(ContactSelectionActivity.this);
+  }
+
+  public void resetDirectory() {
+    new RefreshDirectoryTask(this, true).execute(ContactSelectionActivity.this);
   }
 
   @Override
@@ -159,17 +163,24 @@ private class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
 
     private final WeakReference<ContactSelectionActivity> activity;
     private final MasterSecret masterSecret;
+    private final boolean reset;
 
-    private RefreshDirectoryTask(ContactSelectionActivity activity) {
+    private RefreshDirectoryTask(ContactSelectionActivity activity, boolean reset) {
       this.activity     = new WeakReference<>(activity);
       this.masterSecret = activity.masterSecret;
+      this.reset = reset;
     }
 
 
     @Override
     protected Void doInBackground(Context... params) {
       try {
-        DirectoryHelper.refreshDirectory(params[0], masterSecret);
+        if (reset) {
+          DirectoryHelper.resetDirectory(params[0]);
+        } else {
+          DirectoryHelper.refreshDirectory(params[0], masterSecret);
+        }
+
       } catch (IOException e) {
         e.printStackTrace();
       }

diff --git a/src/io/forsta/securesms/NewConversationActivity.java b/src/io/forsta/securesms/NewConversationActivity.java
@@ -283,6 +283,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
     case android.R.id.home:   super.onBackPressed(); return true;
     case R.id.menu_refresh:   handleManualRefresh(); return true;
+      case R.id.menu_reset:   handleReset(); return true;
     case R.id.menu_new_group: handleCreateGroup();   return true;
     }
 
@@ -294,6 +295,11 @@ private void handleManualRefresh() {
     onRefresh();
   }
 
+  private void handleReset() {
+    contactsFragment.setRefreshing(true);
+    resetDirectory();
+  }
+
   private void handleCreateGroup() {
     startActivity(new Intent(this, GroupCreateActivity.class));
   }

diff --git a/src/io/forsta/securesms/util/DirectoryHelper.java b/src/io/forsta/securesms/util/DirectoryHelper.java
@@ -49,12 +49,20 @@
 public class DirectoryHelper {
   private static final String TAG = DirectoryHelper.class.getSimpleName();
 
+  public static void resetDirectory(Context context) throws IOException {
+    refreshDirectory(context, TextSecureCommunicationFactory.createManager(context), TextSecurePreferences.getLocalNumber(context), true);
+  }
+
   public static void refreshDirectory(@NonNull Context context, @Nullable MasterSecret masterSecret) throws IOException {
-    refreshDirectory(context, TextSecureCommunicationFactory.createManager(context), TextSecurePreferences.getLocalNumber(context));
+    refreshDirectory(context, TextSecureCommunicationFactory.createManager(context), TextSecurePreferences.getLocalNumber(context), false);
   }
 
   public static void refreshDirectory(@NonNull Context context, @NonNull ForstaServiceAccountManager accountManager, @NonNull String localNumber) throws IOException {
-    CcsmApi.syncForstaContacts(context);
+    refreshDirectory(context, accountManager, localNumber, false);
+  }
+
+  public static void refreshDirectory(@NonNull Context context, @NonNull ForstaServiceAccountManager accountManager, @NonNull String localNumber, boolean resetDirectory) throws IOException {
+    CcsmApi.syncForstaContacts(context, resetDirectory);
     ContactDb contactsDb = DbFactory.getContactDb(context);
     Set<String> eligibleContactAddresses = contactsDb.getAddresses();
     // Two devices had crashes because of a null UID value in the contactsDb