From 96ce38f7af7b9c3f30b917ef55a2ca7b7f70643f Mon Sep 17 00:00:00 2001 From: Alexandr Timoshenko Date: Tue, 14 Apr 2020 13:59:34 +0200 Subject: [PATCH 1/2] fix issue Bug 4995 - Dark theme being used for popup dialogs --- .../app/ui/activities/SendingServiceAwareActivity.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java index ee43d75df49..84760fdba0b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java @@ -194,10 +194,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity @Override public void onException(Exception exception) { if (exception == null || exception instanceof UnauthorizedException) { - Context context = this; - if (getSupportActionBar() != null) { - context = getSupportActionBar().getThemedContext(); - } + final Context context = this; AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(getString(R.string.sending_exception_title)); builder.setMessage(getString(R.string.sending_exception_message)); From 192367c30659a2c6e3d38274f6b6ddced8c22bdb Mon Sep 17 00:00:00 2001 From: Robert Benedikt Date: Wed, 15 Apr 2020 11:29:01 +0200 Subject: [PATCH 2/2] style: rearrange code --- .../app/ui/activities/SendingServiceAwareActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java index 84760fdba0b..b2f1038a791 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java @@ -194,8 +194,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity @Override public void onException(Exception exception) { if (exception == null || exception instanceof UnauthorizedException) { - final Context context = this; - AlertDialog.Builder builder = new AlertDialog.Builder(context); + AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.sending_exception_title)); builder.setMessage(getString(R.string.sending_exception_message)); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {