From 0ad26ca8cbe9a42af793a693a855caf17a6edbec Mon Sep 17 00:00:00 2001
From: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
Date: Thu, 26 Nov 2020 19:21:30 +0100
Subject: [PATCH] replace master with main (#1735)

remove pronouns
---
 .../util/security/EncryptedPreferencesFactory.kt              | 4 ++--
 Corona-Warn-App/src/main/res/values-de/strings.xml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/EncryptedPreferencesFactory.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/EncryptedPreferencesFactory.kt
index f672b43e1..317e3e765 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/EncryptedPreferencesFactory.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/EncryptedPreferencesFactory.kt
@@ -16,13 +16,13 @@ class EncryptedPreferencesFactory @Inject constructor(
     @AppContext private val context: Context
 ) {
 
-    private val masterKeyAlias by lazy {
+    private val mainKeyAlias by lazy {
         MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
     }
 
     private fun createInstance(fileName: String) = EncryptedSharedPreferences.create(
         fileName,
-        masterKeyAlias,
+        mainKeyAlias,
         context,
         EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
         EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 33b44e377..c89492096 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -620,7 +620,7 @@
     <string name="settings_notifications_illustration_description_inactive">"Eine Frau hat die Mitteilungen ihrer Corona-Warn-App ausgeschaltet."</string>
     <!-- XBUT: settings - go to reset application -->
     <string name="settings_reset_title">"Anwendung zurücksetzen"</string>
-    <!-- XTXT: settings(reset) - explains the user what do expect when he navigates to reset -->
+    <!-- XTXT: settings(reset) - explains the user what do expect when navigating to reset -->
     <string name="settings_reset_body_description">"Löschen Sie alle Ihre Daten in der App."</string>
     <!-- XHED: settings(reset) - multiline headline below illustration -->
     <string name="settings_reset_headline">"Sind Sie sicher, dass Sie die Anwendung zurücksetzen wollen?"</string>
-- 
GitLab