Release 0.1.5

Fox2Code · Sep 17, 2022 · fc7b6f4 · fc7b6f4
1 parent ab568cb
commit fc7b6f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -62,6 +62,6 @@ repositories {
 
 // Add to existing dependencies block
 dependencies {
-    implementation 'com.github.Fox2Code:FoxCompat:0.1.4'
+    implementation 'com.github.Fox2Code:FoxCompat:0.1.5'
 }
 ```
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.0-rc01' apply false
-    id 'com.android.library' version '7.3.0-rc01' apply false
+    id 'com.android.application' version '7.3.0' apply false
+    id 'com.android.library' version '7.3.0' apply false
 }
 
 task clean(type: Delete) {

diff --git a/library/build.gradle b/library/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.github.Fox2Code'
-version = '0.1.4'
+version = '0.1.5'
 
 android {
     namespace 'com.fox2code.foxcompat'

diff --git a/library/src/main/java/com/fox2code/foxcompat/internal/FoxCompat.java b/library/src/main/java/com/fox2code/foxcompat/internal/FoxCompat.java
@@ -60,7 +60,6 @@ public final class FoxCompat {
     private static boolean hiddenApiBypass;
     private static boolean freeReflection;
     private static boolean hiddenApis;
-    private static Field asMutableMap;
 
     static {
         boolean samsungStatusBarManagerTmp, cyanogenModSettingsTmp,
@@ -170,41 +169,13 @@ public final class FoxCompat {
                 hiddenApis = true;
             } catch (Exception ignored) {}
         }
-        try {
-            (asMutableMap = Class.forName("java.util.Collections$UnmodifiableMap")
-                    .getDeclaredField("m")).setAccessible(true);
-        } catch (Exception ignored) {
-            asMutableMap = null;
-        }
     }
 
     // Hidden API block
     public static boolean checkReflection(Context context, int maxTargetSdk) {
-        return Build.VERSION.SDK_INT <= maxTargetSdk || getHiddenApiStatus(context);
-    }
-
-    public static boolean checkReflectionInternal(int maxTargetSdk) {
-        tryUnlockHiddenApisInternal();
-        return Build.VERSION.SDK_INT <= maxTargetSdk || hiddenApis;
-    }
-
-    @Nullable
-    @SuppressWarnings("unchecked")
-    public static <K, V> Map<K, V> makeMapMutable(Context context, Map<K, V> map) {
-        if (asMutableMap == null) {
-            if (!getHiddenApiStatus(context)) return null;
-            try {
-                (asMutableMap = Class.forName("java.util.Collections$UnmodifiableMap")
-                        .getDeclaredField("m")).setAccessible(true);
-            } catch (Exception ignored) {
-                return null;
-            }
-        }
-        try {
-            return (Map<K, V>) asMutableMap.get(map);
-        } catch (Exception e) {
-            return null;
-        }
+        int effectiveTargetSdk = Math.min(Build.VERSION.SDK_INT,
+                context.getApplicationInfo().targetSdkVersion);
+        return effectiveTargetSdk <= maxTargetSdk || getHiddenApiStatus(context);
     }
 
     public static void tryUnlockHiddenApisInternal() {
@@ -286,10 +257,11 @@ private static void setEdgeEffect(Object o, Field field, EdgeEffect edgeEffect)
                         return;
                     }
                 }
+                // Top need bottom direction and bottom need top direction.
                 setEdgeEffect(view, mEdgeGlowTop, new StretchEdgeEffect(
-                        context, view, StretchEdgeEffect.Direction.TOP));
-                setEdgeEffect(view, mEdgeGlowBottom, new StretchEdgeEffect(
                         context, view, StretchEdgeEffect.Direction.BOTTOM));
+                setEdgeEffect(view, mEdgeGlowBottom, new StretchEdgeEffect(
+                        context, view, StretchEdgeEffect.Direction.TOP));
             } else if (view instanceof HorizontalScrollView) {
                 view.setOverScrollMode(View.OVER_SCROLL_NEVER);
             }