From b7d989a588d39a80bf5c256f60a9d25f06288de3 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Fri, 26 Jun 2020 02:25:10 -0400
Subject: [PATCH] Fix breaking API in WebNotificationFeature

---
 app/build.gradle                              |  1 -
 .../customtabs/FennecWebAppIntentProcessor.kt | 29 +++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3a3d0deba..4f29b5e47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,6 @@ android {
     }
 
     def releaseTemplate = {
-        signingConfig signingConfigs.debug
         shrinkResources true
         minifyEnabled true
         proguardFiles 'proguard-android-optimize-3.5.0-modified.txt', 'proguard-rules.pro'
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
index c7f9e2860..de67a087d 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
@@ -58,27 +58,24 @@ class FennecWebAppIntentProcessor(
         val url = safeIntent.dataString
 
         return if (!url.isNullOrEmpty() && matches(intent)) {
-            runBlocking {
+            val webAppManifest = runBlocking { loadManifest(safeIntent, url) }
 
-                val webAppManifest = loadManifest(safeIntent, url)
+            val session = Session(url, private = false, source = Source.HOME_SCREEN)
+            session.webAppManifest = webAppManifest
+            session.customTabConfig =
+                webAppManifest?.toCustomTabConfig() ?: createFallbackCustomTabConfig()
 
-                val session = Session(url, private = false, source = Source.HOME_SCREEN)
-                session.webAppManifest = webAppManifest
-                session.customTabConfig =
-                    webAppManifest?.toCustomTabConfig() ?: createFallbackCustomTabConfig()
+            sessionManager.add(session)
+            loadUrlUseCase(url, session, EngineSession.LoadUrlFlags.external())
 
-                sessionManager.add(session)
-                loadUrlUseCase(url, session, EngineSession.LoadUrlFlags.external())
+            intent.putSessionId(session.id)
 
-                intent.putSessionId(session.id)
-
-                if (webAppManifest != null) {
-                    intent.flags = FLAG_ACTIVITY_NEW_DOCUMENT
-                    intent.putWebAppManifest(webAppManifest)
-                }
-
-                true
+            if (webAppManifest != null) {
+                intent.flags = FLAG_ACTIVITY_NEW_DOCUMENT
+                intent.putWebAppManifest(webAppManifest)
             }
+
+            true
         } else {
             false
         }