GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit a0cfb234 authored by Matthew Finkel's avatar Matthew Finkel Committed by Alex Catarineu
Browse files

Bug 40020: Change applicationId

parent a5c0a376
...@@ -20,7 +20,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType ...@@ -20,7 +20,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
android { android {
compileSdkVersion Config.compileSdkVersion compileSdkVersion Config.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "org.mozilla" applicationId "org.torproject"
minSdkVersion Config.minSdkVersion minSdkVersion Config.minSdkVersion
targetSdkVersion Config.targetSdkVersion targetSdkVersion Config.targetSdkVersion
versionCode 1 versionCode 1
...@@ -57,12 +57,12 @@ android { ...@@ -57,12 +57,12 @@ android {
debug { debug {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
applicationIdSuffix ".fenix.debug" applicationIdSuffix ".torbrowser_debug"
resValue "bool", "IS_DEBUG", "true" resValue "bool", "IS_DEBUG", "true"
pseudoLocalesEnabled true pseudoLocalesEnabled true
} }
nightly releaseTemplate >> { nightly releaseTemplate >> {
applicationIdSuffix ".fenix" applicationIdSuffix ".torbrowser_nightly"
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
def deepLinkSchemeValue = "fenix-nightly" def deepLinkSchemeValue = "fenix-nightly"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
...@@ -70,7 +70,7 @@ android { ...@@ -70,7 +70,7 @@ android {
} }
beta releaseTemplate >> { beta releaseTemplate >> {
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
applicationIdSuffix ".firefox_beta" applicationIdSuffix ".torbrowser_alpha"
def deepLinkSchemeValue = "fenix-beta" def deepLinkSchemeValue = "fenix-beta"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
manifestPlaceholders = [ manifestPlaceholders = [
...@@ -81,13 +81,13 @@ android { ...@@ -81,13 +81,13 @@ android {
// fatal consequences. For example see: // fatal consequences. For example see:
// - https://issuetracker.google.com/issues/36924841 // - https://issuetracker.google.com/issues/36924841
// - https://issuetracker.google.com/issues/36905922 // - https://issuetracker.google.com/issues/36905922
"sharedUserId": "org.mozilla.firefox.sharedID", "sharedUserId": "org.torproject.torbrowser_alpha.sharedID",
"deepLinkScheme": deepLinkSchemeValue "deepLinkScheme": deepLinkSchemeValue
] ]
} }
release releaseTemplate >> { release releaseTemplate >> {
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
applicationIdSuffix ".firefox" applicationIdSuffix ".torbrowser"
def deepLinkSchemeValue = "fenix" def deepLinkSchemeValue = "fenix"
buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
manifestPlaceholders = [ manifestPlaceholders = [
...@@ -98,7 +98,7 @@ android { ...@@ -98,7 +98,7 @@ android {
// fatal consequences. For example see: // fatal consequences. For example see:
// - https://issuetracker.google.com/issues/36924841 // - https://issuetracker.google.com/issues/36924841
// - https://issuetracker.google.com/issues/36905922 // - https://issuetracker.google.com/issues/36905922
"sharedUserId": "org.mozilla.firefox.sharedID", "sharedUserId": "org.torproject.torbrowser.sharedID",
"deepLinkScheme": deepLinkSchemeValue "deepLinkScheme": deepLinkSchemeValue
] ]
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.firefox_beta" android:targetPackage="org.torproject.torbrowser_alpha"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.firefox_beta" android:targetPackage="org.torproject.torbrowser_alpha"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix.debug" android:targetPackage="org.torproject.torbrowser_debug"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix.debug" android:targetPackage="org.torproject.torbrowser_debug"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.torproject.torbrowser_dev"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.torproject.torbrowser_dev"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.torproject.torbrowser_nightly"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.torproject.torbrowser_nightly"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.firefox" android:targetPackage="org.torproject.torbrowser"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
<shortcut <shortcut
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2"> android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.firefox" android:targetPackage="org.torproject.torbrowser"
android:targetClass="org.mozilla.fenix.IntentReceiverActivity" /> android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
</shortcut> </shortcut>
</shortcuts> </shortcuts>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment