3.3.6

WangDaYeeeeee · Jul 16, 2018 · 2cc04bd · 2cc04bd
1 parent a307d32
commit 2cc04bd
Show file tree

Hide file tree

Showing 197 changed files with 482 additions and 389 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.wangdaye.mysplash"
         minSdkVersion 19
-        targetSdkVersion 27
-        versionCode 334
-        versionName "3.3.4"
+        targetSdkVersion 28
+        versionCode 336
+        versionName "3.3.6"
     }
     sourceSets {
         main {
@@ -98,14 +97,16 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0-alpha3'
+    implementation 'com.android.support:cardview-v7:28.0.0-alpha3'
+    implementation 'com.android.support:design:28.0.0-alpha3'
+    implementation 'com.android.support:support-v4:28.0.0-alpha3'
+    implementation 'com.android.support:customtabs:28.0.0-alpha3'
 
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
 
     implementation 'com.github.bumptech.glide:glide:3.7.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -171,11 +171,21 @@ public static java.lang.String TABLENAME;
 -dontwarn com.squareup.okhttp3.**
 -keep class com.squareup.okhttp3.** { *;}
 
-# Okio
+	# Okio
 -dontwarn com.squareup.**
 -dontwarn okio.**
+-dontwarn okhttp3.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+-dontwarn com.hitomi.**
 -keep public class org.codehaus.* { *; }
 -keep public class java.nio.* { *; }
+-keep class okio.** { *; }
+-keep interface okio.** { *; }
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class com.hitomi.** { *; }
+-keep interface com.hitomi.** { *; }
 
 # Retrofit
 -dontwarn retrofit2.**

diff --git a/release/Mysplash 3.3.4.apk → app/release/Mysplash 3.3.6.apk b/release/Mysplash 3.3.4.apk → app/release/Mysplash 3.3.6.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":334,"versionName":"3.3.4","enabled":true,"outputFile":"release-3.3.4.apk","fullName":"release","baseName":"release"},"path":"release-3.3.4.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":336,"versionName":"3.3.6","enabled":true,"outputFile":"Mysplash 3.3.6.apk","fullName":"release","baseName":"release"},"path":"Mysplash 3.3.6.apk","properties":{}}]
diff --git a/app/src/main/java/com/wangdaye/mysplash/Mysplash.java b/app/src/main/java/com/wangdaye/mysplash/Mysplash.java
@@ -15,10 +15,10 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import com.wangdaye.mysplash.common._basic.activity.LoadableActivity;
-import com.wangdaye.mysplash.common._basic.activity.RequestLoadActivity;
+import com.wangdaye.mysplash.common.basic.activity.LoadableActivity;
+import com.wangdaye.mysplash.common.basic.activity.RequestLoadActivity;
 import com.wangdaye.mysplash.common.data.entity.unsplash.Photo;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.utils.manager.CustomApiManager;
 import com.wangdaye.mysplash.main.view.activity.MainActivity;
 import com.wangdaye.mysplash.photo2.view.activity.PhotoActivity2;
@@ -49,10 +49,9 @@ public static Mysplash getInstance() {
 
     public static final String UNSPLASH_API_BASE_URL = "https://api.unsplash.com/";
     public static final String STREAM_API_BASE_URL = "https://api.getstream.io/";
-    public static final String UNSPLASH_TREND_FEEDING_URL = "napi/feeds/home";
-    public static final String UNSPLASH_FOLLOWING_FEED_URL = "napi/feeds/following";
+    public static final String UNSPLASH_TREND_FEEDING_URL = "feeds/home";
+    public static final String UNSPLASH_FOLLOWING_FEED_URL = "feeds/following";
     public static final String UNSPLASH_NODE_API_URL = "";
-    // public static final String UNSPLASH_NODE_API_URL = "napi/";
     public static final String UNSPLASH_URL = "https://unsplash.com/";
     public static final String UNSPLASH_JOIN_URL = "https://unsplash.com/join";
     public static final String UNSPLASH_SUBMIT_URL = "https://unsplash.com/submit";
@@ -155,6 +154,10 @@ public static boolean isDebug(Context c) {
         return false;
     }
 
+    public static boolean hasNode() {
+        return !TextUtils.isEmpty(UNSPLASH_NODE_API_URL);
+    }
+
     public static String getLoginUrl(Context c) {
         return Mysplash.UNSPLASH_URL + "oauth/authorize"
                 + "?client_id=" + getAppId(c, true)

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/activity/AboutActivity.java b/app/src/main/java/com/wangdaye/mysplash/about/view/activity/AboutActivity.java
@@ -6,7 +6,7 @@
 import android.support.v7.widget.RecyclerView;
 
 import com.wangdaye.mysplash.R;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.ui.widget.coordinatorView.StatusBarView;
 import com.wangdaye.mysplash.common.ui.widget.SwipeBackCoordinatorLayout;

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/AppHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/AppHolder.java
@@ -7,7 +7,7 @@
 import com.wangdaye.mysplash.Mysplash;
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.i.model.AboutModel;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.activity.IntroduceActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.utils.helper.DonateHelper;

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/CategoryHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/CategoryHolder.java
@@ -5,7 +5,7 @@
 
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.i.model.AboutModel;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.about.model.CategoryObject;
 

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/HeaderHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/HeaderHolder.java
@@ -8,7 +8,7 @@
 import com.wangdaye.mysplash.Mysplash;
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.i.model.AboutModel;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.ui.dialog.TotalDialog;
 import com.wangdaye.mysplash.common.utils.DisplayUtils;

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/LibraryHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/LibraryHolder.java
@@ -5,7 +5,7 @@
 
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.i.model.AboutModel;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.utils.DisplayUtils;
 import com.wangdaye.mysplash.common.utils.helper.IntentHelper;

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/TranslatorHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/TranslatorHolder.java
@@ -6,7 +6,7 @@
 
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.i.model.AboutModel;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.ui.widget.CircleImageView;
 import com.wangdaye.mysplash.common.utils.DisplayUtils;

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/model/widget/LoadObject.java b/app/src/main/java/com/wangdaye/mysplash/collection/model/widget/LoadObject.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.NonNull;
 
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.i.model.LoadModel;
 
 /**

diff --git a/.../java/com/wangdaye/mysplash/collection/presenter/activity/SwipeBackManageImplementor.java b/.../java/com/wangdaye/mysplash/collection/presenter/activity/SwipeBackManageImplementor.java
@@ -2,7 +2,7 @@
 
 import com.wangdaye.mysplash.common.i.presenter.SwipeBackManagePresenter;
 import com.wangdaye.mysplash.common.i.view.SwipeBackManageView;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 
 /**
  * Swipe back manage implementor.

diff --git a/...src/main/java/com/wangdaye/mysplash/collection/presenter/activity/ToolbarImplementor.java b/...src/main/java/com/wangdaye/mysplash/collection/presenter/activity/ToolbarImplementor.java
@@ -1,7 +1,7 @@
 package com.wangdaye.mysplash.collection.presenter.activity;
 
 import com.wangdaye.mysplash.R;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.data.entity.unsplash.Collection;
 import com.wangdaye.mysplash.common.i.presenter.ToolbarPresenter;
 import com.wangdaye.mysplash.common.utils.ShareUtils;

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/presenter/widget/LoadImplementor.java b/app/src/main/java/com/wangdaye/mysplash/collection/presenter/widget/LoadImplementor.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.NonNull;
 
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.i.model.LoadModel;
 import com.wangdaye.mysplash.common.i.presenter.LoadPresenter;
 import com.wangdaye.mysplash.common.i.view.LoadView;

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/presenter/widget/PhotosImplementor.java b/app/src/main/java/com/wangdaye/mysplash/collection/presenter/widget/PhotosImplementor.java
@@ -10,7 +10,7 @@
 import com.wangdaye.mysplash.common.i.model.PhotosModel;
 import com.wangdaye.mysplash.common.i.presenter.PhotosPresenter;
 import com.wangdaye.mysplash.common.i.view.PhotosView;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.PhotoAdapter;
 import com.wangdaye.mysplash.common.utils.helper.NotificationHelper;
 import com.wangdaye.mysplash.collection.model.widget.PhotosObject;
@@ -228,7 +228,7 @@ public void onRequestPhotosSuccess(Call<List<Photo>> call, Response<List<Photo>>
             } else {
                 view.setLoading(false);
             }
-            if (response.isSuccessful()) {
+            if (response.isSuccessful() && response.body() != null) {
                 model.setPhotosPage(page);
                 if (refresh) {
                     model.getAdapter().clearItem();

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/view/activity/CollectionActivity.java b/app/src/main/java/com/wangdaye/mysplash/collection/view/activity/CollectionActivity.java
@@ -17,7 +17,7 @@
 
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.collection.presenter.activity.PopupManageImplementor;
-import com.wangdaye.mysplash.common._basic.activity.LoadableActivity;
+import com.wangdaye.mysplash.common.basic.activity.LoadableActivity;
 import com.wangdaye.mysplash.common.data.entity.table.WallpaperSource;
 import com.wangdaye.mysplash.common.data.entity.unsplash.Photo;
 import com.wangdaye.mysplash.common.i.model.DownloadModel;

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/view/widget/CollectionPhotosView.java b/app/src/main/java/com/wangdaye/mysplash/collection/view/widget/CollectionPhotosView.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 
@@ -20,7 +21,7 @@
 import com.wangdaye.mysplash.common.i.model.ScrollModel;
 import com.wangdaye.mysplash.common.i.presenter.SwipeBackPresenter;
 import com.wangdaye.mysplash.common.i.view.SwipeBackView;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.PhotoAdapter;
 import com.wangdaye.mysplash.common.ui.dialog.SelectCollectionDialog;
 import com.wangdaye.mysplash.common.ui.widget.SwipeBackCoordinatorLayout;
@@ -223,7 +224,7 @@ public List<Photo> loadMore(List<Photo> list, int headIndex, boolean headDirecti
         if (!headDirection && photosPresenter.canLoadMore()) {
             photosPresenter.loadMore(getContext(), false);
         }
-        if (!ViewCompat.canScrollVertically(recyclerView, 1) && photosPresenter.isLoading()) {
+        if (!recyclerView.canScrollVertically(1) && photosPresenter.isLoading()) {
             refreshLayout.setLoading(true);
         }
 
@@ -329,7 +330,7 @@ public void onLoad() {
 
     private RecyclerView.OnScrollListener onScrollListener = new RecyclerView.OnScrollListener() {
         @Override
-        public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
             super.onScrolled(recyclerView, dx, dy);
             scrollPresenter.autoLoad(dy);
         }
@@ -458,12 +459,12 @@ public void autoLoad(int dy) {
                 && dy > 0) {
             photosPresenter.loadMore(getContext(), false);
         }
-        if (!ViewCompat.canScrollVertically(recyclerView, -1)) {
+        if (!recyclerView.canScrollVertically(-1)) {
             scrollPresenter.setToTop(true);
         } else {
             scrollPresenter.setToTop(false);
         }
-        if (!ViewCompat.canScrollVertically(recyclerView, 1) && photosPresenter.isLoading()) {
+        if (!recyclerView.canScrollVertically(1) && photosPresenter.isLoading()) {
             refreshLayout.setLoading(true);
         }
     }

diff --git a/...lash/common/_basic/AsynUpdateAdapter.java → ...plash/common/basic/AsynUpdateAdapter.java b/...lash/common/_basic/AsynUpdateAdapter.java → ...plash/common/basic/AsynUpdateAdapter.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 import android.os.Message;
 import android.support.v7.widget.RecyclerView;

diff --git a/.../mysplash/common/_basic/FlagRunnable.java → ...e/mysplash/common/basic/FlagRunnable.java b/.../mysplash/common/_basic/FlagRunnable.java → ...e/mysplash/common/basic/FlagRunnable.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 /**
  * Flag runnable.

diff --git a/...mysplash/common/_basic/FooterAdapter.java → .../mysplash/common/basic/FooterAdapter.java b/...mysplash/common/_basic/FooterAdapter.java → .../mysplash/common/basic/FooterAdapter.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 import android.support.annotation.ColorInt;
 import android.support.annotation.FloatRange;

diff --git a/...sh/common/_basic/MysplashPopupWindow.java → ...ash/common/basic/MysplashPopupWindow.java b/...sh/common/_basic/MysplashPopupWindow.java → ...ash/common/basic/MysplashPopupWindow.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,7 +12,7 @@
 
 import com.wangdaye.mysplash.Mysplash;
 import com.wangdaye.mysplash.R;
-import com.wangdaye.mysplash.common._basic.activity.MysplashActivity;
+import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 
 /**
  * Mysplash popup window.

diff --git a/...e/mysplash/common/_basic/Previewable.java → ...ye/mysplash/common/basic/Previewable.java b/...e/mysplash/common/_basic/Previewable.java → ...ye/mysplash/common/basic/Previewable.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 /**
  * Previewable.

diff --git a/...lash/common/_basic/TLSCompactService.java → ...plash/common/basic/TLSCompactService.java b/...lash/common/_basic/TLSCompactService.java → ...plash/common/basic/TLSCompactService.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 import android.os.Build;
 import android.util.Log;
@@ -8,6 +8,7 @@
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
@@ -25,7 +26,10 @@ public class TLSCompactService {
 
     protected OkHttpClient.Builder getClientBuilder() {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
-        if (Build.VERSION.SDK_INT < 22) {
+        builder.connectTimeout(15, TimeUnit.SECONDS)
+                .readTimeout(15, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             try {
                 SSLContext sc = SSLContext.getInstance("TLSv1.2");
                 sc.init(null, null, null);
@@ -46,8 +50,8 @@ protected OkHttpClient.Builder getClientBuilder() {
                         .followSslRedirects(true)
                         .retryOnConnectionFailure(true)
                         .cache(null);
-            } catch (Exception exc) {
-                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc);
+            } catch (Exception e) {
+                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", e);
             }
         }
         return builder;

diff --git a/.../wangdaye/mysplash/common/_basic/Tag.java → ...m/wangdaye/mysplash/common/basic/Tag.java b/.../wangdaye/mysplash/common/_basic/Tag.java → ...m/wangdaye/mysplash/common/basic/Tag.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic;
+package com.wangdaye.mysplash.common.basic;
 
 /**
  * Tag.

diff --git a/...mon/_basic/activity/LoadableActivity.java → ...mmon/basic/activity/LoadableActivity.java b/...mon/_basic/activity/LoadableActivity.java → ...mmon/basic/activity/LoadableActivity.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic.activity;
+package com.wangdaye.mysplash.common.basic.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;

diff --git a/...mon/_basic/activity/MysplashActivity.java → ...mmon/basic/activity/MysplashActivity.java b/...mon/_basic/activity/MysplashActivity.java → ...mmon/basic/activity/MysplashActivity.java
@@ -1,4 +1,4 @@
-package com.wangdaye.mysplash.common._basic.activity;
+package com.wangdaye.mysplash.common.basic.activity;
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
@@ -9,8 +9,8 @@
 import android.support.v7.app.AppCompatActivity;
 
 import com.wangdaye.mysplash.Mysplash;
-import com.wangdaye.mysplash.common._basic.fragment.MysplashDialogFragment;
-import com.wangdaye.mysplash.common._basic.MysplashPopupWindow;
+import com.wangdaye.mysplash.common.basic.fragment.MysplashDialogFragment;
+import com.wangdaye.mysplash.common.basic.MysplashPopupWindow;
 import com.wangdaye.mysplash.common.utils.DisplayUtils;
 import com.wangdaye.mysplash.common.utils.LanguageUtils;