From 7e9c70fae8f9003ab355be751a2b9abfbf454ba4 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 6 Feb 2017 15:53:10 +0100 Subject: [PATCH] fix potential crashes --- Habitica/AndroidManifest.xml | 4 ++-- .../res/drawable-hdpi/ic_check_purple_24dp.png | Bin 0 -> 252 bytes .../res/drawable-mdpi/ic_check_purple_24dp.png | Bin 0 -> 180 bytes .../res/drawable-xhdpi/ic_check_purple_24dp.png | Bin 0 -> 301 bytes .../res/drawable-xxhdpi/ic_check_purple_24dp.png | Bin 0 -> 428 bytes .../res/drawable-xxxhdpi/ic_check_purple_24dp.png | Bin 0 -> 521 bytes Habitica/res/layout/activity_full_profile.xml | 10 +++++----- Habitica/res/values-v21/styles.xml | 13 +++++++++++++ Habitica/res/values/styles.xml | 2 +- .../helpers/PopupNotificationsManager.java | 6 +++++- .../ui/fragments/social/GuildFragment.java | 2 +- 11 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/ic_check_purple_24dp.png create mode 100644 Habitica/res/drawable-mdpi/ic_check_purple_24dp.png create mode 100644 Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png create mode 100644 Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png create mode 100644 Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png create mode 100644 Habitica/res/values-v21/styles.xml diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index a676ada8f..7e415a6bb 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ac436a012b0987d56ed55ff519621601e55f293e GIT binary patch literal 252 zcmV#RN7GV9 zK?+ikg7BTFp%u`Ec~cAJYJ>hUzicg#4^!<8MPo{Uk}zmcG6o6C!k|Fe7zF4LW)F0w z9#mHf69V0+`Mc;d0wsb8f$nVa5K0WQw`Gn!Wb&XyF)<%?2qlh*J!KsAqRt3R%CYCD z4+4`qhd4?clQS3{5|cZr9SU>g>ahCPp&$h*NT?OquFvf1h5E+;0000KOA*qU%7 za)Gxu_oBuh`~v0|4l&Jm_&+m|(eLoeM8>$onp+zdJe(5YFy-M5odm{5OC4nVcn@!k z6yUnbVWiL$bhwZ;ka?2o#3>Se`g{{~JC&{%I8E%y;f!n(p4^o%Z9=NW#*gX)AJizEHn^3hgDSAMQ{IudrKwA|SCynq7(BMX?QDBrmI zJ6FNS{M{%0s+i9_UT*5b|M4!vqQ}upDo3|7Su8)co#8~6JM*T;6B(vfh&brVF&2DW z99EOtP*tOmko|qb?d@XnOa&hge@{H`;47w{|F^Y;0!{3mhzp!Q>@2wa(#M7W z8&!`m%F2Hh>v9a~?yv3DQ|w#uV@mM@`9)PVuN9^z)QYbCnpL7Sp=x;R@-C26`FnK3mBi@5jrk>LCYep zA?)x+hAmotycfJrUH`!lc3Ae>u}H2jvpyN~RTw$FVoK+{5PjV7%bz;uunK>+S8+zRr$3ZVyEc zEM~qYate?M!;bsuLzSOgLGQ(_brA&uBS+kxIE*`|a1inLkSlGB7kS zGB7YRFaXWuVPKG8U@!pNasVo!a7FL-JBAP4|F3P^%E?go(VUlMQQuK{H-$G9e-v3B zy*gqq*?6GpBV&ZF9mBbgj0JuC2hPVv9AiIV3F9{u|9Qpm?xQwyOGmt@g3q5WhJ}y9 znK{Jw3pt$l5z27r*m{Ny$Lo8g?5!Ps{Fuo&tz*7u!ptAH7|e6|bJLG(XTR}yfBn7{ z?&>X1A7wMv^zXM+)RBy5ez5(=HICEA7zTty1tJ8TbFxsoIWmJ%kFW! z`?{NlVEkj_1I&s2|0gN#yS9BnTubqz*Z=u8ICzN1|DOKAr)A2=bQ|tjjT6lNt!Xc` zCCTH(LD0q zURdnWZ~0T)AOGgNa(w)|eyPXTAA;{#J)iyv)JyZc`eS0=G0&qvF0NDa+WJHAeVf

+ android:id="@+id/attributes_collapse_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp" + android:layout_gravity="bottom" /> diff --git a/Habitica/res/values-v21/styles.xml b/Habitica/res/values-v21/styles.xml new file mode 100644 index 000000000..36b71cf42 --- /dev/null +++ b/Habitica/res/values-v21/styles.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 02f1a82c8..4e344dc98 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -187,7 +187,7 @@ @color/brand_100 center_horizontal 12sp - @drawable/ic_check_purple + @drawable/ic_check_purple_24dp center 4dp diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java index 6f026a864..7ea30aba2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java @@ -108,7 +108,11 @@ public class PopupNotificationsManager { } public Boolean showNotificationDialog(final List notifications) { - if (notifications.size() == 0) { + if (notifications == null || notifications.size() == 0) { + return false; + } + + if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) { return false; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java index e0998703c..0c3f714c2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java @@ -169,7 +169,7 @@ public class GuildFragment extends BaseMainFragment implements Action1 { @Override public void onPageSelected(int position) { - if (position == 1 && GuildFragment.this.guild != null) { + if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) { chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id); } }