From c4cd9653062e5b38734038c9005995bdb6704ae6 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 3 Dec 2016 19:38:49 +0800
Subject: [PATCH] Add excluding japanese original Eh site doesn't support it,
 but just modifying the cookie works fine.

---
 .../com/hippo/ehviewer/client/EhConfig.java   |  1 +
 .../ui/ExcludedLanguagesActivity.java         | 19 ++++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhConfig.java b/app/src/main/java/com/hippo/ehviewer/client/EhConfig.java
index d1650d714..600c5851c 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhConfig.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhConfig.java
@@ -299,6 +299,7 @@ public class EhConfig implements Cloneable {
     public static final int NAMESPACES_MALE = 0x40;
     public static final int NAMESPACES_FEMALE = 0x80;
 
+    public static final String JAPANESE_ORIGINAL = "0";
     public static final String JAPANESE_TRANSLATED = "1024";
     public static final String JAPANESE_REWRITE = "2048";
     public static final String ENGLISH_ORIGINAL = "1";
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java
index 53f6a1693..bc637baeb 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java
@@ -61,6 +61,7 @@ public class ExcludedLanguagesActivity extends ToolbarActivity
     };
 
     private static final String[] LANGUAGES = {
+            EhConfig.JAPANESE_ORIGINAL,
             EhConfig.JAPANESE_TRANSLATED,
             EhConfig.JAPANESE_REWRITE,
             EhConfig.ENGLISH_ORIGINAL,
@@ -207,8 +208,8 @@ public class ExcludedLanguagesActivity extends ToolbarActivity
                 String pattern = LANGUAGES[j];
                 if (pattern.equals(language)) {
                     // Get it
-                    int row = (j + 1) / 3;
-                    int column = (j + 1) % 3;
+                    int row = j / 3;
+                    int column = j % 3;
                     mSelections[row][column] = true;
                     break;
                 }
@@ -282,22 +283,19 @@ public class ExcludedLanguagesActivity extends ToolbarActivity
             finish();
         } else if (v == mOk) {
             StringBuilder sb = new StringBuilder();
-            int i = -1;
+            int i = 0;
             boolean first = true;
             for (boolean[] selections : mSelections) {
                 for (boolean b : selections) {
-                    i++;
-                    if (i == 0) {
-                        continue;
-                    }
                     if (b) {
                         if (!first) {
                             sb.append("x");
                         } else {
                             first = false;
                         }
-                        sb.append(LANGUAGES[i - 1]);
+                        sb.append(LANGUAGES[i]);
                     }
+                    i++;
                 }
             }
 
@@ -383,11 +381,6 @@ public class ExcludedLanguagesActivity extends ToolbarActivity
         @Override
         public void onBindViewHolder(LanguageHolder holder, int position) {
             holder.language.setText(LANGUAGE_STR_IDS[position]);
-            if (position == 0) {
-                holder.original.setVisibility(View.INVISIBLE);
-            } else {
-                holder.original.setVisibility(View.VISIBLE);
-            }
             boolean[] selections = mSelections[position];
             holder.original.setChecked(selections[0]);
             holder.translated.setChecked(selections[1]);