|
@@ -212,7 +212,12 @@ public class RnnToolBar extends Toolbar {
|
212
|
212
|
|
213
|
213
|
@SuppressWarnings({"ConstantConditions"})
|
214
|
214
|
public void setNavUpButton(Screen screen) {
|
215
|
|
- ActionBar actionBar = ContextProvider.getActivityContext().getSupportActionBar();
|
|
215
|
+ BaseReactActivity context = ContextProvider.getActivityContext();
|
|
216
|
+ if (context == null) {
|
|
217
|
+ return;
|
|
218
|
+ }
|
|
219
|
+
|
|
220
|
+ ActionBar actionBar = context.getSupportActionBar();
|
216
|
221
|
if (actionBar == null) {
|
217
|
222
|
return;
|
218
|
223
|
}
|
|
@@ -226,7 +231,7 @@ public class RnnToolBar extends Toolbar {
|
226
|
231
|
navArrow = (DrawerArrowDrawable) this.getNavigationIcon();
|
227
|
232
|
} else {
|
228
|
233
|
if (isBack && !screen.backButtonHidden) {
|
229
|
|
- navArrow = new DrawerArrowDrawable(ContextProvider.getActivityContext());
|
|
234
|
+ navArrow = new DrawerArrowDrawable(context);
|
230
|
235
|
} else if (hasDrawer) {
|
231
|
236
|
navIcon = mDrawerIcon;
|
232
|
237
|
}
|