v133.2
parent
3621e5dc88
commit
930109a75b
|
|
@ -0,0 +1,247 @@
|
||||||
|
From 60fb8028e29b06689ad368ee67f03568278a1ff6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Wed, 11 Dec 2024 11:33:04 +0100
|
||||||
|
Subject: [PATCH] removing firebase
|
||||||
|
|
||||||
|
---
|
||||||
|
app/build.gradle | 1 -
|
||||||
|
app/src/main/AndroidManifest.xml | 17 -------
|
||||||
|
.../waterfox/android/WaterfoxApplication.kt | 20 +-------
|
||||||
|
.../android/components/BackgroundServices.kt | 6 +--
|
||||||
|
.../waterfox/android/components/Components.kt | 3 +-
|
||||||
|
.../net/waterfox/android/components/Push.kt | 47 -------------------
|
||||||
|
.../android/push/FirebasePushService.kt | 4 +-
|
||||||
|
.../android/push/PushFxaIntegration.kt | 2 +-
|
||||||
|
buildSrc/src/main/java/Dependencies.kt | 3 +-
|
||||||
|
9 files changed, 7 insertions(+), 96 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/app/build.gradle b/app/build.gradle
|
||||||
|
index 218597cba..bd96af0df 100644
|
||||||
|
--- a/app/build.gradle
|
||||||
|
+++ b/app/build.gradle
|
||||||
|
@@ -402,7 +402,6 @@ dependencies {
|
||||||
|
|
||||||
|
implementation Deps.mozilla_lib_crash
|
||||||
|
implementation Deps.lib_crash_sentry
|
||||||
|
- implementation Deps.mozilla_lib_push_firebase
|
||||||
|
implementation Deps.mozilla_lib_state
|
||||||
|
implementation Deps.mozilla_lib_dataprotect
|
||||||
|
debugImplementation Deps.leakcanary
|
||||||
|
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
|
||||||
|
index 00e0fc785..4eb1bcc7c 100644
|
||||||
|
--- a/app/src/main/AndroidManifest.xml
|
||||||
|
+++ b/app/src/main/AndroidManifest.xml
|
||||||
|
@@ -333,23 +333,6 @@
|
||||||
|
android:value="This foreground service allows users to easily remove private tabs from the notification" />
|
||||||
|
</service>
|
||||||
|
|
||||||
|
- <service
|
||||||
|
- android:name=".push.FirebasePushService"
|
||||||
|
- android:exported="false">
|
||||||
|
- <intent-filter>
|
||||||
|
- <action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||||
|
- </intent-filter>
|
||||||
|
- </service>
|
||||||
|
-
|
||||||
|
- <meta-data
|
||||||
|
- android:name="firebase_messaging_auto_init_enabled"
|
||||||
|
- android:value="true" />
|
||||||
|
- <meta-data
|
||||||
|
- android:name="firebase_analytics_collection_enabled"
|
||||||
|
- android:value="false" />
|
||||||
|
- <meta-data
|
||||||
|
- android:name="firebase_analytics_collection_deactivated"
|
||||||
|
- android:value="true" />
|
||||||
|
<!-- Removes the default Workmanager initialization so that we can use on-demand initializer. -->
|
||||||
|
<provider
|
||||||
|
android:name="androidx.startup.InitializationProvider"
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/WaterfoxApplication.kt b/app/src/main/java/net/waterfox/android/WaterfoxApplication.kt
|
||||||
|
index 35306e584..18f7d656a 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/WaterfoxApplication.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/WaterfoxApplication.kt
|
||||||
|
@@ -160,7 +160,7 @@ open class WaterfoxApplication : LocaleAwareApplication(), Provider {
|
||||||
|
}
|
||||||
|
|
||||||
|
setupLeakCanary()
|
||||||
|
- setupPush()
|
||||||
|
+
|
||||||
|
|
||||||
|
visibilityLifecycleCallback = VisibilityLifecycleCallback(getSystemService())
|
||||||
|
registerActivityLifecycleCallbacks(visibilityLifecycleCallback)
|
||||||
|
@@ -292,25 +292,7 @@ open class WaterfoxApplication : LocaleAwareApplication(), Provider {
|
||||||
|
// no-op, LeakCanary is disabled by default
|
||||||
|
}
|
||||||
|
|
||||||
|
- private fun setupPush() {
|
||||||
|
- // Sets the PushFeature as the singleton instance for push messages to go to.
|
||||||
|
- // We need the push feature setup here to deliver messages in the case where the service
|
||||||
|
- // starts up the app first.
|
||||||
|
- components.push.feature?.let {
|
||||||
|
- Logger.info("AutoPushFeature is configured, initializing it...")
|
||||||
|
-
|
||||||
|
- // Install the AutoPush singleton to receive messages.
|
||||||
|
- PushProcessor.install(it)
|
||||||
|
-
|
||||||
|
- WebPushEngineIntegration(components.core.engine, it).start()
|
||||||
|
|
||||||
|
- // Perform a one-time initialization of the account manager if a message is received.
|
||||||
|
- PushFxaIntegration(it, lazy { components.backgroundServices.accountManager }).launch()
|
||||||
|
-
|
||||||
|
- // Initialize the service. This could potentially be done in a coroutine in the future.
|
||||||
|
- it.initialize()
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
|
||||||
|
private fun setupCrashReporting() {
|
||||||
|
components.analytics.crashReporter.install(this)
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/components/BackgroundServices.kt b/app/src/main/java/net/waterfox/android/components/BackgroundServices.kt
|
||||||
|
index 044965fde..5f581c3e6 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/components/BackgroundServices.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/components/BackgroundServices.kt
|
||||||
|
@@ -58,7 +58,7 @@ private val DEFAULT_SYNCED_TABS_COMMANDS_EXTRA_FLUSH_DELAY = 5.seconds
|
||||||
|
@Suppress("LongParameterList")
|
||||||
|
class BackgroundServices(
|
||||||
|
private val context: Context,
|
||||||
|
- private val push: Push,
|
||||||
|
+
|
||||||
|
crashReporter: CrashReporter,
|
||||||
|
historyStorage: Lazy<PlacesHistoryStorage>,
|
||||||
|
bookmarkStorage: Lazy<PlacesBookmarksStorage>,
|
||||||
|
@@ -189,9 +189,7 @@ class BackgroundServices(
|
||||||
|
accountManager.register(AccountManagerReadyObserver(accountManagerAvailableQueue))
|
||||||
|
|
||||||
|
// Enable push if it's configured.
|
||||||
|
- push.feature?.let { autoPushFeature ->
|
||||||
|
- FxaPushSupportFeature(context, accountManager, autoPushFeature, crashReporter)
|
||||||
|
- }
|
||||||
|
+
|
||||||
|
|
||||||
|
SendTabFeature(accountManager) { device, tabs ->
|
||||||
|
notificationManager.showReceivedTabs(context, device, tabs)
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/components/Components.kt b/app/src/main/java/net/waterfox/android/components/Components.kt
|
||||||
|
index 75fec8e8c..c45081b3f 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/components/Components.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/components/Components.kt
|
||||||
|
@@ -60,7 +60,6 @@ class Components(private val context: Context) {
|
||||||
|
val backgroundServices by lazyMonitored {
|
||||||
|
BackgroundServices(
|
||||||
|
context,
|
||||||
|
- push,
|
||||||
|
analytics.crashReporter,
|
||||||
|
core.lazyHistoryStorage,
|
||||||
|
core.lazyBookmarksStorage,
|
||||||
|
@@ -156,7 +155,7 @@ class Components(private val context: Context) {
|
||||||
|
val publicSuffixList by lazyMonitored { PublicSuffixList(context) }
|
||||||
|
val clipboardHandler by lazyMonitored { ClipboardHandler(context) }
|
||||||
|
val performance by lazyMonitored { PerformanceComponent() }
|
||||||
|
- val push by lazyMonitored { Push(context, analytics.crashReporter) }
|
||||||
|
+
|
||||||
|
val wifiConnectionMonitor by lazyMonitored { WifiConnectionMonitor(context as Application) }
|
||||||
|
val strictMode by lazyMonitored { StrictModeManager(Config, this) }
|
||||||
|
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/components/Push.kt b/app/src/main/java/net/waterfox/android/components/Push.kt
|
||||||
|
index ec9057c6b..e69de29bb 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/components/Push.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/components/Push.kt
|
||||||
|
@@ -1,47 +0,0 @@
|
||||||
|
-/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
- * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
-
|
||||||
|
-package net.waterfox.android.components
|
||||||
|
-
|
||||||
|
-import android.content.Context
|
||||||
|
-import mozilla.components.feature.push.AutoPushFeature
|
||||||
|
-import mozilla.components.feature.push.PushConfig
|
||||||
|
-import mozilla.components.lib.crash.CrashReporter
|
||||||
|
-import mozilla.components.support.base.log.logger.Logger
|
||||||
|
-import net.waterfox.android.R
|
||||||
|
-import net.waterfox.android.perf.lazyMonitored
|
||||||
|
-import net.waterfox.android.push.FirebasePushService
|
||||||
|
-
|
||||||
|
-/**
|
||||||
|
- * Component group for push services. These components use services that strongly depend on
|
||||||
|
- * push messaging (e.g. WebPush, SendTab).
|
||||||
|
- */
|
||||||
|
-class Push(context: Context, crashReporter: CrashReporter) {
|
||||||
|
- val feature by lazyMonitored {
|
||||||
|
- pushConfig?.let { config ->
|
||||||
|
- AutoPushFeature(
|
||||||
|
- context = context,
|
||||||
|
- service = pushService,
|
||||||
|
- config = config,
|
||||||
|
- crashReporter = crashReporter
|
||||||
|
- )
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- private val pushConfig: PushConfig? by lazyMonitored {
|
||||||
|
- val logger = Logger("PushConfig")
|
||||||
|
- val projectIdKey = context.getString(R.string.pref_key_push_project_id)
|
||||||
|
- val resId = context.resources.getIdentifier(projectIdKey, "string", context.packageName)
|
||||||
|
- if (resId == 0) {
|
||||||
|
- logger.warn("No firebase configuration found; cannot support push service.")
|
||||||
|
- return@lazyMonitored null
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- logger.debug("Creating push configuration for autopush.")
|
||||||
|
- val projectId = context.resources.getString(resId)
|
||||||
|
- PushConfig(projectId)
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- private val pushService by lazyMonitored { FirebasePushService() }
|
||||||
|
-}
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/push/FirebasePushService.kt b/app/src/main/java/net/waterfox/android/push/FirebasePushService.kt
|
||||||
|
index 542fb26fe..e65df2085 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/push/FirebasePushService.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/push/FirebasePushService.kt
|
||||||
|
@@ -6,11 +6,9 @@ package net.waterfox.android.push
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
|
import mozilla.components.feature.push.AutoPushFeature
|
||||||
|
-import mozilla.components.lib.push.firebase.AbstractFirebasePushService
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A singleton instance of the FirebasePushService needed for communicating between FCM and the
|
||||||
|
* [AutoPushFeature].
|
||||||
|
*/
|
||||||
|
-@SuppressLint("MissingFirebaseInstanceTokenRefresh") // Implemented internally.
|
||||||
|
-class FirebasePushService : AbstractFirebasePushService()
|
||||||
|
+
|
||||||
|
diff --git a/app/src/main/java/net/waterfox/android/push/PushFxaIntegration.kt b/app/src/main/java/net/waterfox/android/push/PushFxaIntegration.kt
|
||||||
|
index f527790ac..5c130f4c6 100644
|
||||||
|
--- a/app/src/main/java/net/waterfox/android/push/PushFxaIntegration.kt
|
||||||
|
+++ b/app/src/main/java/net/waterfox/android/push/PushFxaIntegration.kt
|
||||||
|
@@ -18,7 +18,7 @@ import mozilla.components.feature.push.PushScope
|
||||||
|
import mozilla.components.service.fxa.manager.FxaAccountManager
|
||||||
|
import mozilla.components.service.fxa.manager.ext.withConstellation
|
||||||
|
import net.waterfox.android.components.BackgroundServices
|
||||||
|
-import net.waterfox.android.components.Push
|
||||||
|
+
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A lazy initializer for FxaAccountManager if it isn't already initialized.
|
||||||
|
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
|
||||||
|
index 2973e0805..f349c13a3 100644
|
||||||
|
--- a/buildSrc/src/main/java/Dependencies.kt
|
||||||
|
+++ b/buildSrc/src/main/java/Dependencies.kt
|
||||||
|
@@ -8,7 +8,7 @@ object Versions {
|
||||||
|
|
||||||
|
// This has to be synced to the gradlew plugin version. See
|
||||||
|
// http://googlesamples.github.io/android-custom-lint-rules/api-guide/example.md.html#example:samplelintcheckgithubproject/lintversion?
|
||||||
|
- const val android_gradle_plugin = "8.7.2"
|
||||||
|
+ const val android_gradle_plugin = "8.6.0"
|
||||||
|
const val android_lint_api = "31.7.2"
|
||||||
|
|
||||||
|
const val sentry = "7.9.0"
|
||||||
|
@@ -146,7 +146,6 @@ object Deps {
|
||||||
|
const val mozilla_lib_crash = "org.mozilla.components:lib-crash:${Versions.mozilla_android_components}"
|
||||||
|
const val lib_crash_sentry =
|
||||||
|
"org.mozilla.components:lib-crash-sentry:${Versions.mozilla_android_components}"
|
||||||
|
- const val mozilla_lib_push_firebase = "org.mozilla.components:lib-push-firebase:${Versions.mozilla_android_components}"
|
||||||
|
const val mozilla_lib_dataprotect = "org.mozilla.components:lib-dataprotect:${Versions.mozilla_android_components}"
|
||||||
|
const val mozilla_lib_state = "org.mozilla.components:lib-state:${Versions.mozilla_android_components}"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
From 3c4de1b6f17265d461822ce57b948dd7c5ea85e6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Wed, 11 Dec 2024 11:43:36 +0100
|
||||||
|
Subject: [PATCH] build.gradle-packageName
|
||||||
|
|
||||||
|
---
|
||||||
|
app/build.gradle | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/app/build.gradle b/app/build.gradle
|
||||||
|
index bd96af0df..658bfb749 100644
|
||||||
|
--- a/app/build.gradle
|
||||||
|
+++ b/app/build.gradle
|
||||||
|
@@ -29,7 +29,7 @@ android {
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
- applicationId "net.waterfox.android"
|
||||||
|
+ applicationId "com.leos.leosium"
|
||||||
|
minSdkVersion Config.minSdkVersion
|
||||||
|
compileSdk Config.compileSdkVersion
|
||||||
|
targetSdkVersion Config.targetSdkVersion
|
||||||
|
@@ -43,7 +43,7 @@ android {
|
||||||
|
buildConfigField "String", "GIT_HASH", "\"\"" // see override in release builds for why it's blank.
|
||||||
|
// This should be the "public" base URL of AMO.
|
||||||
|
buildConfigField "String", "AMO_BASE_URL", "\"https://addons.mozilla.org\""
|
||||||
|
- buildConfigField "String", "AMO_COLLECTION_NAME", "\"Waterfox-Android\""
|
||||||
|
+ buildConfigField "String", "AMO_COLLECTION_NAME", "\"LeOSium-Android\""
|
||||||
|
buildConfigField "String", "AMO_COLLECTION_USER", "\"17224042\""
|
||||||
|
// This should be the base URL used to call the AMO API.
|
||||||
|
buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,26 @@
|
||||||
|
From 3875095cdd0ecb60d79678177d1b084b2bbc1bd6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Wed, 11 Dec 2024 12:48:42 +0100
|
||||||
|
Subject: [PATCH] build.gradle release remove
|
||||||
|
|
||||||
|
---
|
||||||
|
app/build.gradle | 2 +-
|
||||||
|
|
||||||
|
1 files changed, 88 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/app/build.gradle b/app/build.gradle
|
||||||
|
index 658bfb749..7ea7bc013 100644
|
||||||
|
--- a/app/build.gradle
|
||||||
|
+++ b/app/build.gradle
|
||||||
|
@@ -87,7 +87,7 @@ android {
|
||||||
|
}
|
||||||
|
release releaseTemplate >> {
|
||||||
|
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
|
||||||
|
- applicationIdSuffix ".release"
|
||||||
|
+ applicationIdSuffix ""
|
||||||
|
def deepLinkSchemeValue = "waterfox"
|
||||||
|
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
|
||||||
|
manifestPlaceholders = [
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,73 @@
|
||||||
|
From 7655dfc3bb131f5609970d0593d8505750aeebcc Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Wed, 11 Dec 2024 15:32:26 +0100
|
||||||
|
Subject: [PATCH] About Waterfox-LeOSium
|
||||||
|
|
||||||
|
---
|
||||||
|
.../waterfox/android/ui/robots/SettingsRobot.kt | 14 +++++++-------
|
||||||
|
.../android/ui/robots/SettingsSubMenuAboutRobot.kt | 6 +++---
|
||||||
|
app/src/main/res/values-en-rCA/strings.xml | 2 +-
|
||||||
|
app/src/main/res/values-en-rGB/strings.xml | 2 +-
|
||||||
|
app/src/main/res/values/strings.xml | 2 +-
|
||||||
|
5 files changed, 13 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||||||
|
index b91f91a68..47afad415 100644
|
||||||
|
--- a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||||||
|
+++ b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||||||
|
@@ -556,17 +556,17 @@ private fun assertAboutHeading(): ViewInteraction {
|
||||||
|
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||||
|
}
|
||||||
|
|
||||||
|
-private fun rateOnGooglePlayHeading(): UiObject {
|
||||||
|
- val rateOnGooglePlay = mDevice.findObject(UiSelector().text("Rate on Google Play"))
|
||||||
|
- settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||||||
|
- rateOnGooglePlay.waitForExists(waitingTime)
|
||||||
|
+//private fun rateOnGooglePlayHeading(): UiObject {
|
||||||
|
+// val rateOnGooglePlay = mDevice.findObject(UiSelector().text("Rate on Google Play"))
|
||||||
|
+// settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||||||
|
+// rateOnGooglePlay.waitForExists(waitingTime)
|
||||||
|
|
||||||
|
- return rateOnGooglePlay
|
||||||
|
-}
|
||||||
|
+ return rateOnGooglePlay//
|
||||||
|
+//}
|
||||||
|
|
||||||
|
private fun aboutWaterfoxHeading(): UiObject {
|
||||||
|
settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||||||
|
- return mDevice.findObject(UiSelector().text("About $appName"))
|
||||||
|
+ return mDevice.findObject(UiSelector().text("About LeOsium"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun swipeToBottom() = onView(withId(R.id.recycler_view)).perform(ViewActions.swipeUp())
|
||||||
|
diff --git a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||||||
|
index 18d5da9c4..b756fce0f 100644
|
||||||
|
--- a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||||||
|
+++ b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||||||
|
@@ -74,12 +74,12 @@ private fun assertAboutToolbar() =
|
||||||
|
onView(
|
||||||
|
allOf(
|
||||||
|
withId(R.id.navigationToolbar),
|
||||||
|
- hasDescendant(withText("About $appName"))
|
||||||
|
+ hasDescendant(withText("About LeOSium"))
|
||||||
|
)
|
||||||
|
).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
|
||||||
|
|
||||||
|
private fun assertProductCompany(rule: ComposeTestRule) {
|
||||||
|
- rule.onNodeWithText("$appName is made by BrowserWorks.")
|
||||||
|
+ rule.onNodeWithText("LeOSium is made by Harvey186")
|
||||||
|
.assertIsDisplayed()
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -207,7 +207,7 @@ private fun assertLibrariesUsed(rule: ComposeTestRule) {
|
||||||
|
.assertIsDisplayed()
|
||||||
|
.performClick()
|
||||||
|
|
||||||
|
- onView(withId(R.id.navigationToolbar)).check(matches(hasDescendant(withText(containsString("$appName | OSS Libraries")))))
|
||||||
|
+ onView(withId(R.id.navigationToolbar)).check(matches(hasDescendant(withText(containsString("LeOSium | OSS Libraries")))))
|
||||||
|
|
||||||
|
rule.onNodeWithTag("about.library.list")
|
||||||
|
.performScrollToNode(hasText("org.mozilla.geckoview:geckoview", substring = true))
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,119 @@
|
||||||
|
From 50665f3bb30a69af2983a19ac8e968a8d70c7390 Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Thu, 12 Dec 2024 08:54:05 +0100
|
||||||
|
Subject: [PATCH] correction of DE strings
|
||||||
|
|
||||||
|
---
|
||||||
|
app/src/main/res/values-de/strings.xml | 26 +++++++++++++-------------
|
||||||
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
|
||||||
|
index 7b6e3ef..4cadf2e 100644
|
||||||
|
--- a/app/src/main/res/values-de/strings.xml
|
||||||
|
+++ b/app/src/main/res/values-de/strings.xml
|
||||||
|
@@ -273,7 +273,7 @@
|
||||||
|
<string name="onboarding_home_screen_section_useful_history_description_2">Rufen Sie Ihre letzten Suchanfragen von Ihrer Startseite und Ihren Tabs aus erneut auf.</string>
|
||||||
|
|
||||||
|
<!-- Onboarding home screen popup dialog, shown on top of the Jump back in section. LeOSium is intentionally hardcoded. -->
|
||||||
|
- <string name="onboarding_home_screen_jump_back_contextual_hint" tools:ignore="UnusedResources">Ihre personalisierte Waterfox-Startseite macht es jetzt einfacher, dort weiterzumachen, wo Sie aufgehört haben. Finden Sie Ihre letzten Tabs, Lesezeichen und Suchergebnisse.</string>
|
||||||
|
+ <string name="onboarding_home_screen_jump_back_contextual_hint" tools:ignore="UnusedResources">Ihre personalisierte LeOsium-Startseite macht es jetzt einfacher, dort weiterzumachen, wo Sie aufgehört haben. Finden Sie Ihre letzten Tabs, Lesezeichen und Suchergebnisse.</string>
|
||||||
|
|
||||||
|
<!-- Search Widget -->
|
||||||
|
<!-- Content description for searching with a widget. The first parameter is the name of the application.-->
|
||||||
|
@@ -346,11 +346,11 @@
|
||||||
|
<!-- Preference for accessibility -->
|
||||||
|
<string name="preferences_accessibility">Barrierefreiheit</string>
|
||||||
|
<!-- Preference to override the LeOSium Account server -->
|
||||||
|
- <string name="preferences_override_fxa_server">Benutzerdefinierter Waterfox-Kontoserver</string>
|
||||||
|
+ <string name="preferences_override_fxa_server">Benutzerdefinierter LeOsium-Kontoserver</string>
|
||||||
|
<!-- Preference to override the Sync token server -->
|
||||||
|
<string name="preferences_override_sync_tokenserver">Benutzerdefinierter Sync-Server</string>
|
||||||
|
<!-- Toast shown after updating the FxA/Sync server override preferences -->
|
||||||
|
- <string name="toast_override_fxa_sync_server_done">Server für Waterfox-Konto/Sync geändert. Anwendung wird beendet, um Änderungen zu übernehmen…</string>
|
||||||
|
+ <string name="toast_override_fxa_sync_server_done">Server für LeOsium-Konto/Sync geändert. Anwendung wird beendet, um Änderungen zu übernehmen…</string>
|
||||||
|
<!-- Preference category for account information -->
|
||||||
|
<string name="preferences_category_account">Konto</string>
|
||||||
|
<!-- Preference for changing where the toolbar is positioned -->
|
||||||
|
@@ -364,11 +364,11 @@
|
||||||
|
<!-- Preference for settings related to visual options -->
|
||||||
|
<string name="preferences_customize">Anpassen</string>
|
||||||
|
<!-- Preference description for banner about signing in -->
|
||||||
|
- <string moz:RemovedIn="104" name="preferences_sign_in_description" tools:ignore="UnusedResources">Synchronisieren Sie Lesezeichen, Chronik und mehr mit Ihrem Waterfox-Konto</string>
|
||||||
|
+ <string moz:RemovedIn="104" name="preferences_sign_in_description" tools:ignore="UnusedResources">Synchronisieren Sie Lesezeichen, Chronik und mehr mit Ihrem LeOsium-Konto</string>
|
||||||
|
<!-- Preference description for banner about signing in -->
|
||||||
|
<string name="preferences_sign_in_description_2">Melden Sie sich an, um Tabs, Lesezeichen, Passwörter und mehr zu synchronisieren.</string>
|
||||||
|
<!-- Preference shown instead of account display name while account profile information isn't available yet. -->
|
||||||
|
- <string name="preferences_account_default_name">Waterfox-Konto</string>
|
||||||
|
+ <string name="preferences_account_default_name">LeOsium-Konto</string>
|
||||||
|
<!-- Preference text for account title when there was an error syncing FxA -->
|
||||||
|
<string name="preferences_account_sync_error">Stellen Sie die Verbindung erneut her, um die Synchronisierung fortzusetzen</string>
|
||||||
|
<!-- Preference for language -->
|
||||||
|
@@ -451,11 +451,11 @@
|
||||||
|
<!-- Snackbar label for action to view selected wallpaper -->
|
||||||
|
<string name="wallpaper_updated_snackbar_action">Ansehen</string>
|
||||||
|
<!-- Label for switch which toggles the "tap-to-switch" behavior on home screen logo -->
|
||||||
|
- <string name="wallpaper_tap_to_change_switch_label_1">Hintergrundbild durch Tippen auf das Logo der Waterfox-Startseite ändern</string>
|
||||||
|
+ <string name="wallpaper_tap_to_change_switch_label_1">Hintergrundbild durch Tippen auf das Logo der LeOsium-Startseite ändern</string>
|
||||||
|
|
||||||
|
<!-- This is the accessibility content description for the wallpapers functionality. Users are
|
||||||
|
able to tap on the app logo in the home screen and can switch to different wallpapers by tapping. -->
|
||||||
|
- <string name="wallpaper_logo_content_description">Waterfox-Logo – Hintergrundbild ändern, Schaltfläche</string>
|
||||||
|
+ <string name="wallpaper_logo_content_description">LeOsium-Logo – Hintergrundbild ändern, Schaltfläche</string>
|
||||||
|
|
||||||
|
<!-- Add-on Installation from AMO-->
|
||||||
|
<!-- Error displayed when user attempts to install an add-on from AMO (addons.mozilla.org) that is not supported -->
|
||||||
|
@@ -508,7 +508,7 @@
|
||||||
|
<!-- Name of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
|
||||||
|
<string name="fxa_received_tab_channel_name">Empfangene Tabs</string>
|
||||||
|
<!-- Description of the "receive tabs" notification channel. Displayed in the "App notifications" system settings for the app -->
|
||||||
|
- <string name="fxa_received_tab_channel_description">Benachrichtigungen für Tabs, die von anderen Waterfox-Geräten empfangen wurden.</string>
|
||||||
|
+ <string name="fxa_received_tab_channel_description">Benachrichtigungen für Tabs, die von anderen LeOsium-Geräten empfangen wurden.</string>
|
||||||
|
|
||||||
|
<!-- The body for these is the URL of the tab received -->
|
||||||
|
<string name="fxa_tab_received_notification_name">Tab empfangen</string>
|
||||||
|
@@ -806,7 +806,7 @@
|
||||||
|
<!-- The synced history sign in dialog button text -->
|
||||||
|
<string name="history_sign_in_button">Anmelden</string>
|
||||||
|
<!-- The synced history sign in dialog create a new account link -->
|
||||||
|
- <string name="history_sign_in_create_account"><![CDATA[<u>Oder erstellen Sie ein Waterfox-Konto, um mit der Synchronisation zu beginnen</u>]]></string>
|
||||||
|
+ <string name="history_sign_in_create_account"><![CDATA[<u>Oder erstellen Sie ein LeOsium-Konto, um mit der Synchronisation zu beginnen</u>]]></string>
|
||||||
|
|
||||||
|
<!-- Downloads -->
|
||||||
|
<!-- Text for the snackbar to confirm that multiple downloads items have been removed -->
|
||||||
|
@@ -1234,7 +1234,7 @@
|
||||||
|
<!-- Text for onboarding welcome message
|
||||||
|
The first parameter is the name of the app (e.g. LeOSium Preview) -->
|
||||||
|
<string name="onboarding_header">Willkommen bei %s!</string>
|
||||||
|
- <!-- text for the LeOSium account onboarding sign in card header. The word "Waterfox" should not be translated -->
|
||||||
|
+ <!-- text for the LeOSium account onboarding sign in card header. The word "LeOsium" should not be translated -->
|
||||||
|
<string name="onboarding_account_sign_in_header_1">Synchronisieren Sie LeOSium zwischen Geräten</string>
|
||||||
|
<!-- Text for the button to learn more about signing in to your LeOSium account. The first parameter is the name of the application.-->
|
||||||
|
<string name="onboarding_manual_sign_in_description_2">Übertragen Sie Lesezeichen, Chronik und Passwörter zu LeOSium auf diesem Gerät.</string>
|
||||||
|
@@ -1301,7 +1301,7 @@
|
||||||
|
<string name="sign_in_with_camera">Melden Sie sich mit Ihrer Kamera an</string>
|
||||||
|
<!-- Text shown for settings option for sign with email -->
|
||||||
|
<string name="sign_in_with_email">Stattdessen E-Mail-Adresse verwenden</string>
|
||||||
|
- <!-- Text shown for settings option for create new account text.'Waterfox' intentionally hardcoded here.-->
|
||||||
|
+ <!-- Text shown for settings option for create new account text.'LeOsium' intentionally hardcoded here.-->
|
||||||
|
<string name="sign_in_create_account_text"><![CDATA[Kein Konto? <u>Erstellen Sie eines</u>, um LeOSium zwischen Geräten zu synchronisieren.]]></string>
|
||||||
|
<!-- Text shown in confirmation dialog to sign out of account. The first parameter is the name of the app (e.g. LeOSium Preview) -->
|
||||||
|
<string name="sign_out_confirmation_message_2">%s beendet die Synchronisation mit Ihrem Konto, löscht aber keine Surf-Daten auf diesem Gerät.</string>
|
||||||
|
@@ -1891,7 +1891,7 @@
|
||||||
|
<!-- Title of an app feature. Smaller than a heading.-->
|
||||||
|
<string name="pocket_stories_feature_title">Bereitgestellt von Pocket</string>
|
||||||
|
<!-- Caption for describing a certain feature. The placeholder is for a clickable text (eg: Learn more) which will load an url in a new tab when clicked. -->
|
||||||
|
- <string name="pocket_stories_feature_caption">Teil der Waterfox-Familie. %s</string>
|
||||||
|
+ <string name="pocket_stories_feature_caption">Teil der LeOsium-Familie. %s</string>
|
||||||
|
<!-- Clickable text for opening an external link for more information about Pocket. -->
|
||||||
|
<string name="pocket_stories_feature_learn_more">Weitere Informationen</string>
|
||||||
|
|
||||||
|
@@ -1902,5 +1902,5 @@
|
||||||
|
<string name="experiments_snackbar">Telemetrie aktivieren, um Daten zu senden.</string>
|
||||||
|
<!-- Snackbar button text to navigate to telemetry settings.-->
|
||||||
|
<string name="experiments_snackbar_button">Einstellungen öffnen</string>
|
||||||
|
- <string name="firefox_suggest_header">Waterfox-Vorschläge</string>
|
||||||
|
+ <string name="firefox_suggest_header">LeOsium-Vorschläge</string>
|
||||||
|
</resources>
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
From e24b203797ccf295287e58bdc7867c07480009f9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Thu, 26 Dec 2024 09:45:59 +0100
|
||||||
|
Subject: [PATCH] Values_Strings_Harvey186
|
||||||
|
|
||||||
|
---
|
||||||
|
app/src/main/res/values/strings.xml | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
|
||||||
|
index b71d91644..bbd2dc28f 100644
|
||||||
|
--- a/app/src/main/res/values/strings.xml
|
||||||
|
+++ b/app/src/main/res/values/strings.xml
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
<string name="recently_saved_menu_item_remove">Remove</string>
|
||||||
|
|
||||||
|
<!-- About content. The first parameter is the name of the application. (For example: LeOSium) -->
|
||||||
|
- <string name="about_content">%1$s is made by BrowserWorks</string>
|
||||||
|
+ <string name="about_content">%1$s is made by Harvey186</string>
|
||||||
|
|
||||||
|
<!-- Private Browsing -->
|
||||||
|
<!-- Explanation for private browsing displayed to users on home view when they first enable private mode
|
||||||
|
@@ -773,7 +773,7 @@
|
||||||
|
<!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: LeOSium) -->
|
||||||
|
<string name="tab_crash_title_2">Sorry. %1$s can’t load that page.</string>
|
||||||
|
<!-- Send crash report checkbox text on the tab crash page -->
|
||||||
|
- <string name="tab_crash_send_report">Send crash report to BrowserWorks</string>
|
||||||
|
+ <string name="tab_crash_send_report">Send crash report to Harvey186</string>
|
||||||
|
<!-- Close tab button text on the tab crash page -->
|
||||||
|
<string name="tab_crash_close">Close tab</string>
|
||||||
|
<!-- Restore tab button text on the tab crash page -->
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
From 3621e5dc88f18d8fab74a10f7bb0ec51adea2e6e Mon Sep 17 00:00:00 2001
|
||||||
|
From: harvey186 <harvey186@hotmail.com>
|
||||||
|
Date: Thu, 26 Dec 2024 11:06:34 +0100
|
||||||
|
Subject: [PATCH] network.trr.mode
|
||||||
|
|
||||||
|
---
|
||||||
|
app/src/main/assets/geckoview-config.yaml | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/app/src/main/assets/geckoview-config.yaml b/app/src/main/assets/geckoview-config.yaml
|
||||||
|
index f2aedf0..dbd1d24 100644
|
||||||
|
--- a/app/src/main/assets/geckoview-config.yaml
|
||||||
|
+++ b/app/src/main/assets/geckoview-config.yaml
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
prefs:
|
||||||
|
- network.trr.mode: 2
|
||||||
|
+ network.trr.mode: 0
|
||||||
|
network.trr.ohttp.config_uri: "https://dooh.cloudflare-dns.com/.well-known/doohconfig"
|
||||||
|
network.trr.ohttp.uri: "https://dooh.cloudflare-dns.com/dns-query"
|
||||||
|
network.trr.ohttp.relay_uri: "https://dooh.waterfox.net/"
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
cd Waterfox-Android/app/src/main/res
|
||||||
|
|
||||||
|
|
||||||
|
grep -RiIl ' BrowserWorks' | xargs sed -i 's/ BrowserWorkd/ Harvey186/g'
|
||||||
|
grep -RiIl ' Waterfox' | xargs sed -i 's/Waterfox/LeOSium/g'
|
||||||
|
|
||||||
|
cd ../../../..
|
||||||
Loading…
Reference in New Issue