People management v1 wrap-up

WordPress/src/main/AndroidManifest.xml

@@ -337,7 +337,7 @@
         <activity
             android:name=".ui.people.PeopleManagementActivity"
             android:label="@string/people"
-            android:theme="@style/CalypsoTheme"/>
+            android:theme="@style/Calypso.NoActionBar"/>
 
         <!-- Me activities -->
         <activity

WordPress/src/main/java/org/wordpress/android/WordPressDB.java

@@ -760,6 +760,7 @@ public boolean deleteBlog(Context ctx, int id) {
         int rowsAffected = db.delete(BLOGS_TABLE, "id=?", new String[]{Integer.toString(id)});
         deleteQuickPressShortcutsForLocalTableBlogId(ctx, id);
         deleteAllPostsForLocalTableBlogId(id);
+        PeopleTable.deletePeopleForBlog(id);
         return (rowsAffected > 0);
     }
 
@@ -769,6 +770,7 @@ public boolean deleteWordPressComBlogs(Context ctx) {
             int localBlogId = MapUtils.getMapInt(blog, "id");
             deleteQuickPressShortcutsForLocalTableBlogId(ctx, localBlogId);
             deleteAllPostsForLocalTableBlogId(localBlogId);
+            PeopleTable.deletePeopleForBlog(localBlogId);
         }
 
         // H4ck alert: We need to delete the Jetpack sites that were added in the initial

WordPress/src/main/java/org/wordpress/android/datasets/PeopleTable.java

