Embedded proguard.txt file to AAR library which should get rid of Cla…

…ssNotFoundExceptions automatically
yasirkula · Apr 12, 2021 · d42e281 · d42e281
1 parent c3137fa
commit d42e281
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 22 deletions.
diff --git a/.github/AAR Source (Android)/proguard.txt b/.github/AAR Source (Android)/proguard.txt
@@ -0,0 +1 @@
+-keep class com.yasirkula.unity.* { *; }
diff --git a/.github/README.md b/.github/README.md
@@ -47,7 +47,7 @@ You can't. On iOS, these files are stored in an internal directory that we have
 
 - **Can't access the Gallery, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeGallery" in Logcat**
 
-If your project uses ProGuard, try adding the following line to ProGuard filters: `-keep class com.yasirkula.unity.* { *; }`
+If you are sure that your plugin is up-to-date, then enable **Custom Proguard File** option from *Player Settings* and add the following line to that file: `-keep class com.yasirkula.unity.* { *; }`
 
 - **Android build fails, it says "error: attribute android:requestLegacyExternalStorage not found" in Console**
 

diff --git a/Plugins/NativeGallery/Android/NGCallbackHelper.cs b/Plugins/NativeGallery/Android/NGCallbackHelper.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using UnityEngine;
 
 namespace NativeGalleryNamespace

diff --git a/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs b/Plugins/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using UnityEngine;
 
 namespace NativeGalleryNamespace

diff --git a/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs b/Plugins/NativeGallery/Android/NGPermissionCallbackAndroid.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using System.Threading;
 using UnityEngine;
 

diff --git a/Plugins/NativeGallery/Android/NativeGallery.aar b/Plugins/NativeGallery/Android/NativeGallery.aar
diff --git a/Plugins/NativeGallery/Editor/NGPostProcessBuild.cs b/Plugins/NativeGallery/Editor/NGPostProcessBuild.cs
@@ -1,7 +1,7 @@
-using System.IO;
+#if UNITY_IOS
+using System.IO;
 using UnityEditor;
 using UnityEngine;
-#if UNITY_IOS
 using UnityEditor.Callbacks;
 using UnityEditor.iOS.Xcode;
 #endif
@@ -19,17 +19,6 @@ public class NGPostProcessBuild
 		private const bool MINIMUM_TARGET_8_OR_ABOVE = false;
 #endif
 
-		[InitializeOnLoadMethod]
-		public static void ValidatePlugin()
-		{
-			string jarPath = "Assets/Plugins/NativeGallery/Android/NativeGallery.jar";
-			if( File.Exists( jarPath ) )
-			{
-				Debug.Log( "Deleting obsolete " + jarPath );
-				AssetDatabase.DeleteAsset( jarPath );
-			}
-		}
-
 #if UNITY_IOS
 #pragma warning disable 0162
 		[PostProcessBuild]

diff --git a/Plugins/NativeGallery/NativeGallery.cs b/Plugins/NativeGallery/NativeGallery.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using UnityEngine;
 using Object = UnityEngine.Object;
-#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS )
+#if UNITY_ANDROID || UNITY_IOS
 using NativeGalleryNamespace;
 #endif
 

diff --git a/Plugins/NativeGallery/README.txt b/Plugins/NativeGallery/README.txt
@@ -25,6 +25,8 @@ b. Manual Setup for iOS
 - insert "-weak_framework PhotosUI -weak_framework Photos -framework AssetsLibrary -framework MobileCoreServices -framework ImageIO" to the "Other Linker Flags" of Unity-iPhone Target (if your Deployment Target is at least 8.0, it is sufficient to insert "-weak_framework PhotosUI -framework Photos -framework MobileCoreServices -framework ImageIO")
 - lastly, remove Photos.framework and PhotosUI.framework from Link Binary With Libraries of Unity-iPhone Target in Build Phases, if exists
 
+IMPORTANT: If you are targeting iOS 14 or later, you need to build your app with Xcode 12 or later to avoid any permission issues.
+
 
 3. FAQ
 - How can I fetch the path of the saved image or the original path of the picked image on iOS?
@@ -34,7 +36,7 @@ You can't. On iOS, these files are stored in an internal directory that we have
 "android:requestLegacyExternalStorage" attribute in AndroidManifest.xml fixes a rare UnauthorizedAccessException on Android 10 but requires you to update your Android SDK to at least SDK 29. If this isn't possible for you, you should open NativeGallery.aar with WinRAR or 7-Zip and then remove the "<application ... />" tag from AndroidManifest.xml.
 
 - Can't access the Gallery, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeGallery" in Logcat
-If your project uses ProGuard, try adding the following line to ProGuard filters: -keep class com.yasirkula.unity.* { *; }
+If you are sure that your plugin is up-to-date, then enable "Custom Proguard File" option from Player Settings and add the following line to that file: -keep class com.yasirkula.unity.* { *; }
 
 - Nothing happens when I try to access the Gallery on Android
 Make sure that you've set the "Write Permission" to "External (SDCard)" in Player Settings.

diff --git a/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs b/Plugins/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_IOS
+#if UNITY_EDITOR || UNITY_IOS
 using UnityEngine;
 
 namespace NativeGalleryNamespace

diff --git a/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs b/Plugins/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_IOS
+#if UNITY_EDITOR || UNITY_IOS
 using UnityEngine;
 
 namespace NativeGalleryNamespace

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativegallery",
   "displayName": "Native Gallery",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "documentationUrl": "https://github.com/yasirkula/UnityNativeGallery",
   "changelogUrl": "https://github.com/yasirkula/UnityNativeGallery/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityNativeGallery/blob/master/LICENSE.txt",