Add hardcoded websearch url template strings for popular web searches that

do not implement the OpenSearch standard

search-actions/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt

@@ -0,0 +1,21 @@
+package de.mm20.launcher2.searchactions
+
+import de.mm20.launcher2.searchactions.builders.WebsearchActionBuilder
+
+fun knownWebsearchByHostname(hostname: String): WebsearchActionBuilder? {
+    // List of popular web search engines that do not implement the OpenSearch standard
+    return when(hostname) {
+        "google.com" -> WebsearchActionBuilder(label = "Google", urlTemplate = "https://google.com/search?q=\${1}")
+        "bing.com" -> WebsearchActionBuilder(label = "Google", urlTemplate = "https://bing.com/search?q=\${1}")
+        "amazon.com" -> WebsearchActionBuilder(label = "Amazon", urlTemplate = "https://www.amazon.com/s?k=\${1}")
+        "amazon.de" -> WebsearchActionBuilder(label = "Amazon DE", urlTemplate = "https://www.amazon.de/s?k=\${1}")
+        "amazon.co.uk" -> WebsearchActionBuilder(label = "Amazon UK", urlTemplate = "https://www.amazon.co.uk/s?k=\${1}")
+        "amazon.fr" -> WebsearchActionBuilder(label = "Amazon FR", urlTemplate = "https://www.amazon.fr/s?k=\${1}")
+        "amazon.co.jp" -> WebsearchActionBuilder(label = "Amazon JP", urlTemplate = "https://www.amazon.co.jp/s?k=\${1}")
+        "amazon.ca" -> WebsearchActionBuilder(label = "Amazon CA", urlTemplate = "https://www.amazon.ca/s?k=\${1}")
+        "amazon.cn" -> WebsearchActionBuilder(label = "Amazon CN", urlTemplate = "https://www.amazon.cn/s?k=\${1}")
+        "duckduckgo.com" -> WebsearchActionBuilder(label = "DuckDuckGo", urlTemplate = "https://duckduckgo.com/?q=\${1}")
+        "yahoo.com" -> WebsearchActionBuilder(label = "DuckDuckGo", urlTemplate = "https://search.yahoo.com/search?p=\${1}")
+        else -> null
+    }
+}

search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt

@@ -119,17 +119,34 @@ internal class SearchActionServiceImpl(
                     .getOrNull(0)
                     ?.absUrl("href")
                     ?.takeIf { it.isNotEmpty() }
-                    ?: return@withContext run {
+
-                        Log.d("MM20", "Specified URL does not implement the OpenSearch protocol")
+                var action = openSearchHref?.let {
-                        null
+                    importOpenSearch(it)
                 }
 
+                if (action != null) {
+                    return@withContext action
+                }
+
+                val host = URL(u).host ?: return@withContext null
+                return@withContext knownWebsearchByHostname(host)
+
+            } catch (e: IOException) {
+                CrashReporter.logException(e)
+            } catch (e: XmlPullParserException) {
+                CrashReporter.logException(e)
+            }
+            return@withContext null
+        }
+
+    private suspend fun importOpenSearch(openSearchHref: String): WebsearchActionBuilder? {
+        try {
             val httpClient = OkHttpClient()
             val request = Request.Builder()
                 .url(openSearchHref)
                 .build()
             val response = httpClient.newCall(request).execute()
-                val inputStream = response.body?.byteStream() ?: return@withContext null
+            val inputStream = response.body?.byteStream() ?: return null
 
             var label: String? = null
             var urlTemplate: String? = null
@@ -193,7 +210,7 @@ internal class SearchActionServiceImpl(
                     createIcon(uri, iconSize)
                 }
 
-                    return@withContext WebsearchActionBuilder(
+                return WebsearchActionBuilder(
                     label = label ?: "",
                     icon = if (localIconUrl == null) SearchActionIcon.Search else SearchActionIcon.Custom,
                     customIcon = localIconUrl,
@@ -202,11 +219,9 @@ internal class SearchActionServiceImpl(
                 )
             }
         } catch (e: IOException) {
-                CrashReporter.logException(e)
+
-            } catch (e: XmlPullParserException) {
+        } catch (e: XmlPullParserException) {}
-                CrashReporter.logException(e)
+        return null
-            }
-            return@withContext null
     }
 
     override suspend fun createIcon(uri: Uri, size: Int): String? = withContext(