Skip to content

Commit b6c4677

Browse files
leanmazzuDylanVann
authored andcommitted
fix: Fix IllegalArgumentException crash (Android). (DylanVann#511)
Fix IllegalArgumentException crash when context was instance of ContextWrapper and activity was destroyed.
1 parent a5e3b9e commit b6c4677

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java

+21-9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.app.Activity;
44
import android.content.Context;
5+
import android.content.ContextWrapper;
56
import android.graphics.PorterDuff;
67
import android.os.Build;
78

@@ -182,32 +183,43 @@ private boolean isNullOrEmpty(final String url) {
182183

183184

184185
private static boolean isValidContextForGlide(final Context context) {
185-
if (context == null) {
186+
Activity activity = getActivityFromContext(context);
187+
188+
if (activity == null) {
186189
return false;
187190
}
191+
192+
return !isActivityDestroyed(activity);
193+
}
194+
195+
private static Activity getActivityFromContext(final Context context) {
188196
if (context instanceof Activity) {
189-
final Activity activity = (Activity) context;
190-
if (isActivityDestroyed(activity)) {
191-
return false;
192-
}
197+
return (Activity) context;
193198
}
194199

195200
if (context instanceof ThemedReactContext) {
196201
final Context baseContext = ((ThemedReactContext) context).getBaseContext();
197202
if (baseContext instanceof Activity) {
198-
final Activity baseActivity = (Activity) baseContext;
199-
return !isActivityDestroyed(baseActivity);
203+
return (Activity) baseContext;
204+
}
205+
206+
if (baseContext instanceof ContextWrapper) {
207+
final ContextWrapper contextWrapper = (ContextWrapper) baseContext;
208+
final Context wrapperBaseContext = contextWrapper.getBaseContext();
209+
if (wrapperBaseContext instanceof Activity) {
210+
return (Activity) wrapperBaseContext;
211+
}
200212
}
201213
}
202214

203-
return true;
215+
return null;
204216
}
205217

206218
private static boolean isActivityDestroyed(Activity activity) {
207219
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
208220
return activity.isDestroyed() || activity.isFinishing();
209221
} else {
210-
return activity.isFinishing() || activity.isChangingConfigurations();
222+
return activity.isDestroyed() || activity.isFinishing() || activity.isChangingConfigurations();
211223
}
212224

213225
}

0 commit comments

Comments
 (0)