支持注册

CeuiLiSA · Feb 10, 2021 · 6e9578c · 6e9578c
1 parent b5c2f2f
commit 6e9578c
Show file tree

Hide file tree

Showing 8 changed files with 362 additions and 36 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 162
-        versionName "2.7.0"
+        versionCode 163
+        versionName "3.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -165,8 +165,6 @@ dependencies {
 
     implementation 'com.hjq:toast:8.8'
 
-    implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
-
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java
@@ -288,8 +288,6 @@ public boolean onNavigationItemSelected(MenuItem item) {
                     intent = new Intent(mContext, TemplateActivity.class);
                     intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接");
                     intent.putExtra(Params.URL, "https://app-api.pixiv.net/web/v1/login?code_challenge=vMBcNztwMPd312YCAZNjat4Tf1xmqdZKV1eZJug24Nc&code_challenge_method=S256&client=pixiv-android");
-//                    intent.putExtra(Params.URL, "https://accounts.pixiv.net/login?prompt=select_account&return_to=https://app-api.pixiv.net/web/v1/users/auth/pixiv/start?code_challenge=Fqvio7cBvKtdLYeK-bNz8Cl7PvEcwI-OzkwBwxvC--k&code_challenge_method=S256&client=pixiv-ios&source=pixiv-ios&ref=");
-//                    intent.putExtra(Params.URL, "https://accounts.pixiv.net/login?prompt=select_account&return_to=https://app-api.pixiv.net/web/v1/users/auth/pixiv/start?code_challenge=GwlGmGStY2GdW6UogqEGnUkKtPFIFZfAx6Fb4w9u2KE&code_challenge_method=S256&client=pixiv-android&source=pixiv-android&ref=");
                     intent.putExtra(Params.TITLE, getString(R.string.now_login));
                     intent.putExtra(Params.PREFER_PRESERVE, true);
                 } else {

diff --git a/app/src/main/java/ceui/lisa/activities/OutWakeActivity.java b/app/src/main/java/ceui/lisa/activities/OutWakeActivity.java
@@ -155,8 +155,8 @@ public void doSomething(Void t) {
                                 Common.showToast("尝试登陆");
                                 String code = uri.getQueryParameter("code");
                                 Retro.getAccountApi().newLogin(
-                                        FragmentLogin.IOS_CLIENT_ID,
-                                        FragmentLogin.IOS_CLIENT_SECRET,
+                                        FragmentLogin.CLIENT_ID,
+                                        FragmentLogin.CLIENT_SECRET,
                                         FragmentLogin.AUTH_CODE,
                                         code,
                                         HostManager.get().getPkceItem().getVerify(),

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentLogin.java b/app/src/main/java/ceui/lisa/fragments/FragmentLogin.java
@@ -176,20 +176,24 @@ public void onClick(View v) {
                 intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接");
                 intent.putExtra(Params.URL, "https://app-api.pixiv.net/web/v1/login?code_challenge=" +
                                 HostManager.get().getPkceItem().getChallenge() +
-                        "&code_challenge_method=S256&client=pixiv-ios");
+                        "&code_challenge_method=S256&client=pixiv-android");
                 intent.putExtra(Params.TITLE, getString(R.string.now_login));
                 intent.putExtra(Params.PREFER_PRESERVE, true);
                 startActivity(intent);
             }
         });
+
         baseBind.sign.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (baseBind.signUserName.getText().toString().length() != 0) {
-                    sign();
-                } else {
-                    Common.showToast("请输入用户名", 3);
-                }
+                Intent intent = new Intent(mContext, TemplateActivity.class);
+                intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "网页链接");
+                intent.putExtra(Params.URL, "https://app-api.pixiv.net/web/v1/provisional-accounts/create?code_challenge=" +
+                        HostManager.get().getPkceItem().getChallenge() +
+                        "&code_challenge_method=S256&client=pixiv-android");
+                intent.putExtra(Params.TITLE, getString(R.string.now_sign));
+                intent.putExtra(Params.PREFER_PRESERVE, true);
+                startActivity(intent);
             }
         });
         baseBind.hasNoAccount.setOnClickListener(new View.OnClickListener() {