From a466890ac3e641e0e7ce6b009cf24059e99d37e3 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sun, 27 Sep 2020 20:11:09 +1000
Subject: [PATCH] Fix 'check for updates' showing 'failed' and add message in
 updates menu telling user they need to redownload and reinstall apk, fixes
 #714

---
 android/app/build.gradle                                   | 4 ++--
 android/app/src/main/java/com/classicube/MainActivity.java | 1 -
 src/LScreens.c                                             | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6525a36fa..2d215e2ad 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 26
 
     defaultConfig {
         applicationId = 'com.classicube.android'
         minSdkVersion 13
-        targetSdkVersion 28
+        targetSdkVersion 26
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'
diff --git a/android/app/src/main/java/com/classicube/MainActivity.java b/android/app/src/main/java/com/classicube/MainActivity.java
index 2bd3fe8a3..f439366b2 100644
--- a/android/app/src/main/java/com/classicube/MainActivity.java
+++ b/android/app/src/main/java/com/classicube/MainActivity.java
@@ -491,7 +491,6 @@ public class MainActivity extends Activity implements SurfaceHolder.Callback2 {
 	byte[] readCache = new byte[8192];
 
 	public int httpInit(String url, String method) {
-		url = url.replace("http://", "https://");
 		try {
 			conn = (HttpURLConnection)new URL(url).openConnection();
 			conn.setDoInput(true);
diff --git a/src/LScreens.c b/src/LScreens.c
index eb668fb25..4b358c5b7 100644
--- a/src/LScreens.c
+++ b/src/LScreens.c
@@ -1584,6 +1584,9 @@ static void UpdatesScreen_Init(struct LScreen* s_) {
 		LButton_Init(s_, &s->btnRel[1], 130, 35, "OpenGL");
 		LButton_Init(s_, &s->btnDev[1], 130, 35, "OpenGL");
 	}
+#ifdef CC_BUILD_ANDROID
+	LLabel_Init(s_, &s->lblInfo, "&eRedownload and reinstall to update");
+#endif
 
 	s->btnRel[0].OnClick = UpdatesScreen_RelD3D9;
 	s->btnRel[1].OnClick = UpdatesScreen_RelOpenGL;