Merge branch 'develop' into release_alpha

# Conflicts:
#	config.gradle

Author: shiqizhenyes

app/src/main/java/me/ghui/v2er/module/topic/TopicActivity.java

@@ -224,9 +224,6 @@ public void configOptionsMenu(Menu menu) {
         mFadeItem = menu.findItem(R.id.action_fade);
         mStickyItem = menu.findItem(R.id.action_sticky);
         mReportMenuItem = menu.findItem(R.id.action_report);
-        MenuItem replyMenuItem = menu.findItem(R.id.action_reply);
-        mIsHideReplyBtn = Pref.readBool(R.string.pref_key_hide_reply_btn);
-        replyMenuItem.setVisible(mIsHideReplyBtn);
         scanOrderMenuItem = menu.findItem(R.id.action_scan_order);
         scanOrderMenuItem.setTitle(mIsScanInOrder ? "顺序浏览" : "逆序浏览");
     }
@@ -407,6 +404,7 @@ protected void init() {
         setFirstLoadingDelay(300);
         shareElementAnimation();
 //        mReplyFabBtn.setVisibility(!mIsLogin || mIsHideReplyBtn ? View.GONE : VISIBLE);
+        mIsHideReplyBtn = Pref.readBool(R.string.pref_key_hide_reply_btn);
         if (!mIsLogin || mIsHideReplyBtn) {
             mReplyFabBtn.hide();
         } else mReplyFabBtn.show();

app/src/main/java/me/ghui/v2er/network/APIService.java

@@ -1,11 +1,14 @@
 package me.ghui.v2er.network;
 
+import android.util.Log;
+
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
@@ -18,6 +21,7 @@
 import me.ghui.v2er.BuildConfig;
 import me.ghui.v2er.util.Check;
 import me.ghui.v2er.util.L;
+import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -120,6 +124,26 @@ public Response intercept(Chain chain) throws IOException {
                         .build();
             }
             try {
+                if (request.url().host().startsWith(".")) {
+                    try {
+                        HttpUrl.Builder httpUrlBuilder = request.url().newBuilder()
+                                .host(Constants.WWW_HOST_NAME)
+                                .setEncodedPathSegment(0, "t");
+                        List<String> encodedPathSegments = request.url().encodedPathSegments();
+                        for (int i = 0; i < request.url().encodedPathSegments().size(); i++) {
+                            if (i < encodedPathSegments.size() - 1) {
+                                httpUrlBuilder.setEncodedPathSegment(i + 1, encodedPathSegments.get(i));
+                            } else {
+                                httpUrlBuilder.addEncodedPathSegment(encodedPathSegments.get(i));
+                            }
+                        }
+                        request = request.newBuilder()
+                                .url(httpUrlBuilder.build())
+                                .build();
+                    }catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
                 return chain.proceed(request);
             } catch (Exception e) {
                 e.printStackTrace();

app/src/main/java/me/ghui/v2er/network/Constants.java

@@ -9,5 +9,6 @@ public interface Constants {
     String HTTP_SCHEME = "http:";
     String BASE_URL = HTTPS_SCHEME + "//www.v2ex.com";
     String HOST_NAME = "v2ex.com";
+    String WWW_HOST_NAME = "www.v2ex.com";
     String PACKAGE_NAME = "me.ghui.v2ex";
 }