From 5176eaba81f4cda6cd5a14108c3516abd8ba0c84 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Thu, 16 Jun 2016 19:47:02 +0600
Subject: CLOUD: Add wwwroot

wwwroot.zip contains ScummVM local webserver's resources, such as
template html pages, styles and images.

One can make it from wwwroot directory contents by running
make_archive.py script.

It's added to scummvm.rc, so it's included in the executable (it works
with MinGW, but I was unable to do that in VS yet).

IndexPageHandler is the one who returns these resources. It uses
index.html for "/". I'm replacing "{message}" with translated message,
so that's the way I thought the templates should work.
---
 dists/scummvm.rc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'dists')

diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 873feaa419..00d71ef717 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -19,6 +19,9 @@ scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 #ifdef USE_TRANSLATION
 translations.dat       FILE    "gui/themes/translations.dat"
 #endif
+#ifdef USE_SDL_NET
+wwwroot.zip       FILE    "backends/networking/wwwroot.zip"
+#endif
 
 #if ENABLE_ACCESS   == STATIC_PLUGIN
 access.dat           FILE    "dists/engine-data/access.dat"
-- 
cgit v1.2.3


From 5e70f64e108a3b155fc14f5087a7747e5c89f581 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Sat, 18 Jun 2016 13:17:36 +0600
Subject: CLOUD: Embed cloud icons as byte arrays

---
 dists/cloudicon.png          | Bin 0 -> 1242 bytes
 dists/cloudicon_disabled.png | Bin 0 -> 1331 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dists/cloudicon.png
 create mode 100644 dists/cloudicon_disabled.png

(limited to 'dists')

diff --git a/dists/cloudicon.png b/dists/cloudicon.png
new file mode 100644
index 0000000000..21373aea1a
Binary files /dev/null and b/dists/cloudicon.png differ
diff --git a/dists/cloudicon_disabled.png b/dists/cloudicon_disabled.png
new file mode 100644
index 0000000000..27c9600b0a
Binary files /dev/null and b/dists/cloudicon_disabled.png differ
-- 
cgit v1.2.3


From a13e03e988f85a67366f2ffe39bae67576e425bc Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Tue, 19 Jul 2016 18:43:00 +0600
Subject: CLOUD: Add Networking::Connection::isLimited()

`false` everywhere by default, but works on Android (`true` if not
Wi-Fi).
---
 dists/android/AndroidManifest.xml    | 2 ++
 dists/android/AndroidManifest.xml.in | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'dists')

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index c091039266..64870a459b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -40,6 +40,8 @@
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
+
 	<uses-feature android:name="android.hardware.screen.landscape"
 		        android:required="false" />
 
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 7eaece9d1f..9601425c74 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -40,6 +40,8 @@
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
+
 	<uses-feature android:name="android.hardware.screen.landscape"
 		        android:required="false" />
 
-- 
cgit v1.2.3