Improve compatibility

Author: bin456789

.travis.yml

@@ -8,7 +8,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.1
+    - build-tools-27.0.2
     - android-27
 
 script:

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.1'
+    buildToolsVersion '27.0.2'
     useLibrary 'org.apache.http.legacy'
     signingConfigs {
         release {
@@ -25,7 +25,7 @@ android {
         applicationId "bin.xposed.Unblock163MusicClient"
         minSdkVersion 9
         targetSdkVersion 27
-        versionCode 23
+        versionCode 24
         versionName = "0.0.${versionCode}"
         archivesBaseName = "${applicationId}-${versionName}"
     }

app/src/main/java/bin/xposed/Unblock163MusicClient/CloudMusicPackage.java

@@ -259,6 +259,7 @@ static class HttpEapi {
         private static boolean useOkHttp = false;
         private static Class clazz;
         private static Method m_getCookieString;
+        private static Class c_cookieClass;
         final Object httpBase;
 
         HttpEapi(Object httpBase) {
@@ -267,7 +268,12 @@ static class HttpEapi {
 
         static void init() throws PackageManager.NameNotFoundException, IllegalAccessException {
             if (!getFilteredClasses("okhttp3", null).isEmpty()) {
-                clazz = findClass("com.netease.cloudmusic.h.f.d.d", classLoader);
+                Pattern pattern = Pattern.compile("^com\\.netease\\.cloudmusic\\.[a-z]\\.f\\.d\\.d$");
+                List<String> list = getFilteredClasses(pattern, Collections.<String>reverseOrder());
+                if (list.isEmpty()) {
+                    throw new RuntimeException("init failed");
+                }
+                clazz = findClass(list.get(0), classLoader);
                 useOkHttp = true;
             } else {
                 Pattern pattern = Pattern.compile("^com\\.netease\\.cloudmusic\\.[a-z]\\.[a-z]$");
@@ -299,7 +305,11 @@ static Class getClazz() {
 
         static String getDefaultCookie() throws UnsupportedEncodingException, JSONException, InvocationTargetException, IllegalAccessException {
             if (useOkHttp) {
-                List list = (List) callMethod(callStaticMethod(findClass("com.netease.cloudmusic.h.e.a.a", classLoader), "a"), "d");
+                if (c_cookieClass == null) {
+                    String className = getClazz().getName().substring(0, PACKAGE_NAME.length() + 2) + ".e.a.a";
+                    c_cookieClass = findClass(className, classLoader);
+                }
+                List list = (List) callMethod(callStaticMethod(c_cookieClass, "a"), "d");
                 StringBuilder sb = new StringBuilder();
                 boolean first = true;
                 for (Object l : list) {

app/src/main/java/bin/xposed/Unblock163MusicClient/Handler.java

@@ -248,6 +248,7 @@ private static boolean processSong(JSONObject oldSongJson, int expectBr, String
                 if (preferSong.getPrefer() > oldSong.getPrefer()) {
                     oldSongJson.put("br", preferSong.br)
                             .put("code", 200)
+                            .put("flag", 0)
                             .put("gain", preferSong.gain)
                             .put("md5", preferSong.md5)
                             .put("size", preferSong.size)