Skip to content

Commit af5a723

Browse files
committed
Merge pull request #24 from HTChang/fix
Should check the nullity of getActivity() in ParseLoginFragmentBase
2 parents 60ac62d + 22cd790 commit af5a723

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ParseLoginUI/src/com/parse/ui/ParseLoginFragmentBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import android.annotation.TargetApi;
2525
import android.os.Build;
2626
import android.support.v4.app.Fragment;
27+
import android.support.v4.app.FragmentActivity;
2728
import android.util.Log;
2829
import android.widget.Toast;
2930

@@ -76,10 +77,11 @@ protected void debugLog(String text) {
7677

7778
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
7879
protected boolean isActivityDestroyed() {
80+
FragmentActivity activity = getActivity();
7981
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
80-
return getActivity().isDestroyed();
82+
return activity == null || activity.isDestroyed();
8183
} else {
82-
return ((ParseLoginActivity) getActivity()).isDestroyed();
84+
return activity == null || ((ParseLoginActivity) activity).isDestroyed();
8385
}
8486
}
8587
}

0 commit comments

Comments
 (0)