Merge pull request #3 from jormagar/dev

Merge dev into master
AndreaVitale · Dec 1, 2020 · fee0e5c · fee0e5c
2 parents 9df9b8d + 2e5f351
commit fee0e5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.1
+version: 5.0.2
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: av.imageview

diff --git a/android/src/av/imageview/AvImageView.java b/android/src/av/imageview/AvImageView.java
@@ -92,7 +92,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
     @Override
     public void release() {
         Activity act = TiApplication.getAppCurrentActivity();
-        if (!act.isFinishing() && !act.isDestroyed()) {
+        if (act != null && !act.isFinishing() && !act.isDestroyed()) {
             Glide.with(act).clear(this.imageView);
         }
 

diff --git a/android/src/av/imageview/ImageViewProxy.java b/android/src/av/imageview/ImageViewProxy.java
@@ -34,6 +34,13 @@ public TiUIView createView(Activity activity) {
 		return view;
 	}
 
+	@Override
+	public void onDestroy(Activity activity) {
+		super.onDestroy(activity);
+
+		this.activity = null;
+	}
+
 	protected AvImageView getView() {
 	    return (AvImageView) this.getOrCreateView();
     }