My Profile

WordPress/src/main/AndroidManifest.xml

@@ -316,6 +316,12 @@
             android:theme="@style/CalypsoTheme"
             android:windowSoftInputMode="stateHidden"/>
 
+        <!--Me activities-->
+        <activity
+            android:name=".ui.prefs.MyProfileActivity"
+            android:label="@string/my_profile"
+            android:theme="@style/CalypsoTheme" />
+
 		<!-- Services -->
         <service
             android:name=".ui.posts.services.PostUploadService"

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

@@ -80,7 +80,7 @@ public class WordPressDB {
     public static final String COLUMN_NAME_VIDEO_PRESS_SHORTCODE = "videoPressShortcode";
     public static final String COLUMN_NAME_UPLOAD_STATE          = "uploadState";
 
-    private static final int DATABASE_VERSION = 38;
+    private static final int DATABASE_VERSION = 39;
 
     private static final String CREATE_TABLE_BLOGS = "create table if not exists accounts (id integer primary key autoincrement, "
             + "url text, blogName text, username text, password text, imagePlacement text, centerThumbnail boolean, fullSizeImage boolean, maxImageWidth text, maxImageWidthId integer);";
@@ -380,6 +380,9 @@ public WordPressDB(Context ctx) {
             case 37:
                 resetThemeTable();
                 currentVersion++;
+            case 38:
+                AccountTable.migrationAddFirstNameLastNameAboutMeFields(db);
+                currentVersion++;
         }
         db.setVersion(DATABASE_VERSION);
     }

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

@@ -37,6 +37,12 @@ public static void migrationAddEmailAddressField(SQLiteDatabase db) {
         db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD email TEXT DEFAULT '';");
     }
 
+    public static void migrationAddFirstNameLastNameAboutMeFields(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD first_name TEXT DEFAULT '';");
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD last_name TEXT DEFAULT '';");
+        db.execSQL("ALTER TABLE " + ACCOUNT_TABLE + " ADD about_me TEXT DEFAULT '';");
+    }
+
     private static void dropTables(SQLiteDatabase db) {
         db.execSQL("DROP TABLE IF EXISTS " + ACCOUNT_TABLE);
     }
