diff options
author | Stefanos Togoulidis <stefanostogoulidis@gmail.com> | 2016-10-03 15:12:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 15:12:14 +0300 |
commit | e9306cab166f265a6f527b31e7ac267598dc3973 (patch) | |
tree | 659c1640e435a939a39fc6312ea47495a4e87d24 | |
parent | 4c800f8f8c4218994c48795323546db511e563cd (diff) | |
parent | 32b242727de44d778afe0b6e079170c2abb16336 (diff) | |
download | gradle-perf-android-medium-e9306cab166f265a6f527b31e7ac267598dc3973.tar.gz |
Merge pull request #4595 from wordpress-mobile/issue/editor454-fix-null-actionbar
Fix wordpress-mobile/WordPress-Editor-Android#454: getActionBar() was returning null on Android 7
-rw-r--r-- | libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java index 760d94c6e..70a995b01 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java @@ -214,10 +214,6 @@ public class ImageSettingsDialogFragment extends DialogFragment { } private ActionBar getActionBar() { - if (!isAdded()) { - return null; - } - if (getActivity() instanceof AppCompatActivity) { return ((AppCompatActivity) getActivity()).getSupportActionBar(); } else { |