Merge pull request #4451 from bijupmb/TIMOB-14505-NullPointerExceptio…

…nAlertDialogReusing TIMOB-14505 set activity for avoid null exception
tidev · Jul 19, 2013 · 40fdfbb · 40fdfbb
2 parents a725858 + d99482e
commit 40fdfbb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDialog.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDialog.java
@@ -253,6 +253,10 @@ public void show(KrollDict options)
 	{
 		AlertDialog dialog = dialogWrapper.getDialog();
 		if (dialog == null) {
+			if (dialogWrapper.getActivity() == null) {
+				TiBaseActivity dialogActivity = (TiBaseActivity) getCurrentActivity();
+				dialogWrapper.setActivity(new WeakReference<TiBaseActivity>(dialogActivity));
+			}
 			processProperties(proxy.getProperties());
 			getBuilder().setOnCancelListener(new OnCancelListener() {
 				@Override

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -103,9 +103,18 @@ public DialogWrapper(AlertDialog d, boolean persistent, WeakReference<TiBaseActi
 
 		public TiBaseActivity getActivity()
 		{
-			return dialogActivity.get();
+			if (dialogActivity == null) {
+				return null;
+			} else {
+				return dialogActivity.get();
+			}
 		}
-
+
+		public void setActivity(WeakReference<TiBaseActivity> da)
+		{
+			dialogActivity = da;
+		}
+
 		public AlertDialog getDialog() {
 			return dialog;
 		}