From 8c59e54677264acc7843d2ee3e55cef6114f62ca Mon Sep 17 00:00:00 2001
From: Donovan Preston <donovanpreston@gmail.com>
Date: Tue, 12 Mar 2019 12:35:45 -0400
Subject: [PATCH] Switch the package name, for signing with a new key; switch
 the server to send.firefox.com

---
 android/android.js                                            | 2 +-
 android/app/build.gradle                                      | 2 +-
 android/app/src/main/AndroidManifest.xml                      | 4 ++--
 .../org/mozilla/{sendandroid => firefoxsend}/MainActivity.kt  | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename android/app/src/main/java/org/mozilla/{sendandroid => firefoxsend}/MainActivity.kt (98%)

diff --git a/android/android.js b/android/android.js
index ed6a9a9a..bedc8626 100644
--- a/android/android.js
+++ b/android/android.js
@@ -22,7 +22,7 @@ import { getTranslator } from '../app/locale';
 import { delay } from '../app/utils';
 
 if (navigator.userAgent === 'Send Android') {
-  setApiUrlPrefix('https://send2.dev.lcip.org');
+  setApiUrlPrefix('https://send.firefox.com');
 }
 
 const app = choo();
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e6c53b0c..5d27365d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "org.mozilla.sendandroid"
+        applicationId "org.mozilla.firefoxsend"
         minSdkVersion 26
         targetSdkVersion 27
         versionCode 1
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1448cf83..9e4163fa 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.sendandroid">
+    package="org.mozilla.firefoxsend">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -13,7 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing" android:value="false" />
-        <activity android:name=".MainActivity" android:screenOrientation="portrait">
+        <activity android:name="org.mozilla.firefoxsend.MainActivity" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt b/android/app/src/main/java/org/mozilla/firefoxsend/MainActivity.kt
similarity index 98%
rename from android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt
rename to android/app/src/main/java/org/mozilla/firefoxsend/MainActivity.kt
index 114a1914..257b326f 100644
--- a/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt
+++ b/android/app/src/main/java/org/mozilla/firefoxsend/MainActivity.kt
@@ -1,11 +1,10 @@
-package org.mozilla.sendandroid
+package org.mozilla.firefoxsend
 
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import im.delight.android.webview.AdvancedWebView
 import android.graphics.Bitmap
-import android.content.Context
 import android.content.Intent
 import android.annotation.SuppressLint
 import android.content.ComponentName
@@ -20,7 +19,6 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebChromeClient
 import mozilla.components.service.fxa.Config
 import mozilla.components.service.fxa.FirefoxAccount
-import mozilla.components.service.fxa.OAuthInfo
 import mozilla.components.service.fxa.Profile
 import mozilla.components.service.fxa.FxaResult