From a2ccef01fcae98c304e8a4847ccccb38d1ea1957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 23 Jan 2020 11:35:07 -0500
Subject: [PATCH] account edition: check for null

Change-Id: Icc6dde32f2a3ec97643f2ff0658818a6487df5dc
---
 .../src/main/java/cx/ring/account/AccountEditionActivity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
index 5a94750ba..47a40b0a5 100644
--- a/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/account/AccountEditionActivity.java
@@ -179,7 +179,7 @@ public class AccountEditionActivity extends AppCompatActivity implements Account
 
     @Override
     public void onBackPressed() {
-        if (mBackHandlerInterface.onBackPressed()) {
+        if (mBackHandlerInterface != null && mBackHandlerInterface.onBackPressed()) {
             return;
         }
         if (frameLayout.getVisibility() == View.VISIBLE) {
@@ -303,6 +303,7 @@ public class AccountEditionActivity extends AppCompatActivity implements Account
             return isRing ? 3 : 4;
         }
 
+        @NonNull
         @Override
         public Fragment getItem(int position) {
             return isRing ? getRingPanel(position) : getSIPPanel(position);
-- 
GitLab