Add the entry of My Tags

app/src/main/java/com/hippo/ehviewer/client/EhUrl.java

@@ -61,6 +61,9 @@ public class EhUrl {
     public static final String UCONFIG_E = HOST_E + "uconfig.php";
     public static final String UCONFIG_EX = HOST_EX + "uconfig.php";
 
+    public static final String MY_TAGS_E = HOST_E + "mytags";
+    public static final String MY_TAGS_EX = HOST_EX + "mytags";
+
     private static final String URL_PREFIX_THUMB_E = "https://ul.ehgt.org/";
     private static final String URL_PREFIX_THUMB_EX = "https://exhentai.org/t/";
 
@@ -128,6 +131,16 @@ public class EhUrl {
         }
     }
 
+    public static String getMyTagsUrl() {
+        switch (Settings.getGallerySite()) {
+            default:
+            case SITE_E:
+                return MY_TAGS_E;
+            case SITE_EX:
+                return MY_TAGS_EX;
+        }
+    }
+
     public static String getGalleryDetailUrl(long gid, String token, int index, boolean allComment) {
         UrlBuilder builder = new UrlBuilder(getHost() + "g/" + gid + '/' + token + '/');
         if (index != 0) {

app/src/main/java/com/hippo/ehviewer/ui/MyTagsActivity.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.ui;
+
+import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import androidx.annotation.Nullable;
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.client.EhCookieStore;
+import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.widget.DialogWebChromeClient;
+import com.hippo.widget.ProgressView;
+import okhttp3.Cookie;
+import okhttp3.HttpUrl;
+
+public class MyTagsActivity extends ToolbarActivity {
+
+  private WebView webView;
+  private ProgressView progress;
+  private String url;
+
+  @SuppressLint("SetJavaScriptEnabled")
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // http://stackoverflow.com/questions/32284642/how-to-handle-an-uncatched-exception
+    CookieManager cookieManager = CookieManager.getInstance();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      cookieManager.flush();
+      cookieManager.removeAllCookies(null);
+      cookieManager.removeSessionCookies(null);
+    } else {
+      CookieSyncManager cookieSyncManager = CookieSyncManager.createInstance(this);
+      cookieSyncManager.startSync();
+      cookieManager.removeAllCookie();
+      cookieManager.removeSessionCookie();
+      cookieSyncManager.stopSync();
+    }
+
+    // Copy cookies from okhttp cookie store to CookieManager
+    url = EhUrl.getMyTagsUrl();
+    EhCookieStore store = EhApplication.getEhCookieStore(this);
+    for (Cookie cookie : store.getCookies(HttpUrl.parse(url))) {
+      cookieManager.setCookie(url, cookie.toString());
+    }
+
+    setContentView(R.layout.activity_my_tags);
+    setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
+    webView = findViewById(R.id.webview);
+    webView.getSettings().setJavaScriptEnabled(true);
+    webView.setWebViewClient(new MyTagsWebViewClient());
+    webView.setWebChromeClient(new DialogWebChromeClient(this));
+    webView.loadUrl(url);
+    progress = findViewById(R.id.progress);
+  }
+
+  private class MyTagsWebViewClient extends WebViewClient {
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+      // Never load other urls
+      return !url.equals(MyTagsActivity.this.url);
+    }
+
+    @Override
+    public void onPageStarted(WebView view, String url, Bitmap favicon) {
+      progress.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onPageFinished(WebView view, String url) {
+      progress.setVisibility(View.GONE);
+    }
+  }
+}

app/src/main/java/com/hippo/ehviewer/ui/UConfigActivity.java

@@ -21,8 +21,6 @@ package com.hippo.ehviewer.ui;
  */
 
 import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
@@ -31,20 +29,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.EditText;
-import android.widget.TextView;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import com.google.android.material.snackbar.Snackbar;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.widget.DialogWebChromeClient;
 import com.hippo.widget.ProgressView;
 import okhttp3.Cookie;
 import okhttp3.HttpUrl;
@@ -87,7 +80,7 @@ public class UConfigActivity extends ToolbarActivity {
     webView = (WebView) findViewById(R.id.webview);
     webView.getSettings().setJavaScriptEnabled(true);
     webView.setWebViewClient(new UConfigWebViewClient());
-    webView.setWebChromeClient(new UConfigWebChromeClient());
+    webView.setWebChromeClient(new DialogWebChromeClient(this));
     webView.loadUrl(url);
     progress = (ProgressView) findViewById(R.id.progress);
 
@@ -183,69 +176,4 @@ public class UConfigActivity extends ToolbarActivity {
       loaded = true;
     }
   }
-
-  private class UConfigWebChromeClient extends WebChromeClient {
-
-    private Context context = UConfigActivity.this;
-
-    @Override
-    public boolean onJsPrompt(WebView view, String url, String message, String defaultValue,
-        final JsPromptResult result) {
-
-      View promptView = UConfigActivity.this.getLayoutInflater()
-          .inflate(R.layout.dialog_js_prompt, null, false);
-      TextView messageView = (TextView) promptView.findViewById(R.id.message);
-      messageView.setText(message);
-      final EditText valueView = (EditText) promptView.findViewById(R.id.value);
-      valueView.setText(defaultValue);
-
-      new AlertDialog.Builder(context)
-          .setView(promptView)
-          .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-              result.confirm(valueView.getText().toString());
-            }
-          })
-          .setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialog) {
-              result.cancel();
-            }
-          })
-          .show();
-
-      return true;
-    }
-
-    private void showMessageDialog(String message, final JsResult result) {
-      new AlertDialog.Builder(context)
-          .setMessage(message)
-          .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-              result.confirm();
-            }
-          })
-          .setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialog) {
-              result.cancel();
-            }
-          })
-          .show();
-    }
-
-    @Override
-    public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
-      showMessageDialog(message, result);
-      return true;
-    }
-
-    @Override
-    public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
-      showMessageDialog(message, result);
-      return true;
-    }
-  }
 }

app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.widget;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.webkit.JsPromptResult;
+import android.webkit.JsResult;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import com.hippo.ehviewer.R;
+
+public class DialogWebChromeClient extends WebChromeClient {
+
+  private Context context;
+
+  public DialogWebChromeClient(Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
+    new AlertDialog.Builder(view.getContext())
+        .setMessage(message)
+        .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm())
+        .setOnCancelListener(dialog -> result.cancel())
+        .show();
+    return true;
+  }
+
+  @Override
+  public boolean onJsConfirm(WebView view, String url, String message, JsResult result) {
+    new AlertDialog.Builder(view.getContext())
+        .setMessage(message)
+        .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm())
+        .setNegativeButton(android.R.string.cancel, (dialog, which) -> result.cancel())
+        .setOnCancelListener(dialog -> result.cancel())
+        .show();
+    return true;
+  }
+
+  @Override
+  public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+    LayoutInflater inflater = LayoutInflater.from(context);
+    View promptView = inflater.inflate(R.layout.dialog_js_prompt, null, false);
+    TextView messageView = promptView.findViewById(R.id.message);
+    messageView.setText(message);
+    final EditText valueView = promptView.findViewById(R.id.value);
+    valueView.setText(defaultValue);
+
+    new AlertDialog.Builder(context)
+        .setView(promptView)
+        .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm(valueView.getText().toString()))
+        .setOnCancelListener(dialog -> result.cancel())
+        .show();
+
+    return true;
+  }
+}