Преглед на файлове

Stop asking for Overlay permission on RN >= 52

Guy Carmeli преди 6 години
родител
ревизия
b52ac6d057
променени са 2 файла, в които са добавени 9 реда и са изтрити 2 реда
  1. 5
    0
      lib/android/app/build.gradle
  2. 4
    2
      lib/android/app/src/main/java/com/reactnativenavigation/react/DevPermissionRequest.java

+ 5
- 0
lib/android/app/build.gradle Целия файл

50
     productFlavors {
50
     productFlavors {
51
         reactNative51 {
51
         reactNative51 {
52
             dimension "RNN.reactNativeVersion"
52
             dimension "RNN.reactNativeVersion"
53
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "51")
53
         }
54
         }
54
         reactNative55 {
55
         reactNative55 {
55
             dimension "RNN.reactNativeVersion"
56
             dimension "RNN.reactNativeVersion"
57
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "55")
56
         }
58
         }
57
         reactNative56 {
59
         reactNative56 {
58
             dimension "RNN.reactNativeVersion"
60
             dimension "RNN.reactNativeVersion"
61
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "56")
59
         }
62
         }
60
         reactNative57 {
63
         reactNative57 {
61
             dimension "RNN.reactNativeVersion"
64
             dimension "RNN.reactNativeVersion"
65
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "57")
62
         }
66
         }
63
         reactNative57WixFork {
67
         reactNative57WixFork {
64
             dimension "RNN.reactNativeVersion"
68
             dimension "RNN.reactNativeVersion"
69
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "57")
65
         }
70
         }
66
     }
71
     }
67
 }
72
 }

+ 4
- 2
lib/android/app/src/main/java/com/reactnativenavigation/react/DevPermissionRequest.java Целия файл

9
 import android.widget.Toast;
9
 import android.widget.Toast;
10
 
10
 
11
 import com.facebook.react.common.ReactConstants;
11
 import com.facebook.react.common.ReactConstants;
12
+import com.reactnativenavigation.BuildConfig;
12
 
13
 
13
 public class DevPermissionRequest {
14
 public class DevPermissionRequest {
14
 
15
 
20
 
21
 
21
 	public boolean shouldAskPermission(Activity activity) {
22
 	public boolean shouldAskPermission(Activity activity) {
22
 		return isDebug &&
23
 		return isDebug &&
23
-				Build.VERSION.SDK_INT >= 23 &&
24
-				!Settings.canDrawOverlays(activity);
24
+               Build.VERSION.SDK_INT >= 23 &&
25
+               BuildConfig.REACT_NATVE_VERSION_MINOR <= 51 &&
26
+               !Settings.canDrawOverlays(activity);
25
 	}
27
 	}
26
 
28
 
27
 	@TargetApi(23)
29
 	@TargetApi(23)