@@ -59,6 +65,9 @@ public static void save(Account account, SQLiteDatabase database) {
         values.put("visible_site_count", account.getVisibleSiteCount());
         values.put("access_token", account.getAccessToken());
         values.put("email", account.getEmail());
+        values.put("first_name", account.getFirstName());
+        values.put("last_name", account.getLastName());
+        values.put("about_me", account.getAboutMe());
         database.insertWithOnConflict(ACCOUNT_TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
@@ -84,6 +93,9 @@ private static Account getAccountByLocalId(long localId) {
                 account.setVisibleSiteCount(c.getInt(c.getColumnIndex("visible_site_count")));
                 account.setAccessToken(c.getString(c.getColumnIndex("access_token")));
                 account.setEmail(c.getString(c.getColumnIndex("email")));
+                account.setFirstName(c.getString(c.getColumnIndex("first_name")));
+                account.setLastName(c.getString(c.getColumnIndex("last_name")));
+                account.setAboutMe(c.getString(c.getColumnIndex("about_me")));
             }
             return account;
         } finally {

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

@@ -7,9 +7,14 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.datasets.AccountTable;
 import org.wordpress.android.datasets.ReaderUserTable;
+import org.wordpress.android.ui.prefs.PrefsEvents;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 
+import java.util.Map;
+
+import de.greenrobot.event.EventBus;
+
 /**
  * Class for managing logged in user informations.
  */
@@ -37,6 +42,48 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtilsV1_1().get("me", listener, errorListener);
     }
 
+    public void fetchAccountSettings() {
+        com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
+            @Override
+            public void onResponse(JSONObject jsonObject) {
+                if (jsonObject != null) {
+                    updateAccountSettingsFromRestResponse(jsonObject);
+                    save();
+                    EventBus.getDefault().post(new PrefsEvents.MyProfileDetailsChanged());
+                }
+            }
+        };
+
+        RestRequest.ErrorListener errorListener = new RestRequest.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                AppLog.e(T.API, volleyError);
+            }
+        };
+
+        WordPress.getRestClientUtilsV1_1().get("me/settings", listener, errorListener);
+    }
+
+    public void postAccountSettings(Map<String, String> params) {
+        com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
+            @Override
+            public void onResponse(JSONObject jsonObject) {
+                if (jsonObject != null) {
+                    updateAccountSettingsFromRestResponse(jsonObject);
+                    save();
+                }
+            }
+        };
+
+        RestRequest.ErrorListener errorListener = new RestRequest.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                AppLog.e(T.API, volleyError);
+            }
+        };
+
+        WordPress.getRestClientUtilsV1_1().post("me/settings", params, null, listener, errorListener);
+    }
 
     public void signout() {
         init();
@@ -46,4 +93,21 @@ public void signout() {
     public void save() {
         AccountTable.save(this);
     }
+
+    public enum RestParam {
+        FIRST_NAME("first_name"),
+        LAST_NAME("last_name"),
+        DISPLAY_NAME("display_name"),
+        ABOUT_ME("description");
+
+        private String description;
+
+        RestParam(String description) {
+            this.description = description;
+        }
+
+        public static String toString(RestParam param) {
+            return param.description;
+        }
+    }
 }

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

@@ -17,6 +17,9 @@ public class AccountModel {
     private int mVisibleSiteCount;
     private String mAccessToken;
     private String mEmail;
+    private String mFirstName;
+    private String mLastName;
+    private String mAboutMe;
 
     public AccountModel() {
         init();
@@ -33,6 +36,9 @@ public void init() {
         mVisibleSiteCount = 0;
         mAccessToken = "";
         mEmail = "";
+        mFirstName = "";
+        mLastName = "";
+        mAboutMe = "";
     }
 
     public void updateFromRestResponse(JSONObject json) {
@@ -47,6 +53,13 @@ public void updateFromRestResponse(JSONObject json) {
         mEmail = json.optString("email");
     }
 
+    public void updateAccountSettingsFromRestResponse(JSONObject json) {
+        mFirstName = json.optString("first_name");
+        mLastName = json.optString("last_name");
+        mDisplayName = json.optString("display_name");
+        mAboutMe = json.optString("description");
+    }
+
     public long getUserId() {
         return mUserId;
     }
@@ -130,4 +143,28 @@ public void setEmail(String email) {
     public String getEmail() {
         return StringUtils.notNullStr(mEmail);
     }
+
+    public String getFirstName() {
+        return StringUtils.notNullStr(mFirstName);
+    }
+
+    public void setFirstName(String firstName) {
+        mFirstName = firstName;
+    }
+
+    public String getLastName() {
+        return StringUtils.notNullStr(mLastName);
+    }
+
+    public void setLastName(String lastName) {
+        mLastName = lastName;
+    }
+
+    public String getAboutMe() {
+        return StringUtils.notNullStr(mAboutMe);
+    }
+
+    public void setAboutMe(String aboutMe) {
+        mAboutMe = aboutMe;
+    }
 }

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -20,6 +20,7 @@
 import org.wordpress.android.ui.accounts.SignInActivity;
 import org.wordpress.android.ui.comments.CommentsActivity;
 import org.wordpress.android.ui.main.SitePickerActivity;
+import org.wordpress.android.ui.prefs.MyProfileActivity;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.media.WordPressMediaUtils;
 import org.wordpress.android.ui.posts.EditPostActivity;
@@ -172,8 +173,15 @@ public static void addMedia(Activity activity) {
         WordPressMediaUtils.launchPictureLibrary(activity);
     }
 
+    public static void viewMyProfile(Context context) {
+        Intent intent = new Intent(context, MyProfileActivity.class);
+        AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_MY_PROFILE);
+        slideInFromRight(context, intent);
+    }
+
     public static void viewAccountSettings(Activity activity) {
         Intent intent = new Intent(activity, SettingsActivity.class);
+        AnalyticsUtils.trackWithCurrentBlogDetails(AnalyticsTracker.Stat.OPENED_ACCOUNT_SETTINGS);
         slideInFromRightForResult(activity, intent, RequestCodes.ACCOUNT_SETTINGS);
     }
 

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java

@@ -22,12 +22,15 @@
 import org.wordpress.android.models.Account;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.ui.prefs.PrefsEvents;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.HelpshiftHelper.Tag;
 import org.wordpress.android.widgets.WPNetworkImageView;
 
 import java.lang.ref.WeakReference;
 
+import de.greenrobot.event.EventBus;
+
 public class MeFragment extends Fragment {
     private static final String IS_DISCONNECTING = "IS_DISCONNECTING";
 
@@ -36,6 +39,7 @@ public class MeFragment extends Fragment {
     private TextView mDisplayNameTextView;
     private TextView mUsernameTextView;
     private TextView mLoginLogoutTextView;
+    private View mMyProfileView;
     private View mNotificationsView;
     private View mNotificationsDividerView;
     private ProgressDialog mDisconnectProgressDialog;
@@ -54,12 +58,20 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mDisplayNameTextView = (TextView) rootView.findViewById(R.id.me_display_name);
         mUsernameTextView = (TextView) rootView.findViewById(R.id.me_username);
         mLoginLogoutTextView = (TextView) rootView.findViewById(R.id.me_login_logout_text_view);
+        mMyProfileView = rootView.findViewById(R.id.row_my_profile);
         mNotificationsView = rootView.findViewById(R.id.row_notifications);
         mNotificationsDividerView = rootView.findViewById(R.id.me_notifications_divider);
 
         addDropShadowToAvatar();
         refreshAccountDetails();
 
+        mMyProfileView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ActivityLauncher.viewMyProfile(getActivity());
+            }
+        });
+
         rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -108,6 +120,19 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     }
 
+    @Override
+    public void onStop() {
+        EventBus.getDefault().unregister(this);
+        super.onStop();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshAccountDetails();
+        EventBus.getDefault().register(this);
+    }
+
     @Override
     public void onDestroy() {
         if (mDisconnectProgressDialog != null) {
@@ -141,6 +166,7 @@ private void refreshAccountDetails() {
             mDisplayNameTextView.setVisibility(View.VISIBLE);
             mUsernameTextView.setVisibility(View.VISIBLE);
             mAvatarFrame.setVisibility(View.VISIBLE);
+            mMyProfileView.setVisibility(View.VISIBLE);
             mNotificationsView.setVisibility(View.VISIBLE);
             mNotificationsDividerView.setVisibility(View.VISIBLE);
 
@@ -161,6 +187,7 @@ private void refreshAccountDetails() {
             mDisplayNameTextView.setVisibility(View.GONE);
             mUsernameTextView.setVisibility(View.GONE);
             mAvatarFrame.setVisibility(View.GONE);
+            mMyProfileView.setVisibility(View.GONE);
             mNotificationsView.setVisibility(View.GONE);
             mNotificationsDividerView.setVisibility(View.GONE);
             mLoginLogoutTextView.setText(R.string.me_connect_to_wordpress_com);
@@ -227,4 +254,8 @@ protected void onPostExecute(Void aVoid) {
             mDisconnectProgressDialog = null;
         }
     }
+
+    public void onEventMainThread(PrefsEvents.MyProfileDetailsChanged event) {
+        refreshAccountDetails();
+    }
 }