From c7824ed6c2225afe0c4adfe2a0cf36eb9f7b2da7 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 10 May 2021 10:45:15 +0700
Subject: [PATCH 1/2] chore(android/app): Always use offline help

---
 .../com/tavultesoft/kmapro/InfoActivity.java  | 43 ++-----------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
index f667ea85a3..8929ef047a 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
@@ -1,13 +1,11 @@
 /**
- * Copyright (C) 2017-2019 SIL International. All rights reserved.
+ * Copyright (C) 2017-2021 SIL International. All rights reserved.
  */
 
 package com.tavultesoft.kmapro;
 
 import com.tavultesoft.kmea.BaseActivity;
 import com.tavultesoft.kmea.BuildConfig;
-import com.tavultesoft.kmea.KMManager;
-import com.tavultesoft.kmea.KMManager.FormFactor;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -19,15 +17,10 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.TextView;
 import android.annotation.SuppressLint;
-import androidx.appcompat.app.AppCompatActivity;
 
 public class InfoActivity extends BaseActivity {
   private final static String TAG = "InfoActivity";
   private WebView webView;
-  private final String HELP_PRODUCTION_HOST = "help.keyman.com";
-  private final String HELP_STAGING_HOST = "help.keyman-staging.com";
-  private final String HELP_BASE_FORMAT_STR = "https://%s/products/android/%s";
-  private String kmUrl = "";
   private final String htmlPath = "file:///android_asset/info";
   private final String htmlPage = "index.html";
   private String kmOfflineUrl = "";
@@ -48,31 +41,6 @@ public class InfoActivity extends BaseActivity {
     String versionTitle = String.format(getString(R.string.title_version), versionStr);
     version.setText(versionTitle);
 
-    // Extract the the major minor version from the full version string
-    String[] versionArray = versionStr.split("\\.", 3);
-    String majorMinorVersion = String.format("%s.%s", versionArray[0], versionArray[1]);
-
-    // Determine the appropriate form factor
-    FormFactor ff = KMManager.getFormFactor();
-    String formFactor;
-
-    if(ff == FormFactor.PHONE) {
-      formFactor = "phone";
-    } else {
-      formFactor = "tablet";
-    }
-
-    String helpHost = "";
-    switch (KMManager.getTier(BuildConfig.VERSION_NAME)) {
-      case ALPHA:
-      case BETA:
-        helpHost = HELP_STAGING_HOST;
-        break;
-      default:
-        helpHost = HELP_PRODUCTION_HOST;
-    }
-
-    kmUrl = String.format(HELP_BASE_FORMAT_STR, helpHost, majorMinorVersion);
     // The offline mirroring process (currently) adds .html to the end of the whole string.
     kmOfflineUrl = String.format("%s/%s", htmlPath, htmlPage);
     webView = (WebView) findViewById(R.id.infoWebView);
@@ -107,13 +75,8 @@ public class InfoActivity extends BaseActivity {
       }
     });
 
-    if (KMManager.hasConnection(context)) {
-      // Load app info page from server
-      webView.loadUrl(kmUrl);
-    } else {
-      // Load app info page from assets
-      webView.loadUrl(kmOfflineUrl);
-    }
+    // Always load offline info page from assets
+    webView.loadUrl(kmOfflineUrl);
   }
 
   @Override

From 05b1cab74453b367cabe910561304fd6bf237244 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 10 May 2021 10:53:07 +0700
Subject: [PATCH 2/2] chore(android): Update help doc to 15.0

This commit is not to cherry-pick to stable-14.0
---
 android/help/about/whatsnew.md | 23 ++---------------------
 android/help/index.md          |  2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/android/help/about/whatsnew.md b/android/help/about/whatsnew.md
index 694c8bd62f..a3f907ddec 100644
--- a/android/help/about/whatsnew.md
+++ b/android/help/about/whatsnew.md
@@ -2,25 +2,6 @@
 title: What's New
 ---
 
-Here are some of the new features we have added to Keyman for Android 14.0:
+Here are some of the new features we have added to Keyman for Android 15.0:
 
-* Improved UI for installing keyboard packages (#3498)
-* Select a language during keyboard package installation (#3481)
-
-![](../android_images/select_language.png)
-
-* Added new menu to add languages for an installed keyboard package (#3255)
-* Consolidated install menus for installing keyboards (#3245)
-* Fix slow input in the embedded browser (#3768)
-* Add system globe action to show system keyboards (#3197)
-* Improved corrections and predictions (#3555)
-* Match user input capital letters when offering suggestions (#3845)
-* Update minimum Android SDK to 21 (Android 5.0 Lollipop) (#2993)
-* Keyman now works more reliably with WeChat and Telegram (#4254)
-* Added new Settings menu to [Change Display Language](../basic/config/index#Change-Display-Language): (#4261)
-    * French
-    * Indonesian
-    * German
-    * Khmer
-    * Obolo
-    * Pulaar-fulfulde
+* 
diff --git a/android/help/index.md b/android/help/index.md
index 56b12b00f0..a11815a41b 100644
--- a/android/help/index.md
+++ b/android/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Android 14.0 Help
+title: Keyman for Android 15.0 Help
 ---
 
 ## [About Keyman](about/)