Change get-cookie action

seven332 · Jan 2, 2018 · 8ea93d9 · 8ea93d9
1 parent 6d188ad
commit 8ea93d9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/app/src/main/java/com/hippo/nimingban/ui/fragment/TypeSendFragment.java b/app/src/main/java/com/hippo/nimingban/ui/fragment/TypeSendFragment.java
@@ -53,7 +53,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.hippo.app.ProgressDialogBuilder;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.SimpleHolder;
@@ -77,12 +76,14 @@
 import com.hippo.nimingban.ui.DoodleActivity;
 import com.hippo.nimingban.ui.DraftActivity;
 import com.hippo.nimingban.ui.GalleryActivity2;
+import com.hippo.nimingban.ui.QRCodeScanActivity;
 import com.hippo.nimingban.util.BitmapUtils;
 import com.hippo.nimingban.util.DB;
+import com.hippo.nimingban.util.OpenUrlHelper;
 import com.hippo.nimingban.util.ReadableTime;
 import com.hippo.nimingban.util.Settings;
-import com.hippo.nimingban.widget.NMBEditText;
 import com.hippo.nimingban.widget.FontTextView;
+import com.hippo.nimingban.widget.NMBEditText;
 import com.hippo.ripple.Ripple;
 import com.hippo.util.DrawableManager;
 import com.hippo.util.ExceptionUtils;
@@ -93,7 +94,6 @@
 import com.hippo.yorozuya.Messenger;
 import com.hippo.yorozuya.ResourcesUtils;
 import com.hippo.yorozuya.SimpleHandler;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -743,14 +743,8 @@ public void run() {
     }
 
     private void getCookies() {
-        showProgressDialog(R.string.getting_cookies);
-
-        NMBRequest request = new NMBRequest();
-        mNMBRequest = request;
-        request.setSite(mSite);
-        request.setMethod(NMBClient.METHOD_GET_COOKIE);
-        request.setCallback(new GetCookieListener());
-        mNMBClient.execute(request);
+        String url = "http://adnmb.com/Member/User/Index/sendRegister.html";
+        OpenUrlHelper.openUrl(getActivity(), url, false);
     }
 
     private void tryGettingCookies() {
@@ -761,6 +755,10 @@ public void onClick(DialogInterface dialog, int which) {
                     case DialogInterface.BUTTON_POSITIVE:
                         getCookies();
                         break;
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        Intent intent = new Intent(getActivity(), QRCodeScanActivity.class);
+                        startActivity(intent);
+                        break;
                     case DialogInterface.BUTTON_NEUTRAL:
                         doAction();
                         break;
@@ -770,8 +768,8 @@ public void onClick(DialogInterface dialog, int which) {
 
         new AlertDialog.Builder(getContext()).setTitle(R.string.no_cookies)
                 .setMessage(R.string.no_cookies_ac)
-                .setPositiveButton(android.R.string.ok, listener)
-                .setNegativeButton(android.R.string.cancel, listener)
+                .setPositiveButton(R.string.register, listener)
+                .setNegativeButton(R.string.add_cookies, listener)
                 .setNeutralButton(R.string.i_dont_care, listener).show();
     }
 

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -128,7 +128,9 @@
     <string name="image_search">搜图</string>
 
     <string name="no_cookies">没有 Cookies</string>
-    <string name="no_cookies_ac">似乎你没有饼干。尝试获取饼干？</string>
+    <string name="no_cookies_ac">似乎你没有饼干。要来注册并获取饼干？</string>
+    <string name="register">注册</string>
+    <string name="add_cookies">添加饼干</string>
     <string name="i_dont_care">我不在意</string>
     <string name="getting_cookies">获取饼干中…</string>
     <string name="got_cookies">拿到饼干了！</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -129,6 +129,8 @@
 
     <string name="no_cookies">No cookies</string>
     <string name="no_cookies_ac">Seems that you don\'t have cookie of AC Nimingban. Get cookie now?</string>
+    <string name="register">Register</string>
+    <string name="add_cookies">Add cookies</string>
     <string name="i_dont_care">I don\'t care</string>
     <string name="getting_cookies">Trying to get Cookie…</string>
     <string name="got_cookies">Got it! </string>