修复3.8.3解析authorid异常

build.gradle

@@ -1,11 +1,15 @@
+ext {
+    jks_path = '../keystore/nga.jks'
+}// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
         google()
         mavenCentral()
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
-
+        maven {url 'https://maven.aliyun.com/repository/google'}
         maven { url "https://www.jitpack.io" }
         maven { url 'https://repo1.maven.org/maven2/' }
 
@@ -22,6 +26,7 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven {url 'https://maven.aliyun.com/repository/google'}
         maven { url "https://www.jitpack.io" }
         maven { url 'https://repo1.maven.org/maven2/' }
         flatDir {
@@ -35,11 +40,11 @@ task clean(type: Delete) {
 }
 
 project.ext {
-    minSdkVersion = 23
+    minSdkVersion = 24
     targetSdkVersion = 30
     compileSdkVersion = 30
-    appVersionName = '3.7.6'
-    appVersionCode = 3076
+    appVersionName = '3.8.4'
+    appVersionCode = 3084
 
     fastJson = '1.1.71.android'
     rxAndroid = '2.1.1'
@@ -50,4 +55,6 @@ project.ext {
     androidxMaterial = '1.2.0'
 
     room_version = "2.4.1"
+
+    preference_version = "1.1.1"
 }

lib_common/build.gradle

@@ -62,4 +62,7 @@ dependencies {
 
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+
+    //noinspection KtxExtensionAvailable
+    implementation "androidx.preference:preference:$preference_version"
 }

lib_common/src/main/java/gov/anzong/androidnga/base/util/PreferenceUtils.java

@@ -1,24 +1,62 @@
 package gov.anzong.androidnga.base.util;
 
+import android.content.Context;
 import android.content.SharedPreferences;
+import android.text.TextUtils;
+
+import androidx.preference.PreferenceManager;
 
 import com.alibaba.fastjson.JSON;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * @author Justwen
  */
 public class PreferenceUtils {
 
+    @Deprecated
+    private static final String PREFERENCE_DEPRECATED = "perference";
+
     private static SharedPreferences sPreferences;
 
     static {
         sPreferences = ContextUtils.getDefaultSharedPreferences();
     }
 
+    public static void transfer(Context context) {
+       SharedPreferences oldPref = context.getSharedPreferences(PREFERENCE_DEPRECATED, Context.MODE_PRIVATE);
+       Map<String, ?> oldMap = oldPref.getAll();
+       if (!oldMap.isEmpty()) {
+           SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
+           for (Map.Entry<String, ?> entry : oldMap.entrySet()) {
+               String key = entry.getKey();
+               Object value = entry.getValue();
+               if (TextUtils.isEmpty(key)) {
+                   continue;
+               }
+               if (value instanceof Integer) {
+                   editor.putInt(key, (Integer) value);
+               } else if (value instanceof Boolean) {
+                   editor.putBoolean(key, (Boolean) value);
+               } else if (value instanceof String) {
+                   editor.putString(key, (String) value);
+               } else if (value instanceof Long) {
+                   editor.putLong(key, (Long) value);
+               } else if (value instanceof  Float) {
+                   editor.putFloat(key, (Float) value);
+               } else if (value instanceof Set<?>) {
+                   editor.putStringSet(key, (Set<String>) value);
+               }
+           }
+           oldPref.edit().clear().apply();
+           editor.apply();
+       }
+    }
+
     public static void putData(String key, String value) {
         sPreferences.edit().putString(key, value).apply();
     }
@@ -67,7 +105,7 @@ public static Set<String> getData(String key, Set<String> defValue) {
         return sPreferences.getStringSet(key, defValue);
     }
 
-    public static void putData(String key, List list) {
+    public static void putData(String key, List<?> list) {
         sPreferences.edit().putString(key, JSON.toJSONString(list)).apply();
     }
 

lib_common/src/main/java/gov/anzong/androidnga/base/widget/TabLayoutEx.java

@@ -1,8 +1,11 @@
 package gov.anzong.androidnga.base.widget;
 
 import android.content.Context;
+
 import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.nshmura.recyclertablayout.RecyclerTabLayout;
 
@@ -47,6 +50,18 @@ public TabAdapter(ViewPager viewPager) {
             super(viewPager);
         }
 
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            ViewHolder holder = super.onCreateViewHolder(parent, viewType);
+            holder.itemView.setOnClickListener(v -> {
+                int pos = holder.getAdapterPosition();
+                if (pos != NO_POSITION) {
+                    getViewPager().setCurrentItem(pos, false);
+                }
+            });
+            return holder;
+        }
+
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
             super.onBindViewHolder(holder, position);

lib_common/src/main/java/gov/anzong/androidnga/common/PreferenceKey.java

@@ -1,5 +1,7 @@
 package gov.anzong.androidnga.common;
 
+import android.preference.PreferenceManager;
+
 import gov.anzong.androidnga.base.util.ContextUtils;
 
 public class PreferenceKey {
@@ -8,7 +10,8 @@ public class PreferenceKey {
 
     public static final String PREFERENCE_SETTINGS = "perference";
 
-    public static final String PERFERENCE = "perference";
+    @Deprecated
+    public static final String PERFERENCE = PreferenceManager.getDefaultSharedPreferencesName(ContextUtils.getContext());
 
     String DOWNLOAD_IMG_QUALITY_NO_WIFI = "download_img_quality_without_wifi";
     public static final String ENABLE_NOTIFIACTION = "enableNotification";
@@ -113,4 +116,6 @@ public class PreferenceKey {
     @Deprecated
     public static final String DOWNLOAD_IMG_NO_WIFI = "down_load_without_wifi";
 
+    public static final String USER_AGENT = "preference_key_ua";
+
 }

lib_core/src/main/java/gov/anzong/androidnga/core/decode/ForumBasicDecoder.java

@@ -50,11 +50,11 @@ public String decode(String content, HtmlData htmlData) {
         content = StringUtils.replaceAll(content,
                 ignoreCaseTag
                         + "\\[b\\]Reply to \\[pid=(.+?),(.+?),(.+?)\\]Reply\\[/pid\\] (.+?)\\[/b\\]",
-                "[quote]Reply to [b]<a href='" + htmlData.getNGAHost() + "read.php?searchpost=1&pid=$1' style='font-weight: bold;color:#3181f4'>[Reply]</a> $4[/b][/quote]");
+                "[quote]Reply to [b]<a href='" + htmlData.getNGAHost() + "read.php?searchpost=1&pid=$1&tid=$2' style='font-weight: bold;color:#3181f4'>[Reply]</a> $4[/b][/quote]");
 
         content = StringUtils.replaceAll(content,
                 ignoreCaseTag + "\\[pid=(.+?),(.+?),(.+?)\\]Reply\\[/pid\\]",
-                "<a href='" + htmlData.getNGAHost() + "read.php?searchpost=1&pid=$1' style='font-weight: bold;color:#3181f4'>[Reply]</a>");
+                "<a href='" + htmlData.getNGAHost() + "read.php?searchpost=1&pid=$1&tid=$2' style='font-weight: bold;color:#3181f4'>[Reply]</a>");
 
         // 某些帖子会导致这个方法卡住, 暂时不清楚原因, 和这个方法的作用.... by elrond
         /*content = StringUtils.replaceAll(content, 

nga_phone_base_3.0/build.gradle

@@ -9,23 +9,15 @@ def static getDate() {
 
 }
 
-def isJenkins() {
-    return project.hasProperty('IS_JENKINS') && IS_JENKINS == 'true'
-}
-
 android {
     compileSdkVersion project.compileSdkVersion
 
     signingConfigs {
-        signingConfig {
-            if (isJenkins()) {
-                storeFile file('../../android19910914.keystore')
-            } else {
-                storeFile file('..\\keystore\\android19910914.keystore')
-            }
-            storePassword '19910914'
-            keyAlias 'android.keystore'
-            keyPassword '19910914'
+        release {
+            keyAlias 'jgw'
+            keyPassword '123456'
+            storeFile file(jks_path)
+            storePassword '123456'
         }
     }
 
@@ -52,7 +44,7 @@ android {
         }
 
         ndk {
-            abiFilters 'armeabi-v7a','arm64-v8a'
+            abiFilters 'arm64-v8a'
         }
     }
     compileOptions {
@@ -68,7 +60,7 @@ android {
             pseudoLocalesEnabled false
             minifyEnabled false
             zipAlignEnabled true
-            signingConfig signingConfigs.signingConfig
+            signingConfig signingConfigs.release
         }
         debug {
             debuggable true
@@ -140,6 +132,9 @@ dependencies {
     // kotlin
     implementation "androidx.core:core-ktx:1.3.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+    //noinspection KtxExtensionAvailable
+    implementation "androidx.preference:preference:$preference_version"
 }
 
 repositories {

nga_phone_base_3.0/src/main/java/android/preference/ListSummaryPreference.java → nga_phone_base_3.0/src/main/java/androidx/preference/ListSummaryPreference.java

@@ -1,14 +1,11 @@
-package android.preference;
+package androidx.preference;
 
 import android.content.Context;
-import android.preference.ListPreference;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-/**
- * Created by Justwen on 2017/7/16.
- */
+import androidx.annotation.NonNull;
 
 public class ListSummaryPreference extends ListPreference {
 
@@ -21,9 +18,9 @@ public ListSummaryPreference(Context context) {
     }
 
     @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-        TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
+    public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        TextView summaryView = holder.itemView.findViewById(android.R.id.summary);
         summaryView.setVisibility(View.VISIBLE);
         summaryView.setText(getEntry());
     }

nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/NgaClientApp.java

@@ -33,6 +33,7 @@ public class NgaClientApp extends Application {
     public void onCreate() {
         NLog.w(TAG, "app nga android start");
         ContextUtils.setApplication(this);
+        PreferenceUtils.transfer(this);
         checkNewVersion();
         VersionUpgradeHelper.upgrade();
         AppDatabase.init(this);

nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/activity/BaseActivity.java

@@ -1,7 +1,6 @@
 package gov.anzong.androidnga.activity;
 
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -45,7 +44,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mConfig = PhoneConfiguration.getInstance();
         updateWindowFlag();
         updateThemeUi();
-        setSwipeBackEnable(getSharedPreferences(PreferenceKey.PREFERENCE_SETTINGS, Context.MODE_PRIVATE).getBoolean(PreferenceKey.KEY_SWIPE_BACK, false));
+        setSwipeBackEnable(PreferenceUtils.getData(PreferenceKey.KEY_SWIPE_BACK, false));
         onCreateBeforeSuper(savedInstanceState);
         super.onCreate(savedInstanceState);
         onCreateAfterSuper(savedInstanceState);

nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/activity/ProfileActivity.java

@@ -207,6 +207,10 @@ private void loadBasicProfile(ProfileData profileInfo) {
         mUserEmailTv.setText(profileInfo.getEmailAddress());
         mUserTelTv.setText(profileInfo.getPhoneNumber());
         mUserGroupTv.setText(profileInfo.getMemberGroup());
+        TextView ipLocView = findViewById(R.id.tv_user_iploc);
+        if (ipLocView != null && profileInfo.ipLoc != null) {
+            ipLocView.setText(profileInfo.ipLoc);
+        }
         if (mCurrentUser) {
             mModifySignBtn.setVisibility(View.VISIBLE);
         } else {