Revert of [Android] Make enhanced bookmark editing UI more straightforward.

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
index 47e9d1285e28a0c4d2834adbb357438c613e2688..428c19285e39df1ff8d2043c92860be6d979031d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
@@ -6,7 +6,6 @@
 
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -67,7 +66,6 @@
 
         @Override
         public void bookmarkModelChanged() {
-            updateViewContent();
             if (!mEnhancedBookmarksModel.doesBookmarkExist(mBookmarkId)) {
                 Log.wtf(TAG, "The bookmark was deleted somehow during bookmarkModelChange!",
                         new Exception(TAG));
@@ -88,9 +86,8 @@
 
         setContentView(R.layout.eb_edit);
         mTitleEditText = (EmptyAlertEditText) findViewById(R.id.title_text);
+        mUrlEditText = (EmptyAlertEditText) findViewById(R.id.url_text);
         mFolderTextView = (TextView) findViewById(R.id.folder_text);
-        mUrlEditText = (EmptyAlertEditText) findViewById(R.id.url_text);
-
         mFolderTextView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -98,7 +95,6 @@
                         EnhancedBookmarkEditActivity.this, mBookmarkId);
             }
         });
-
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -108,17 +104,10 @@
 
     private void updateViewContent() {
         BookmarkItem bookmarkItem = mEnhancedBookmarksModel.getBookmarkById(mBookmarkId);
-
-        if (!TextUtils.equals(mTitleEditText.getTrimmedText(), bookmarkItem.getTitle())) {
-            mTitleEditText.setText(bookmarkItem.getTitle());
-        }
-        String folderTitle = mEnhancedBookmarksModel.getBookmarkTitle(bookmarkItem.getParentId());
-        if (!TextUtils.equals(mFolderTextView.getText(), folderTitle)) {
-            mFolderTextView.setText(folderTitle);
-        }
-        if (!TextUtils.equals(mUrlEditText.getTrimmedText(), bookmarkItem.getUrl())) {
-            mUrlEditText.setText(bookmarkItem.getUrl());
-        }
+        mTitleEditText.setText(bookmarkItem.getTitle());
+        mUrlEditText.setText(bookmarkItem.getUrl());
+        mFolderTextView.setText(
+                mEnhancedBookmarksModel.getBookmarkTitle(bookmarkItem.getParentId()));
     }
 
     @Override
@@ -141,25 +130,27 @@
             finish();
             return true;
         } else if (item.getItemId() == android.R.id.home) {
-            finish();
+            onBackPressed();
             return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
-    protected void onStop() {
-        if (mTitleEditText.isEmpty()) {
-            mEnhancedBookmarksModel.setBookmarkTitle(mBookmarkId, mTitleEditText.getTrimmedText());
-        }
+    public void onBackPressed() {
+        String newTitle = mTitleEditText.getTrimmedText();
+        String newUrl = mUrlEditText.getTrimmedText();
+        newUrl = UrlUtilities.fixupUrl(newUrl);
+        if (newUrl == null) newUrl = "";
+        mUrlEditText.setText(newUrl);
 
-        if (mUrlEditText.isEmpty()) {
-            String fixedUrl = UrlUtilities.fixupUrl(mUrlEditText.getTrimmedText());
-            if (fixedUrl != null) mEnhancedBookmarksModel.setBookmarkUrl(mBookmarkId, fixedUrl);
-        }
+        if (!mTitleEditText.validate() || !mUrlEditText.validate()) return;
 
-        super.onStop();
+        mEnhancedBookmarksModel.setBookmarkTitle(mBookmarkId, newTitle);
+        mEnhancedBookmarksModel.setBookmarkUrl(mBookmarkId, newUrl);
+        super.onBackPressed();
     }
+
     @Override
     protected void onDestroy() {
         mEnhancedBookmarksModel.removeObserver(mBookmarkModelObserver);