Merge pull request #9 from mouyase/dev

v4.4.3(443006)
mouyase · Nov 3, 2019 · 335356c · 335356c
2 parents edee232 + 8262501
commit 335356c
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 75 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,15 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
     defaultConfig {
         applicationId "tech.yojigen.pivisionm"
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 29
-        versionCode 443005
-        versionName '4.4.3(443005)'
+        versionCode 443006
+        versionName '4.4.3(443006)'
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
     }
@@ -63,8 +65,10 @@ dependencies {
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
+//    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
+    //向下兼容4.4
+    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.6'
 
     implementation 'com.squareup.retrofit2:retrofit:2.6.1'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.1'

diff --git a/app/src/main/java/com/reiya/pixiv/article/ArticleActivity.java b/app/src/main/java/com/reiya/pixiv/article/ArticleActivity.java
@@ -11,7 +11,6 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -43,13 +42,13 @@ protected void onCreate(Bundle savedInstanceState) {
         webView.getSettings().setJavaScriptEnabled(true);
         webView.setWebViewClient(new WebViewClient() {
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-            @Nullable
+
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
                 return super.shouldInterceptRequest(view, request);
             }
 
-            @Nullable
+
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
                 return super.shouldInterceptRequest(view, url);

diff --git a/app/src/main/java/com/reiya/pixiv/collection/FavoriteWorksFragment.java b/app/src/main/java/com/reiya/pixiv/collection/FavoriteWorksFragment.java
@@ -7,7 +7,6 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 
@@ -45,7 +44,7 @@ public static FavoriteWorksFragment newInstance(int page) {
         return fragment;
     }
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mPresenter = new CollectionPresenter();

diff --git a/app/src/main/java/com/reiya/pixiv/concern/FavoriteUsersFragment.java b/app/src/main/java/com/reiya/pixiv/concern/FavoriteUsersFragment.java
@@ -7,7 +7,6 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -43,7 +42,7 @@ public static FavoriteUsersFragment newInstance(int page) {
         return fragment;
     }
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mPresenter = new ConcernPresenter();

diff --git a/app/src/main/java/com/reiya/pixiv/dialog/LoginDialog.java b/app/src/main/java/com/reiya/pixiv/dialog/LoginDialog.java
@@ -9,7 +9,6 @@
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.textfield.TextInputLayout;
@@ -22,7 +21,7 @@
 public class LoginDialog extends DialogFragment {
     private LoginListener listener;
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.dialog_login, null);

diff --git a/app/src/main/java/com/reiya/pixiv/group/GroupFragment.java b/app/src/main/java/com/reiya/pixiv/group/GroupFragment.java
@@ -6,7 +6,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.reiya.pixiv.image.ImageLoader;
@@ -41,9 +40,9 @@ public void onCreate(Bundle savedInstanceState) {
 //        urlBig = getArguments().getString(URL_BIG);
     }
 
-    @Nullable
+
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final ImageView iv = new ImageView(getActivity().getApplicationContext());
         if (!url.equals("")) {
             ImageLoader.loadImage(getActivity(), url)

diff --git a/app/src/main/java/com/reiya/pixiv/group/GroupViewActivity.java b/app/src/main/java/com/reiya/pixiv/group/GroupViewActivity.java
@@ -14,8 +14,6 @@
 import com.reiya.pixiv.bean.Work;
 import com.reiya.pixiv.util.ItemOperation;
 
-import org.jetbrains.annotations.NotNull;
-
 import tech.yojigen.pivisionm.R;
 
 public class GroupViewActivity extends AppCompatActivity implements View.OnClickListener {
@@ -86,7 +84,7 @@ class GroupPagerAdapter extends FragmentPagerAdapter {
             this.count = count;
         }
 
-        @NotNull
+
         @Override
         public Fragment getItem(int position) {
             return GroupFragment.newInstance(position, mWork.getImageUrl(2, position));

diff --git a/app/src/main/java/com/reiya/pixiv/main/RecommendFragment.java b/app/src/main/java/com/reiya/pixiv/main/RecommendFragment.java
@@ -7,8 +7,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.material.snackbar.Snackbar;
 import com.reiya.pixiv.adapter.ImageAdapter;
 import com.reiya.pixiv.bean.Work;
@@ -39,14 +37,14 @@ public static RecommendFragment newInstance() {
     }
 
     @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mBlacklist = PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(getString(R.string.key_blacklist), "").split("\n");
     }
 
-    @Nullable
+
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mRecyclerView = (LoaderRecyclerView) inflater.inflate(R.layout.recycler_view, container, false);
         mAdapter = new ImageAdapter(getActivity());
         mAdapter.setBlackList(mBlacklist);
@@ -82,7 +80,7 @@ public void onNext(HttpService.RecommendResponse recommendResponse) {
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         getList();
     }

diff --git a/app/src/main/java/com/reiya/pixiv/main/SubscribeFragment.java b/app/src/main/java/com/reiya/pixiv/main/SubscribeFragment.java
@@ -6,8 +6,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.material.snackbar.Snackbar;
 import com.reiya.pixiv.adapter.ImageAdapter;
 import com.reiya.pixiv.network.HttpService;
@@ -38,14 +36,14 @@ public static SubscribeFragment newInstance() {
     }
 
     @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mBlacklist = PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(getString(R.string.key_blacklist), "").split("\n");
     }
 
-    @Nullable
+
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mRecyclerView = (LoaderRecyclerView) inflater.inflate(R.layout.recycler_view, container, false);
         mAdapter = new ImageAdapter(getActivity());
         mAdapter.setBlackList(mBlacklist);
@@ -81,7 +79,7 @@ public void onNext(HttpService.IllustListResponse illustListResponse) {
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (UserData.isLoggedIn()) {
             getList();

diff --git a/app/src/main/java/com/reiya/pixiv/network/fuckgfw/PixivDNS.java b/app/src/main/java/com/reiya/pixiv/network/fuckgfw/PixivDNS.java
@@ -1,6 +1,5 @@
 package com.reiya.pixiv.network.fuckgfw;
 
-import org.jetbrains.annotations.NotNull;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -64,8 +63,7 @@ public static PixivDNS getInstance() {
     }
 
 
-    @NotNull
-    public List<InetAddress> lookup(@NotNull String s) throws UnknownHostException {
+    public List<InetAddress> lookup(String s) throws UnknownHostException {
         if (s.contains("pixiv.net")) {
             try {
                 return newDns;

diff --git a/app/src/main/java/com/reiya/pixiv/network/fuckgfw/PixivSSLSocketFactory.java b/app/src/main/java/com/reiya/pixiv/network/fuckgfw/PixivSSLSocketFactory.java
@@ -3,9 +3,6 @@
 
 import android.net.SSLCertificateSocketFactory;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -28,28 +25,28 @@ public static PixivSSLSocketFactory getInstance() {
         return mPixivSSLSocketFactory;
     }
 
-    @Nullable
-    public Socket createSocket(@Nullable String paramString, int paramInt) {
+
+    public Socket createSocket(String paramString, int paramInt) {
         return null;
     }
 
-    @Nullable
-    public Socket createSocket(@Nullable String paramString, int paramInt1, @Nullable InetAddress paramInetAddress, int paramInt2) {
+
+    public Socket createSocket(String paramString, int paramInt1, InetAddress paramInetAddress, int paramInt2) {
         return null;
     }
 
-    @Nullable
-    public Socket createSocket(@Nullable InetAddress paramInetAddress, int paramInt) {
+
+    public Socket createSocket(InetAddress paramInetAddress, int paramInt) {
         return null;
     }
 
-    @Nullable
-    public Socket createSocket(@Nullable InetAddress paramInetAddress1, int paramInt1, @Nullable InetAddress paramInetAddress2, int paramInt2) {
+
+    public Socket createSocket(InetAddress paramInetAddress1, int paramInt1, InetAddress paramInetAddress2, int paramInt2) {
         return null;
     }
 
-    @NotNull
-    public Socket createSocket(@Nullable Socket paramSocket, @Nullable String paramString, int paramInt, boolean paramBoolean) throws IOException {
+
+    public Socket createSocket(Socket paramSocket, String paramString, int paramInt, boolean paramBoolean) throws IOException {
         if (paramSocket == null)
             Intrinsics.throwNpe();
         InetAddress inetAddress = paramSocket.getInetAddress();
@@ -77,12 +74,12 @@ public Socket createSocket(@Nullable Socket paramSocket, @Nullable String paramS
         throw new TypeCastException("null cannot be cast to non-null type android.net.SSLCertificateSocketFactory");
     }
 
-    @NotNull
+
     public String[] getDefaultCipherSuites() {
         return new String[0];
     }
 
-    @NotNull
+
     public String[] getSupportedCipherSuites() {
         return new String[0];
     }

diff --git a/app/src/main/java/com/reiya/pixiv/profile/ProfileFragment.java b/app/src/main/java/com/reiya/pixiv/profile/ProfileFragment.java
@@ -9,7 +9,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 
 import com.reiya.pixiv.adapter.ImageAdapter;
@@ -55,9 +54,9 @@ public void onCreate(Bundle savedInstanceState) {
         mPresenter.setView(this);
     }
 
-    @Nullable
+
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         switch (mPage) {
             case 1:
                 mView = LayoutInflater.from(getActivity()).inflate(R.layout.layout_profile_info, null);
@@ -85,7 +84,7 @@ public void load() {
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         switch (mPage) {
             case 0:

diff --git a/app/src/main/java/com/reiya/pixiv/ranking/RankingFragment.java b/app/src/main/java/com/reiya/pixiv/ranking/RankingFragment.java
@@ -6,7 +6,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -59,7 +58,7 @@ public void onCreate(Bundle savedInstanceState) {
         mPresenter.setView(this);
     }
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final String type = TYPE[mPage];

diff --git a/app/src/main/java/com/reiya/pixiv/search/SearchActivity.java b/app/src/main/java/com/reiya/pixiv/search/SearchActivity.java
@@ -27,8 +27,6 @@
 import com.reiya.pixiv.network.NetworkRequest;
 import com.reiya.pixiv.view.WorkGridLayoutManager;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -174,7 +172,7 @@ class MyFragmentPagerAdapter extends FragmentPagerAdapter {
             fragmentTransaction.commitNow();
         }
 
-        @NotNull
+
         @Override
         public Fragment getItem(int position) {
             return SearchFragment.newInstance(position, mKeyword);