Issue #4820: Switch from 'master' to 'main' branch and remove unused …

…code.

.github/ISSUE_TEMPLATE/release_checklist_template.md

@@ -14,15 +14,15 @@ Code freeze for a milestone is the *second Friday of the sprint*, and most of re
 
 ## Feature complete [Monday, 1st week of next milestone]
 
-- [ ] Create a branch for the *current* milestone and protect it through Settings on the repo (need admin privileges). After that master is tracking the next milestone. Usually done on the Monday after feature complete on Friday.
+- [ ] Create a branch for the *current* milestone and protect it through Settings on the repo (need admin privileges). After that `main` is tracking the next milestone. Usually done on the Monday after feature complete on Friday.
 - [ ] Create an issue in the *upcoming* milestone: "What's New Entry for [release]" to track work for the SUMO page ([example](https://github.com/mozilla-mobile/focus-android/issues/1670)).
 - [ ] [Create an issue](https://github.com/mozilla-mobile/focus-android/issues/new?template=release_checklist_template.md&title=Releng+for+) in the *upcoming* milestone: "Releng for [release]" and copy this checklist into it. Assign the next assignee.
 - [ ] Go through the list of bugs closed during this sprint and make sure all they're all added to the correct milestone.
 - [ ] Make sure new What's New Link is updated in SupportUtils for release
 - [ ] Add either `ReadyForQA` or `QANotNeeded` flags on each of the bugs in the current milestone.
 
 ## Final string Import [Wednesday, 1st week of next milestone]
-- [ ] Cherry pick any new string import commits from `master` into the release branch
+- [ ] Cherry pick any new string import commits from `main` into the release branch
 
 ## Beta Submission [Thursday, 1st week of next milestone]
 
@@ -40,7 +40,7 @@ Code freeze for a milestone is the *second Friday of the sprint*, and most of re
 ## During Beta
 
 - [ ] Check Google Play for new crashes. File issues and triage.
-- [ ] If bugs are considered release blocker then fix them on master and the milestone branch (cherry-pick / uplift)
+- [ ] If bugs are considered release blocker then fix them on `main` and the milestone branch (cherry-pick / uplift)
 - [ ] If needed tag a new RC version (e.g. v1.0-RC2) and follow the submission checklist again.
 
 ## Release

.taskcluster.yml

@@ -33,7 +33,6 @@ tasks:
             && git config advice.detachedHead false
             && git checkout ${event.pull_request.head.sha}
             && echo "--" > .adjust_token
-            && python tools/l10n/check_locales.py
             && ./gradlew --no-daemon clean assembleFocusDebug assembleKlarNightly assembleRelease detekt ktlint lintFocusDebug lintKlarNightly assembleFocusDebugAndroidTest testFocusDebugUnitTest testKlarNightlyUnitTest
             && pip install "compare-locales>=5.0.2,<6.0"
             && compare-locales --validate l10n.toml .
@@ -99,15 +98,15 @@ tasks:
               && git submodule update --init
               && git config advice.detachedHead false
               && git checkout ${event.after}
-              && python tools/taskcluster/schedule-master-build.py
+              && python tools/taskcluster/schedule-main-build.py
           artifacts:
             public:
               type: directory
               path: /opt/focus-android/test_artifacts
               expires: {$fromNow: '1 week'}
         metadata:
           name: (Focus for Android) Schedule tasks
-          description: Scheduling tasks for master push
+          description: Scheduling tasks for main branch push
           owner: ${event.pusher.name}@users.noreply.github.com
           source: ${event.repository.url}
 ###############################################################################
@@ -236,7 +235,7 @@ tasks:
             - -cx
             - >-
               git fetch origin
-              && git reset --hard origin/master
+              && git reset --hard origin/main
               && git submodule update --init
               && python tools/taskcluster/release.py \
                 --channel nightly \

CONTRIBUTING.md

@@ -1,4 +1,4 @@
 # Contributing to Focus for Android
 
 Please see our guidelines in our shared-docs repo:
-https://github.com/mozilla-mobile/shared-docs/blob/master/android/CONTRIBUTING.md
+https://github.com/mozilla-mobile/shared-docs/blob/main/android/CONTRIBUTING.md

README.md

@@ -1,10 +1,5 @@
 # Firefox Focus for Android
 
-[![Build Status](https://travis-ci.org/mozilla-mobile/focus-android.svg?branch=master)](https://travis-ci.org/mozilla-mobile/focus-android)
-[![Task Status](https://github.taskcluster.net/v1/repository/mozilla-mobile/focus-android/master/badge.svg)](https://github.taskcluster.net/v1/repository/mozilla-mobile/focus-android/master/latest)
-[![codecov](https://codecov.io/gh/mozilla-mobile/focus-android/branch/master/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/focus-android/branch/master)
-
-
 _Browse like no one’s watching. The new Firefox Focus automatically blocks a wide range of online trackers — from the moment you launch it to the second you leave it. Easily erase your history, passwords and cookies, so you won’t get followed by things like unwanted ads._ 
 
 Firefox Focus provides automatic ad blocking and tracking protection on an easy-to-use private browser.
@@ -22,7 +17,7 @@ We encourage you to participate in this open source project. We love Pull Reques
 
 Before you attempt to make a contribution please read the [Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/).
 
-* [Guide to Contributing](https://github.com/mozilla-mobile/shared-docs/blob/master/android/CONTRIBUTING.md) (**New contributors start here!**)
+* [Guide to Contributing](https://github.com/mozilla-mobile/shared-docs/blob/main/android/CONTRIBUTING.md) (**New contributors start here!**)
 
 * [View current Issues](https://github.com/mozilla-mobile/focus-android/issues), [view current Pull Requests](https://github.com/mozilla-mobile/focus-android/pulls), or [file a security issue][sec issue].
 

app/proguard-rules.pro

@@ -15,33 +15,6 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
-# The Buddybuild SDK builds using ACRA 4.6.4, which is afflictted
-# by the following bug: https://github.com/ACRA/acra/issues/301
-# That is fixed in ACRA 4.7, but we need to wait for Buddybuild to upgrade
-# for that to be fixed. (Note: this only affects BuddyBuild builds where
-# the BuddyBuild SDK is enabled, and is not visible in local builds. You can
-# enable the BuddyBuild SDK per branch for testing, by default it is only
-# used for master.)
--dontwarn org.acra.ErrorReporter
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-
 ####################################################################################################
 # Adjust
 ####################################################################################################