@@ -65,9 +65,12 @@ public static void save(Person person, SQLiteDatabase database) {
         database.insertWithOnConflict(PEOPLE_TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
-    public static void savePeople(List<Person> peopleList) {
+    public static void savePeople(List<Person> peopleList, int localTableBlogId) {
         getWritableDb().beginTransaction();
         try {
+            //We have a fresh list, remove the previous list of people in case it was deleted on remote
+            PeopleTable.deletePeopleForBlog(localTableBlogId);
+
             for (Person person : peopleList) {
                 PeopleTable.save(person);
             }
@@ -77,10 +80,21 @@ public static void savePeople(List<Person> peopleList) {
         }
     }
 
+    public static void deletePeopleForBlog(int localTableBlogId) {
+        String[] args = new String[]{Integer.toString(localTableBlogId)};
+        getWritableDb().delete(PEOPLE_TABLE, "local_blog_id=?", args);
+    }
+
+    public static void deletePerson(long personID, int localTableBlogId) {
+        String[] args = new String[]{Long.toString(personID), Integer.toString(localTableBlogId)};
+        getWritableDb().delete(PEOPLE_TABLE, "person_id=? AND local_blog_id=?", args);
+    }
+
     public static List<Person> getPeople(int localTableBlogId) {
         List<Person> people = new ArrayList<>();
         String[] args = { Integer.toString(localTableBlogId) };
-        Cursor c = getReadableDb().rawQuery("SELECT * FROM " + PEOPLE_TABLE + " WHERE local_blog_id=?", args);
+        Cursor c = getReadableDb().rawQuery("SELECT * FROM " + PEOPLE_TABLE +
+                " WHERE local_blog_id=? ORDER BY display_name, user_name", args);
 
         try {
             while (c.moveToNext()) {
@@ -102,7 +116,8 @@ public static List<Person> getPeople(int localTableBlogId) {
      */
     public static Person getPerson(long personId, int localTableBlogId) {
         String[] args = { Long.toString(personId), Integer.toString(localTableBlogId) };
-        Cursor c = getReadableDb().rawQuery("SELECT * FROM " + PEOPLE_TABLE + " WHERE person_id=? AND local_blog_id=?", args);
+        Cursor c = getReadableDb().rawQuery("SELECT * FROM " + PEOPLE_TABLE +
+                " WHERE person_id=? AND local_blog_id=?", args);
         try {
             if (!c.moveToFirst()) {
                 return null;
@@ -123,6 +138,7 @@ private static Person getPersonFromCursor(Cursor c, int localTableBlogId) {
         String avatarUrl = c.getString(c.getColumnIndex("avatar_url"));
         String role = c.getString(c.getColumnIndex("role"));
 
-        return new Person(personId, blogId, localTableBlogId, username, firstName, lastName, displayName, avatarUrl, role);
+        return new Person(personId, blogId, localTableBlogId, username,
+                firstName, lastName, displayName, avatarUrl, role);
     }
 }

WordPress/src/main/java/org/wordpress/android/models/Capability.java

@@ -5,9 +5,9 @@
  * A list of capabilities can be found in: https://codex.wordpress.org/Roles_and_Capabilities#Capabilities
  */
 public enum Capability {
-    EDIT_USERS("edit_users"), // Check if user can change another user's role
     LIST_USERS("list_users"), // Check if user can visit People page
-    PROMOTE_USERS("promote_users"); // Check if user can invite another user
+    PROMOTE_USERS("promote_users"), // Check if user can change another user's role
+    REMOVE_USERS("remove_users"); // Check if user can remove another user
 
     private final String label;
 

WordPress/src/main/java/org/wordpress/android/models/Person.java

@@ -50,7 +50,7 @@ public static Person fromJSON(JSONObject json, String blogId, int localTableBlog
             String username = json.optString("login");
             String firstName = json.optString("first_name");
             String lastName = json.optString("last_name");
-            String displayName = json.optString("nice_name");
+            String displayName = json.optString("name");
             String avatarUrl = json.optString("avatar_URL");
             // We don't support multiple roles, so the first role is picked just as it's in Calypso
             String role = json.getJSONArray("roles").optString(0);

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleAdapter.java

@@ -88,10 +88,10 @@ private class PeopleViewHolder {
         private final TextView txtRole;
 
         PeopleViewHolder(View row) {
-            imgAvatar = (WPNetworkImageView) row.findViewById(R.id.people_list_row_avatar);
-            txtDisplayName = (TextView) row.findViewById(R.id.people_list_row_display_name);
-            txtUsername = (TextView) row.findViewById(R.id.people_list_row_username);
-            txtRole = (TextView) row.findViewById(R.id.people_list_row_role);
+            imgAvatar = (WPNetworkImageView) row.findViewById(R.id.person_avatar);
+            txtDisplayName = (TextView) row.findViewById(R.id.person_display_name);
+            txtUsername = (TextView) row.findViewById(R.id.person_username);
+            txtRole = (TextView) row.findViewById(R.id.person_role);
         }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java

@@ -1,10 +1,13 @@
 package org.wordpress.android.ui.people;
 
+import android.app.AlertDialog;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.wordpress.android.R;
@@ -15,23 +18,29 @@
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.ui.accounts.BlogUtils;
 import org.wordpress.android.ui.people.utils.PeopleUtils;
+import org.wordpress.android.util.ToastUtils;
 
 import java.util.List;
 
-public class PeopleManagementActivity extends AppCompatActivity implements PeopleListFragment.OnPersonSelectedListener {
+public class PeopleManagementActivity extends AppCompatActivity
+        implements PeopleListFragment.OnPersonSelectedListener, RoleChangeDialogFragment.OnChangeListener {
     private static final String KEY_PEOPLE_LIST_FRAGMENT = "people-list-fragment";
     private static final String KEY_PERSON_DETAIL_FRAGMENT = "person-detail-fragment";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setContentView(R.layout.people_management_activity);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
+            actionBar.setTitle(R.string.people);
             actionBar.setHomeButtonEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-        setContentView(R.layout.people_management_activity);
 
         int localBlogId = BlogUtils.getBlogLocalId(WordPress.getCurrentBlog());
         Blog blog = WordPress.getBlog(localBlogId);
@@ -57,9 +66,7 @@ public void finish() {
 
     @Override
     public void onBackPressed() {
-        if (getFragmentManager().getBackStackEntryCount() > 0 ){
-            getFragmentManager().popBackStack();
-        } else {
+        if (!navigateBackToPeopleListFragment()) {
             super.onBackPressed();
         }
     }
@@ -69,6 +76,9 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             onBackPressed();
             return true;
+        } else if (item.getItemId() == R.id.remove_person) {
+            confirmRemovePerson();
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -77,25 +87,15 @@ private void refreshUsersList(String dotComBlogId, final int localTableBlogId) {
         PeopleUtils.fetchUsers(dotComBlogId, localTableBlogId, new PeopleUtils.FetchUsersCallback() {
             @Override
             public void onSuccess(List<Person> peopleList) {
-                PeopleTable.savePeople(peopleList);
-
-                FragmentManager fragmentManager = getFragmentManager();
-                PeopleListFragment peopleListFragment = (PeopleListFragment) fragmentManager
-                        .findFragmentByTag(KEY_PEOPLE_LIST_FRAGMENT);
-                PersonDetailFragment personDetailFragment = (PersonDetailFragment) fragmentManager
-                        .findFragmentByTag(KEY_PERSON_DETAIL_FRAGMENT);
-
-                if (peopleListFragment != null) {
-                    peopleListFragment.refreshPeopleList();
-                }
-                if (personDetailFragment != null) {
-                    personDetailFragment.refreshPersonDetails();
-                }
+                PeopleTable.savePeople(peopleList, localTableBlogId);
+                refreshOnScreenFragmentDetails();
             }
 
             @Override
             public void onError() {
-                //TODO: show some kind of error to the user
+                ToastUtils.showToast(PeopleManagementActivity.this,
+                        R.string.error_fetch_people_list,
+                        ToastUtils.Duration.LONG);
             }
         });
     }
@@ -120,4 +120,124 @@ public void onPersonSelected(Person person) {
             fragmentTransaction.commit();
         }
     }
+
+    @Override
+    public void onRoleChanged(long personID, int localTableBlogId, String newRole) {
+        Person person = PeopleTable.getPerson(personID, localTableBlogId);
+        if (person == null || newRole == null || newRole.equalsIgnoreCase(person.getRole())) {
+            return;
+        }
+        PeopleUtils.updateRole(person.getBlogId(), person.getPersonID(), newRole, localTableBlogId,
+                new PeopleUtils.UpdateUserCallback() {
+            @Override
+            public void onSuccess(Person person) {
+                PeopleTable.save(person);
+                refreshOnScreenFragmentDetails();
+            }
+
+            @Override
+            public void onError() {
+                ToastUtils.showToast(PeopleManagementActivity.this,
+                        R.string.error_update_role,
+                        ToastUtils.Duration.LONG);
+            }
+        });
+    }
+
+    private void confirmRemovePerson() {
+        Person person = getCurrentPerson();
+        if (person == null) {
+            return;
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Calypso_AlertDialog);
+        builder.setTitle(getString(R.string.person_remove_confirmation_title, person.getDisplayName()));
+        builder.setMessage(getString(R.string.person_remove_confirmation_message, person.getDisplayName()));
+        builder.setNegativeButton(R.string.cancel, null);
+        builder.setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                removeSelectedPerson();
+            }
+        });
+        builder.show();
+    }
+
+    private void removeSelectedPerson() {
+        Person person = getCurrentPerson();
+        if (person == null) {
+            return;
+        }
+        PeopleUtils.removePerson(person.getBlogId(),
+                person.getPersonID(),
+                person.getLocalTableBlogId(),
+                new PeopleUtils.RemoveUserCallback() {
+                    @Override
+                    public void onSuccess(long personID, int localTableBlogId) {
+                        // remove the person from db, navigate back to list fragment and refresh it
+                        Person person = PeopleTable.getPerson(personID, localTableBlogId);
+                        String text;
+                        if (person != null) {
+                            PeopleTable.deletePerson(personID, localTableBlogId);
+                            text = getString(R.string.person_removed, person.getUsername());
+                        } else {
+                            text = getString(R.string.person_removed_general);
+                        }
+
+                        ToastUtils.showToast(PeopleManagementActivity.this, text, ToastUtils.Duration.LONG);
+
+                        navigateBackToPeopleListFragment();
+                        refreshPeopleListFragment();
+                    }
+
+                    @Override
+                    public void onError() {
+                        ToastUtils.showToast(PeopleManagementActivity.this,
+                                R.string.error_remove_user,
+                                ToastUtils.Duration.LONG);
+                    }
+                });
+    }
+
+    // This helper method is used after a successful network request
+    private void refreshOnScreenFragmentDetails() {
+        FragmentManager fragmentManager = getFragmentManager();
+        PersonDetailFragment personDetailFragment = (PersonDetailFragment) fragmentManager
+                .findFragmentByTag(KEY_PERSON_DETAIL_FRAGMENT);
+
+        if (personDetailFragment != null) {
+            personDetailFragment.refreshPersonDetails();
+        }
+
+        refreshPeopleListFragment();
+    }
+
+    private void refreshPeopleListFragment() {
+        FragmentManager fragmentManager = getFragmentManager();
+        PeopleListFragment peopleListFragment = (PeopleListFragment) fragmentManager
+                .findFragmentByTag(KEY_PEOPLE_LIST_FRAGMENT);
+        if (peopleListFragment != null) {
+            peopleListFragment.refreshPeopleList();
+        }
+    }
+
+    private boolean navigateBackToPeopleListFragment() {
+        if (getFragmentManager().getBackStackEntryCount() > 0) {
+            getFragmentManager().popBackStack();
+            return true;
+        }
+        return false;
+    }
+
+    private Person getCurrentPerson() {
+        FragmentManager fragmentManager = getFragmentManager();
+        PersonDetailFragment personDetailFragment = (PersonDetailFragment) fragmentManager
+                .findFragmentByTag(KEY_PERSON_DETAIL_FRAGMENT);
+
+        if (personDetailFragment == null) {
+            return null;
+        }
+
+        return personDetailFragment.loadPerson();
+    }
 }