From 51c50908d3c02223b945366f3ca980a57dbde98d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 May 2021 12:57:42 +0200
Subject: [PATCH 1/2] MOBILE-3320 core: Fix user agent in Android

---
 src/core/services/ws.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts
index 34543069e..d78c54e57 100644
--- a/src/core/services/ws.ts
+++ b/src/core/services/ws.ts
@@ -63,7 +63,7 @@ export class CoreWSProvider {
     protected async init(): Promise<void> {
         await Platform.ready();
 
-        if (CoreApp.isIOS()) {
+        if (CoreApp.isMobile()) {
             NativeHttp.setHeader('*', 'User-Agent', navigator.userAgent);
         }
     }

From 5aee4471787a53885962ac3ae1c448a6d30c9157 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 May 2021 13:07:01 +0200
Subject: [PATCH 2/2] MOBILE-3320 index: Include Content-Security-Policy

---
 src/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.html b/src/index.html
index 83fb2a51f..706be76f1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,6 +9,7 @@
 
     <meta name="color-scheme" content="light dark" />
     <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: data: gap: https://ssl.gstatic.com moodleappfs: http://localhost; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster: blob: moodleappfs: http://localhost; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file: moodleappfs: http://localhost; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file: moodleappfs:; media-src * filesystem: cdvfile: file: gap: blob: moodleappfs: http://localhost">
     <meta name="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />