From de75f133a7ec654d2a7c5bf628b3aee9fc109730 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 19 Apr 2019 02:02:56 +0200 Subject: Remove Firefox Accounts service and tie-ins. See previous commit for removal of browser identity module. --- mobile/android/app/mobile.js | 12 - mobile/android/base/android-services.mozbuild | 61 - .../java/org/mozilla/gecko/push/PushService.java | 24 +- .../android/base/resources/values-v21/themes.xml | 5 - mobile/android/chrome/content/aboutAccounts.js | 351 ------ mobile/android/chrome/content/aboutAccounts.xhtml | 83 -- mobile/android/chrome/content/browser.js | 14 - mobile/android/chrome/jar.mn | 2 - mobile/android/components/FxAccountsPush.js | 164 --- .../android/components/MobileComponents.manifest | 5 - mobile/android/components/moz.build | 1 - mobile/android/config/proguard/proguard.cfg | 2 - mobile/android/confvars.sh | 2 +- mobile/android/installer/package-manifest.in | 1 - mobile/android/modules/Accounts.jsm | 105 +- mobile/android/modules/FxAccountsWebChannel.jsm | 394 ------- mobile/android/modules/moz.build | 1 - mobile/android/services/README.txt | 1 - .../FxAccountAndroidManifest_activities.xml.in | 63 -- .../FxAccountAndroidManifest_permissions.xml.in | 18 - .../FxAccountAndroidManifest_services.xml.in | 34 - .../gecko/background/ReadingListConstants.java | 23 - .../gecko/background/common/EditorBranch.java | 82 -- .../gecko/background/common/GlobalConstants.java | 90 -- .../gecko/background/common/PrefsBranch.java | 83 -- .../gecko/background/common/log/Logger.java | 232 ---- .../log/writers/AndroidLevelCachingLogWriter.java | 132 --- .../common/log/writers/AndroidLogWriter.java | 46 - .../log/writers/LevelFilteringLogWriter.java | 67 -- .../background/common/log/writers/LogWriter.java | 29 - .../common/log/writers/PrintLogWriter.java | 77 -- .../common/log/writers/SimpleTagLogWriter.java | 21 - .../common/log/writers/StringLogWriter.java | 57 - .../common/log/writers/TagLogWriter.java | 55 - .../log/writers/ThreadLocalTagLogWriter.java | 25 - .../common/telemetry/TelemetryWrapper.java | 56 - .../mozilla/gecko/background/db/CursorDumper.java | 99 -- .../java/org/mozilla/gecko/background/db/Tab.java | 86 -- .../background/fxa/FxAccount20CreateDelegate.java | 52 - .../background/fxa/FxAccount20LoginDelegate.java | 36 - .../gecko/background/fxa/FxAccountClient.java | 24 - .../gecko/background/fxa/FxAccountClient20.java | 914 --------------- .../background/fxa/FxAccountClientException.java | 133 --- .../gecko/background/fxa/FxAccountRemoteError.java | 33 - .../gecko/background/fxa/FxAccountUtils.java | 217 ---- .../gecko/background/fxa/PasswordStretcher.java | 12 - .../background/fxa/QuickPasswordStretcher.java | 35 - .../mozilla/gecko/background/fxa/SkewHandler.java | 111 -- .../fxa/oauth/FxAccountAbstractClient.java | 224 ---- .../oauth/FxAccountAbstractClientException.java | 68 -- .../fxa/oauth/FxAccountOAuthClient10.java | 129 --- .../fxa/oauth/FxAccountOAuthRemoteError.java | 19 - .../fxa/profile/FxAccountProfileClient10.java | 59 - .../gecko/background/nativecode/NativeCrypto.java | 60 - .../background/preferences/PreferenceFragment.java | 326 ------ .../preferences/PreferenceManagerCompat.java | 226 ---- .../java/org/mozilla/gecko/browserid/ASNUtils.java | 82 -- .../mozilla/gecko/browserid/BrowserIDKeyPair.java | 35 - .../gecko/browserid/DSACryptoImplementation.java | 255 ----- .../mozilla/gecko/browserid/JSONWebTokenUtils.java | 245 ---- .../gecko/browserid/MockMyIDTokenFactory.java | 128 --- .../gecko/browserid/RSACryptoImplementation.java | 182 --- .../mozilla/gecko/browserid/SigningPrivateKey.java | 41 - .../gecko/browserid/VerifyingPublicKey.java | 34 - .../AbstractBrowserIDRemoteVerifierClient.java | 95 -- .../verifier/BrowserIDRemoteVerifierClient10.java | 62 -- .../verifier/BrowserIDRemoteVerifierClient20.java | 58 - .../verifier/BrowserIDVerifierClient.java | 9 - .../verifier/BrowserIDVerifierDelegate.java | 13 - .../verifier/BrowserIDVerifierException.java | 41 - .../java/org/mozilla/gecko/fxa/AccountLoader.java | 227 ---- .../org/mozilla/gecko/fxa/FirefoxAccounts.java | 222 ---- .../org/mozilla/gecko/fxa/FxAccountConstants.java | 75 -- .../org/mozilla/gecko/fxa/FxAccountDevice.java | 81 -- .../gecko/fxa/FxAccountDeviceRegistrator.java | 282 ----- .../mozilla/gecko/fxa/FxAccountPushHandler.java | 95 -- .../org/mozilla/gecko/fxa/SyncStatusListener.java | 31 - .../fxa/activities/CustomColorPreference.java | 52 - .../fxa/activities/FxAccountAbstractActivity.java | 80 -- .../FxAccountConfirmAccountActivityWeb.java | 11 - .../FxAccountFinishMigratingActivityWeb.java | 11 - .../activities/FxAccountGetStartedActivityWeb.java | 11 - .../fxa/activities/FxAccountStatusActivity.java | 228 ---- .../fxa/activities/FxAccountStatusFragment.java | 949 ---------------- .../FxAccountUpdateCredentialsActivityWeb.java | 11 - .../fxa/activities/FxAccountWebFlowActivity.java | 91 -- .../activities/PicassoPreferenceIconTarget.java | 63 -- .../gecko/fxa/authenticator/AccountPickler.java | 362 ------ .../gecko/fxa/authenticator/AndroidFxAccount.java | 929 ---------------- .../FxADefaultLoginStateMachineDelegate.java | 84 -- .../fxa/authenticator/FxAccountAuthenticator.java | 385 ------- .../FxAccountAuthenticatorService.java | 55 - .../fxa/authenticator/FxAccountLoginDelegate.java | 26 - .../fxa/authenticator/FxAccountLoginException.java | 33 - .../gecko/fxa/login/BaseRequestDelegate.java | 49 - .../org/mozilla/gecko/fxa/login/Cohabiting.java | 50 - .../java/org/mozilla/gecko/fxa/login/Doghouse.java | 25 - .../java/org/mozilla/gecko/fxa/login/Engaged.java | 91 -- .../fxa/login/FxAccountLoginStateMachine.java | 84 -- .../gecko/fxa/login/FxAccountLoginTransition.java | 68 -- .../java/org/mozilla/gecko/fxa/login/Married.java | 117 -- .../gecko/fxa/login/MigratedFromSync11.java | 28 - .../org/mozilla/gecko/fxa/login/Separated.java | 25 - .../java/org/mozilla/gecko/fxa/login/State.java | 72 -- .../org/mozilla/gecko/fxa/login/StateFactory.java | 206 ---- .../gecko/fxa/login/TokensAndKeysState.java | 45 - .../fxa/receivers/FxAccountDeletedService.java | 154 --- .../fxa/receivers/FxAccountUpgradeReceiver.java | 133 --- .../fxa/sync/FxAccountNotificationManager.java | 114 -- .../gecko/fxa/sync/FxAccountProfileService.java | 107 -- .../gecko/fxa/sync/FxAccountSchedulePolicy.java | 178 --- .../gecko/fxa/sync/FxAccountSyncAdapter.java | 568 ---------- .../gecko/fxa/sync/FxAccountSyncDelegate.java | 110 -- .../gecko/fxa/sync/FxAccountSyncService.java | 28 - .../gecko/fxa/sync/FxAccountSyncStatusHelper.java | 113 -- .../org/mozilla/gecko/fxa/sync/SchedulePolicy.java | 43 - .../gecko/push/RegisterUserAgentResponse.java | 19 - .../gecko/push/SubscribeChannelResponse.java | 19 - .../gecko/push/autopush/AutopushClient.java | 410 ------- .../push/autopush/AutopushClientException.java | 81 -- .../gecko/sync/AlreadySyncingException.java | 22 - .../org/mozilla/gecko/sync/BackoffHandler.java | 34 - .../gecko/sync/BadRequiredFieldJSONException.java | 5 - .../org/mozilla/gecko/sync/CollectionKeys.java | 199 ---- .../org/mozilla/gecko/sync/CommandProcessor.java | 261 ----- .../java/org/mozilla/gecko/sync/CommandRunner.java | 22 - .../mozilla/gecko/sync/CredentialException.java | 56 - .../java/org/mozilla/gecko/sync/CryptoRecord.java | 255 ----- .../org/mozilla/gecko/sync/DelayedWorkTracker.java | 69 -- .../org/mozilla/gecko/sync/EngineSettings.java | 31 - .../org/mozilla/gecko/sync/ExtendedJSONObject.java | 426 ------- .../java/org/mozilla/gecko/sync/GlobalSession.java | 1167 -------------------- .../mozilla/gecko/sync/HTTPFailureException.java | 47 - .../org/mozilla/gecko/sync/InfoCollections.java | 103 -- .../org/mozilla/gecko/sync/InfoConfiguration.java | 93 -- .../java/org/mozilla/gecko/sync/InfoCounts.java | 67 -- .../org/mozilla/gecko/sync/JSONRecordFetcher.java | 145 --- .../org/mozilla/gecko/sync/KeyBundleProvider.java | 11 - .../java/org/mozilla/gecko/sync/MetaGlobal.java | 372 ------- .../mozilla/gecko/sync/MetaGlobalException.java | 45 - .../sync/MetaGlobalMissingEnginesException.java | 9 - .../gecko/sync/MetaGlobalNotSetException.java | 9 - .../gecko/sync/NoCollectionKeysSetException.java | 16 - .../gecko/sync/NodeAuthenticationException.java | 16 - .../mozilla/gecko/sync/NonArrayJSONException.java | 17 - .../mozilla/gecko/sync/NonObjectJSONException.java | 17 - .../gecko/sync/NullClusterURLException.java | 16 - .../mozilla/gecko/sync/PersistedMetaGlobal.java | 86 -- .../mozilla/gecko/sync/PrefsBackoffHandler.java | 59 - .../main/java/org/mozilla/gecko/sync/README.txt | 1 - .../sync/Server11PreviousPostFailedException.java | 12 - .../sync/Server11RecordPostFailedException.java | 12 - .../sync/SharedPreferencesClientsDataDelegate.java | 121 -- .../mozilla/gecko/sync/Sync11Configuration.java | 84 -- .../org/mozilla/gecko/sync/SyncConfiguration.java | 480 -------- .../gecko/sync/SyncConfigurationException.java | 16 - .../java/org/mozilla/gecko/sync/SyncConstants.java | 20 - .../java/org/mozilla/gecko/sync/SyncException.java | 34 - .../gecko/sync/SynchronizerConfiguration.java | 68 -- .../java/org/mozilla/gecko/sync/ThreadPool.java | 15 - .../gecko/sync/UnexpectedJSONException.java | 25 - ...nSynchronizerConfigurationVersionException.java | 16 - .../main/java/org/mozilla/gecko/sync/Utils.java | 575 ---------- .../mozilla/gecko/sync/crypto/CryptoException.java | 19 - .../org/mozilla/gecko/sync/crypto/CryptoInfo.java | 232 ---- .../java/org/mozilla/gecko/sync/crypto/HKDF.java | 128 --- .../sync/crypto/HMACVerificationException.java | 12 - .../org/mozilla/gecko/sync/crypto/KeyBundle.java | 135 --- .../sync/crypto/MissingCryptoInputException.java | 9 - .../gecko/sync/crypto/NoKeyBundleException.java | 9 - .../java/org/mozilla/gecko/sync/crypto/PBKDF2.java | 78 -- .../gecko/sync/crypto/PersistedCrypto5Keys.java | 103 -- .../gecko/sync/delegates/ClientsDataDelegate.java | 28 - .../gecko/sync/delegates/FreshStartDelegate.java | 10 - .../sync/delegates/GlobalSessionCallback.java | 49 - .../sync/delegates/JSONRecordFetchDelegate.java | 19 - .../gecko/sync/delegates/KeyUploadDelegate.java | 21 - .../gecko/sync/delegates/MetaGlobalDelegate.java | 15 - .../gecko/sync/delegates/WipeServerDelegate.java | 10 - .../middleware/Crypto5MiddlewareRepository.java | 76 -- .../Crypto5MiddlewareRepositorySession.java | 172 --- .../sync/middleware/MiddlewareRepository.java | 22 - .../middleware/MiddlewareRepositorySession.java | 185 ---- .../net/AbstractBearerTokenAuthHeaderProvider.java | 34 - .../mozilla/gecko/sync/net/AuthHeaderProvider.java | 30 - .../org/mozilla/gecko/sync/net/BaseResource.java | 565 ---------- .../gecko/sync/net/BaseResourceDelegate.java | 44 - .../gecko/sync/net/BasicAuthHeaderProvider.java | 51 - .../gecko/sync/net/BearerAuthHeaderProvider.java | 22 - .../sync/net/BrowserIDAuthHeaderProvider.java | 23 - .../gecko/sync/net/ConnectionMonitorThread.java | 44 - .../sync/net/GzipNonChunkedCompressingEntity.java | 92 -- .../gecko/sync/net/HMACAuthHeaderProvider.java | 257 ----- .../gecko/sync/net/HandleProgressException.java | 15 - .../gecko/sync/net/HawkAuthHeaderProvider.java | 403 ------- .../gecko/sync/net/HttpResponseObserver.java | 20 - .../org/mozilla/gecko/sync/net/MozResponse.java | 225 ---- .../java/org/mozilla/gecko/sync/net/Resource.java | 20 - .../mozilla/gecko/sync/net/ResourceDelegate.java | 55 - .../org/mozilla/gecko/sync/net/SRPConstants.java | 174 --- .../org/mozilla/gecko/sync/net/SyncResponse.java | 157 --- .../sync/net/SyncStorageCollectionRequest.java | 145 --- .../net/SyncStorageCollectionRequestDelegate.java | 9 - .../gecko/sync/net/SyncStorageRecordRequest.java | 95 -- .../mozilla/gecko/sync/net/SyncStorageRequest.java | 204 ---- .../gecko/sync/net/SyncStorageRequestDelegate.java | 38 - .../net/SyncStorageRequestIncrementalDelegate.java | 9 - .../gecko/sync/net/SyncStorageResponse.java | 85 -- .../mozilla/gecko/sync/net/TLSSocketFactory.java | 62 -- .../sync/net/WBOCollectionRequestDelegate.java | 35 - .../mozilla/gecko/sync/net/WBORequestDelegate.java | 14 - .../BookmarkNeedsReparentingException.java | 17 - .../sync/repositories/BookmarksRepository.java | 16 - .../ConstrainedServer11Repository.java | 51 - .../sync/repositories/FetchFailedException.java | 11 - .../sync/repositories/HashSetStoreTracker.java | 61 - .../gecko/sync/repositories/HistoryRepository.java | 16 - .../sync/repositories/IdentityRecordFactory.java | 15 - .../repositories/InactiveSessionException.java | 17 - .../repositories/InvalidBookmarkTypeException.java | 17 - .../sync/repositories/InvalidRequestException.java | 16 - .../InvalidSessionTransitionException.java | 17 - .../MultipleRecordsForGuidException.java | 16 - .../repositories/NoContentProviderException.java | 25 - .../sync/repositories/NoGuidForIdException.java | 16 - .../repositories/NoStoreDelegateException.java | 11 - .../sync/repositories/NullCursorException.java | 17 - .../sync/repositories/ParentNotFoundException.java | 17 - .../repositories/ProfileDatabaseException.java | 17 - .../gecko/sync/repositories/RecordFactory.java | 13 - .../gecko/sync/repositories/RecordFilter.java | 11 - .../gecko/sync/repositories/Repository.java | 18 - .../gecko/sync/repositories/RepositorySession.java | 384 ------- .../sync/repositories/RepositorySessionBundle.java | 55 - .../sync/repositories/Server11Repository.java | 144 --- .../repositories/Server11RepositorySession.java | 104 -- .../sync/repositories/StoreFailedException.java | 11 - .../gecko/sync/repositories/StoreTracker.java | 82 -- .../StoreTrackingRepositorySession.java | 102 -- .../AndroidBrowserBookmarksDataAccessor.java | 326 ------ .../android/AndroidBrowserBookmarksRepository.java | 25 - .../AndroidBrowserBookmarksRepositorySession.java | 1107 ------------------- .../android/AndroidBrowserHistoryDataAccessor.java | 188 ---- .../android/AndroidBrowserHistoryRepository.java | 25 - .../AndroidBrowserHistoryRepositorySession.java | 208 ---- .../android/AndroidBrowserRepository.java | 74 -- .../AndroidBrowserRepositoryDataAccessor.java | 232 ---- .../android/AndroidBrowserRepositorySession.java | 792 ------------- .../android/BookmarksDeletionManager.java | 239 ---- .../android/BookmarksInsertionManager.java | 298 ----- .../android/BrowserContractHelpers.java | 154 --- .../android/CachedSQLiteOpenHelper.java | 62 -- .../sync/repositories/android/ClientsDatabase.java | 252 ----- .../android/ClientsDatabaseAccessor.java | 178 --- .../repositories/android/FennecTabsRepository.java | 383 ------- .../android/FormHistoryRepositorySession.java | 723 ------------ .../android/PasswordsRepositorySession.java | 725 ------------ .../gecko/sync/repositories/android/RepoUtils.java | 290 ----- .../sync/repositories/android/VisitsHelper.java | 130 --- ...eferrableRepositorySessionCreationDelegate.java | 41 - .../DeferredRepositorySessionBeginDelegate.java | 46 - ...erredRepositorySessionFetchRecordsDelegate.java | 56 - .../DeferredRepositorySessionFinishDelegate.java | 51 - .../DeferredRepositorySessionStoreDelegate.java | 57 - .../delegates/RepositorySessionBeginDelegate.java | 23 - .../delegates/RepositorySessionCleanDelegate.java | 12 - .../RepositorySessionCreationDelegate.java | 15 - .../RepositorySessionFetchRecordsDelegate.java | 27 - .../delegates/RepositorySessionFinishDelegate.java | 16 - .../RepositorySessionGuidsSinceDelegate.java | 10 - .../delegates/RepositorySessionStoreDelegate.java | 23 - .../delegates/RepositorySessionWipeDelegate.java | 13 - .../sync/repositories/domain/BookmarkRecord.java | 488 -------- .../repositories/domain/BookmarkRecordFactory.java | 25 - .../sync/repositories/domain/ClientRecord.java | 231 ---- .../repositories/domain/ClientRecordFactory.java | 17 - .../repositories/domain/FormHistoryRecord.java | 139 --- .../sync/repositories/domain/HistoryRecord.java | 217 ---- .../repositories/domain/HistoryRecordFactory.java | 25 - .../sync/repositories/domain/PasswordRecord.java | 205 ---- .../repositories/domain/PasswordRecordFactory.java | 19 - .../gecko/sync/repositories/domain/Record.java | 308 ------ .../repositories/domain/RecordParseException.java | 14 - .../gecko/sync/repositories/domain/TabsRecord.java | 153 --- .../repositories/domain/TabsRecordFactory.java | 17 - .../sync/repositories/domain/VersionConstants.java | 14 - .../downloaders/BatchingDownloader.java | 310 ------ .../downloaders/BatchingDownloaderDelegate.java | 91 -- .../sync/repositories/uploaders/BatchMeta.java | 165 --- .../repositories/uploaders/BatchingUploader.java | 344 ------ .../repositories/uploaders/BufferSizeTracker.java | 103 -- .../repositories/uploaders/MayUploadProvider.java | 9 - .../gecko/sync/repositories/uploaders/Payload.java | 66 -- .../uploaders/PayloadUploadDelegate.java | 185 ---- .../uploaders/RecordUploadRunnable.java | 176 --- .../org/mozilla/gecko/sync/setup/Constants.java | 29 - .../gecko/sync/setup/InvalidSyncKeyException.java | 9 - .../gecko/sync/setup/activities/ActivityUtils.java | 34 - .../gecko/sync/setup/activities/WebURLFinder.java | 161 --- .../sync/stage/AbstractNonRepositorySyncStage.java | 26 - .../stage/AbstractSessionManagingSyncStage.java | 43 - .../AndroidBrowserBookmarksServerSyncStage.java | 80 -- .../AndroidBrowserHistoryServerSyncStage.java | 74 -- .../gecko/sync/stage/CheckPreconditionsStage.java | 13 - .../mozilla/gecko/sync/stage/CompletedStage.java | 16 - .../gecko/sync/stage/EnsureCrypto5KeysStage.java | 192 ---- .../sync/stage/FennecTabsServerSyncStage.java | 40 - .../sync/stage/FetchInfoCollectionsStage.java | 44 - .../sync/stage/FetchInfoConfigurationStage.java | 59 - .../gecko/sync/stage/FetchMetaGlobalStage.java | 79 -- .../sync/stage/FormHistoryServerSyncStage.java | 76 -- .../mozilla/gecko/sync/stage/GlobalSyncStage.java | 93 -- .../gecko/sync/stage/NoSuchStageException.java | 13 - .../gecko/sync/stage/PasswordsServerSyncStage.java | 38 - .../stage/SafeConstrainedServer11Repository.java | 110 -- .../mozilla/gecko/sync/stage/ServerSyncStage.java | 627 ----------- .../gecko/sync/stage/SyncClientsEngineStage.java | 691 ------------ .../gecko/sync/stage/UploadMetaGlobalStage.java | 18 - .../synchronizer/ConcurrentRecordConsumer.java | 122 -- .../gecko/sync/synchronizer/RecordConsumer.java | 26 - .../gecko/sync/synchronizer/RecordsChannel.java | 292 ----- .../sync/synchronizer/RecordsChannelDelegate.java | 13 - .../sync/synchronizer/RecordsConsumerDelegate.java | 23 - .../sync/synchronizer/SerialRecordConsumer.java | 131 --- .../sync/synchronizer/ServerLocalSynchronizer.java | 18 - .../ServerLocalSynchronizerSession.java | 78 -- .../synchronizer/SessionNotBegunException.java | 19 - .../gecko/sync/synchronizer/Synchronizer.java | 105 -- .../sync/synchronizer/SynchronizerDelegate.java | 10 - .../sync/synchronizer/SynchronizerSession.java | 425 ------- .../synchronizer/SynchronizerSessionDelegate.java | 13 - .../gecko/sync/synchronizer/UnbundleError.java | 19 - .../synchronizer/UnexpectedSessionException.java | 26 - .../gecko/sync/telemetry/TelemetryContract.java | 56 - .../gecko/tokenserver/TokenServerClient.java | 330 ------ .../tokenserver/TokenServerClientDelegate.java | 19 - .../gecko/tokenserver/TokenServerException.java | 89 -- .../gecko/tokenserver/TokenServerToken.java | 19 - .../java/org/mozilla/gecko/util/PRNGFixes.java | 339 ------ .../res/drawable-hdpi/fxaccount_sync_error.png | Bin 543 -> 0 bytes .../main/res/drawable-hdpi/sync_avatar_default.png | Bin 5146 -> 0 bytes .../src/main/res/drawable-hdpi/sync_desktop.png | Bin 196 -> 0 bytes .../res/drawable-hdpi/sync_desktop_inactive.png | Bin 211 -> 0 bytes .../src/main/res/drawable-hdpi/sync_mobile.png | Bin 163 -> 0 bytes .../res/drawable-hdpi/sync_mobile_inactive.png | Bin 165 -> 0 bytes .../src/main/res/drawable-hdpi/sync_promo.png | Bin 994 -> 0 bytes .../res/drawable-xhdpi/fxaccount_sync_error.png | Bin 716 -> 0 bytes .../src/main/res/drawable-xhdpi/sync_desktop.png | Bin 229 -> 0 bytes .../res/drawable-xhdpi/sync_desktop_inactive.png | Bin 244 -> 0 bytes .../src/main/res/drawable-xhdpi/sync_mobile.png | Bin 210 -> 0 bytes .../res/drawable-xhdpi/sync_mobile_inactive.png | Bin 215 -> 0 bytes .../src/main/res/drawable-xhdpi/sync_promo.png | Bin 1236 -> 0 bytes .../res/drawable-xxhdpi/fxaccount_sync_error.png | Bin 1070 -> 0 bytes .../res/drawable-xxhdpi/sync_avatar_default.png | Bin 11124 -> 0 bytes .../src/main/res/drawable-xxhdpi/sync_desktop.png | Bin 339 -> 0 bytes .../res/drawable-xxhdpi/sync_desktop_inactive.png | Bin 363 -> 0 bytes .../src/main/res/drawable-xxhdpi/sync_mobile.png | Bin 246 -> 0 bytes .../res/drawable-xxhdpi/sync_mobile_inactive.png | Bin 249 -> 0 bytes .../layout/fxaccount_preference_list_fragment.xml | 40 - .../layout/fxaccount_status_error_preference.xml | 66 -- .../src/main/res/layout/homescreen_prompt.xml | 92 -- .../src/main/res/layout/simple_helper_ui.xml | 61 - .../src/main/res/menu/fxaccount_status_menu.xml | 8 - .../src/main/res/values-v11/fxaccount_styles.xml | 21 - .../src/main/res/values/fxaccount_colors.xml | 9 - .../src/main/res/values/fxaccount_dimens.xml | 18 - .../src/main/res/values/fxaccount_styles.xml | 27 - .../src/main/res/xml/fxaccount_authenticator.xml | 11 - .../src/main/res/xml/fxaccount_options.xml | 18 - .../main/res/xml/fxaccount_status_prefscreen.xml | 142 --- .../src/main/res/xml/fxaccount_syncadapter.xml | 12 - mobile/android/services/strings.xml.in | 86 -- 372 files changed, 6 insertions(+), 40066 deletions(-) delete mode 100644 mobile/android/chrome/content/aboutAccounts.js delete mode 100644 mobile/android/chrome/content/aboutAccounts.xhtml delete mode 100644 mobile/android/components/FxAccountsPush.js delete mode 100644 mobile/android/modules/FxAccountsWebChannel.jsm delete mode 100644 mobile/android/services/README.txt delete mode 100644 mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in delete mode 100644 mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in delete mode 100644 mobile/android/services/manifests/FxAccountAndroidManifest_services.xml.in delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/ReadingListConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/EditorBranch.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/GlobalConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/PrefsBranch.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/Logger.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/AndroidLevelCachingLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/AndroidLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/LevelFilteringLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/LogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/PrintLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/SimpleTagLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/StringLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/TagLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/log/writers/ThreadLocalTagLogWriter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/common/telemetry/TelemetryWrapper.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/db/CursorDumper.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/db/Tab.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccount20CreateDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccount20LoginDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountClient20.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountClientException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountRemoteError.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/FxAccountUtils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/PasswordStretcher.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/QuickPasswordStretcher.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/SkewHandler.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/oauth/FxAccountAbstractClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/oauth/FxAccountAbstractClientException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/oauth/FxAccountOAuthClient10.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/oauth/FxAccountOAuthRemoteError.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/fxa/profile/FxAccountProfileClient10.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/nativecode/NativeCrypto.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/preferences/PreferenceFragment.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/background/preferences/PreferenceManagerCompat.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/ASNUtils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/BrowserIDKeyPair.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/DSACryptoImplementation.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/JSONWebTokenUtils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/MockMyIDTokenFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/RSACryptoImplementation.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/SigningPrivateKey.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/VerifyingPublicKey.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/BrowserIDRemoteVerifierClient10.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/BrowserIDRemoteVerifierClient20.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/BrowserIDVerifierClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/BrowserIDVerifierDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/browserid/verifier/BrowserIDVerifierException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/AccountLoader.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FirefoxAccounts.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDevice.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountPushHandler.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/SyncStatusListener.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/CustomColorPreference.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountAbstractActivity.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountConfirmAccountActivityWeb.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountFinishMigratingActivityWeb.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountGetStartedActivityWeb.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusActivity.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountUpdateCredentialsActivityWeb.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountWebFlowActivity.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/PicassoPreferenceIconTarget.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AccountPickler.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/FxADefaultLoginStateMachineDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/FxAccountAuthenticator.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/FxAccountAuthenticatorService.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/FxAccountLoginDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/FxAccountLoginException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/BaseRequestDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/Cohabiting.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/Doghouse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/Engaged.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/FxAccountLoginStateMachine.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/FxAccountLoginTransition.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/Married.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/MigratedFromSync11.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/Separated.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/State.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/StateFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/login/TokensAndKeysState.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/receivers/FxAccountDeletedService.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/receivers/FxAccountUpgradeReceiver.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountNotificationManager.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountProfileService.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSchedulePolicy.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncAdapter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncService.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncStatusHelper.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/SchedulePolicy.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/push/RegisterUserAgentResponse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/push/SubscribeChannelResponse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/push/autopush/AutopushClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/push/autopush/AutopushClientException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/AlreadySyncingException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/BackoffHandler.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/BadRequiredFieldJSONException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/CollectionKeys.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/CommandProcessor.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/CommandRunner.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/CredentialException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/CryptoRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/DelayedWorkTracker.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/EngineSettings.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/ExtendedJSONObject.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/GlobalSession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/HTTPFailureException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/InfoCollections.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/InfoConfiguration.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/InfoCounts.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/JSONRecordFetcher.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/KeyBundleProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobal.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobalException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobalMissingEnginesException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/MetaGlobalNotSetException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/NoCollectionKeysSetException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/NodeAuthenticationException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/NonArrayJSONException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/NonObjectJSONException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/NullClusterURLException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/PersistedMetaGlobal.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/PrefsBackoffHandler.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/README.txt delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/Server11PreviousPostFailedException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/Server11RecordPostFailedException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SharedPreferencesClientsDataDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/Sync11Configuration.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SyncConfiguration.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SyncConfigurationException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SyncConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SyncException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/SynchronizerConfiguration.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/ThreadPool.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/UnexpectedJSONException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/UnknownSynchronizerConfigurationVersionException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/Utils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/CryptoException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/CryptoInfo.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/HKDF.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/HMACVerificationException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/KeyBundle.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/MissingCryptoInputException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/NoKeyBundleException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/PBKDF2.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/PersistedCrypto5Keys.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/ClientsDataDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/FreshStartDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/GlobalSessionCallback.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/JSONRecordFetchDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/KeyUploadDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/MetaGlobalDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/delegates/WipeServerDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/middleware/Crypto5MiddlewareRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/middleware/Crypto5MiddlewareRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/middleware/MiddlewareRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/middleware/MiddlewareRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/AbstractBearerTokenAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/AuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResource.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BaseResourceDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BasicAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BearerAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/BrowserIDAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/ConnectionMonitorThread.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/GzipNonChunkedCompressingEntity.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HMACAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HandleProgressException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HawkAuthHeaderProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/HttpResponseObserver.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/MozResponse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/Resource.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/ResourceDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SRPConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncResponse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageCollectionRequest.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageCollectionRequestDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRecordRequest.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRequest.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRequestDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageRequestIncrementalDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/SyncStorageResponse.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/TLSSocketFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/WBOCollectionRequestDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/net/WBORequestDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/BookmarkNeedsReparentingException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/BookmarksRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/ConstrainedServer11Repository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/FetchFailedException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/HashSetStoreTracker.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/HistoryRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/IdentityRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/InactiveSessionException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/InvalidBookmarkTypeException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/InvalidRequestException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/InvalidSessionTransitionException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/MultipleRecordsForGuidException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/NoContentProviderException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/NoGuidForIdException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/NoStoreDelegateException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/NullCursorException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/ParentNotFoundException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/ProfileDatabaseException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/RecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/RecordFilter.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/Repository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/RepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/RepositorySessionBundle.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/Server11Repository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/Server11RepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/StoreFailedException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/StoreTracker.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/StoreTrackingRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserBookmarksRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserHistoryDataAccessor.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserHistoryRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/BookmarksDeletionManager.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/BookmarksInsertionManager.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/BrowserContractHelpers.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/CachedSQLiteOpenHelper.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/ClientsDatabase.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/ClientsDatabaseAccessor.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/FennecTabsRepository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/FormHistoryRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/PasswordsRepositorySession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/RepoUtils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/VisitsHelper.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionBeginDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionCleanDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionCreationDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionFinishDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionStoreDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/delegates/RepositorySessionWipeDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/BookmarkRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/BookmarkRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/ClientRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/ClientRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/FormHistoryRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/HistoryRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/HistoryRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/PasswordRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/PasswordRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/Record.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/RecordParseException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/TabsRecord.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/TabsRecordFactory.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/domain/VersionConstants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloader.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/BatchMeta.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/BatchingUploader.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/BufferSizeTracker.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/MayUploadProvider.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/Payload.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/PayloadUploadDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/uploaders/RecordUploadRunnable.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/setup/Constants.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/setup/InvalidSyncKeyException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/setup/activities/ActivityUtils.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/setup/activities/WebURLFinder.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/AbstractNonRepositorySyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/AbstractSessionManagingSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/AndroidBrowserBookmarksServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/AndroidBrowserHistoryServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/CheckPreconditionsStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/CompletedStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/EnsureCrypto5KeysStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/FennecTabsServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/FetchInfoCollectionsStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/FetchInfoConfigurationStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/FetchMetaGlobalStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/FormHistoryServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/GlobalSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/NoSuchStageException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/PasswordsServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/SafeConstrainedServer11Repository.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/ServerSyncStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/SyncClientsEngineStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/UploadMetaGlobalStage.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/ConcurrentRecordConsumer.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/RecordConsumer.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/RecordsChannel.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/RecordsChannelDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/RecordsConsumerDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/SerialRecordConsumer.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/ServerLocalSynchronizer.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/ServerLocalSynchronizerSession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/SessionNotBegunException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/Synchronizer.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/SynchronizerDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/SynchronizerSession.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/SynchronizerSessionDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/UnbundleError.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/synchronizer/UnexpectedSessionException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/sync/telemetry/TelemetryContract.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/tokenserver/TokenServerClient.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/tokenserver/TokenServerClientDelegate.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/tokenserver/TokenServerException.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/tokenserver/TokenServerToken.java delete mode 100644 mobile/android/services/src/main/java/org/mozilla/gecko/util/PRNGFixes.java delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/fxaccount_sync_error.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_avatar_default.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_desktop.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_desktop_inactive.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_mobile.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_mobile_inactive.png delete mode 100644 mobile/android/services/src/main/res/drawable-hdpi/sync_promo.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/fxaccount_sync_error.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/sync_desktop.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/sync_desktop_inactive.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/sync_mobile.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/sync_mobile_inactive.png delete mode 100644 mobile/android/services/src/main/res/drawable-xhdpi/sync_promo.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/fxaccount_sync_error.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/sync_avatar_default.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/sync_desktop.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/sync_desktop_inactive.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/sync_mobile.png delete mode 100644 mobile/android/services/src/main/res/drawable-xxhdpi/sync_mobile_inactive.png delete mode 100644 mobile/android/services/src/main/res/layout/fxaccount_preference_list_fragment.xml delete mode 100644 mobile/android/services/src/main/res/layout/fxaccount_status_error_preference.xml delete mode 100644 mobile/android/services/src/main/res/layout/homescreen_prompt.xml delete mode 100644 mobile/android/services/src/main/res/layout/simple_helper_ui.xml delete mode 100644 mobile/android/services/src/main/res/menu/fxaccount_status_menu.xml delete mode 100644 mobile/android/services/src/main/res/values-v11/fxaccount_styles.xml delete mode 100644 mobile/android/services/src/main/res/values/fxaccount_colors.xml delete mode 100644 mobile/android/services/src/main/res/values/fxaccount_dimens.xml delete mode 100644 mobile/android/services/src/main/res/values/fxaccount_styles.xml delete mode 100644 mobile/android/services/src/main/res/xml/fxaccount_authenticator.xml delete mode 100644 mobile/android/services/src/main/res/xml/fxaccount_options.xml delete mode 100644 mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml delete mode 100644 mobile/android/services/src/main/res/xml/fxaccount_syncadapter.xml delete mode 100644 mobile/android/services/strings.xml.in (limited to 'mobile') diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index ef4764d88..abd30a8df 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -901,18 +901,6 @@ pref("dom.push.maxRecentMessageIDsPerSubscription", 0); pref("dom.push.enabled", false); #endif -// The remote content URL where FxAccountsWebChannel messages originate. Must use HTTPS. -pref("identity.fxaccounts.remote.webchannel.uri", "https://accounts.firefox.com"); - -// The remote URL of the Firefox Account profile server. -pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1"); - -// The remote URL of the Firefox Account oauth server. -pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1"); - -// Token server used by Firefox Account-authenticated Sync. -pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5"); - // Enable Presentation API pref("dom.presentation.enabled", false); pref("dom.presentation.discovery.enabled", true); diff --git a/mobile/android/base/android-services.mozbuild b/mobile/android/base/android-services.mozbuild index 118a0c44c..ca266542a 100644 --- a/mobile/android/base/android-services.mozbuild +++ b/mobile/android/base/android-services.mozbuild @@ -780,21 +780,6 @@ sync_java_files = [TOPSRCDIR + '/mobile/android/services/src/main/java/org/mozil 'background/common/telemetry/TelemetryWrapper.java', 'background/db/CursorDumper.java', 'background/db/Tab.java', - 'background/fxa/FxAccount20CreateDelegate.java', - 'background/fxa/FxAccount20LoginDelegate.java', - 'background/fxa/FxAccountClient.java', - 'background/fxa/FxAccountClient20.java', - 'background/fxa/FxAccountClientException.java', - 'background/fxa/FxAccountRemoteError.java', - 'background/fxa/FxAccountUtils.java', - 'background/fxa/oauth/FxAccountAbstractClient.java', - 'background/fxa/oauth/FxAccountAbstractClientException.java', - 'background/fxa/oauth/FxAccountOAuthClient10.java', - 'background/fxa/oauth/FxAccountOAuthRemoteError.java', - 'background/fxa/PasswordStretcher.java', - 'background/fxa/profile/FxAccountProfileClient10.java', - 'background/fxa/QuickPasswordStretcher.java', - 'background/fxa/SkewHandler.java', 'background/nativecode/NativeCrypto.java', 'background/preferences/PreferenceFragment.java', 'background/preferences/PreferenceManagerCompat.java', @@ -813,52 +798,6 @@ sync_java_files = [TOPSRCDIR + '/mobile/android/services/src/main/java/org/mozil 'browserid/verifier/BrowserIDVerifierDelegate.java', 'browserid/verifier/BrowserIDVerifierException.java', 'browserid/VerifyingPublicKey.java', - 'fxa/AccountLoader.java', - 'fxa/activities/CustomColorPreference.java', - 'fxa/activities/FxAccountAbstractActivity.java', - 'fxa/activities/FxAccountConfirmAccountActivityWeb.java', - 'fxa/activities/FxAccountFinishMigratingActivityWeb.java', - 'fxa/activities/FxAccountGetStartedActivityWeb.java', - 'fxa/activities/FxAccountStatusActivity.java', - 'fxa/activities/FxAccountStatusFragment.java', - 'fxa/activities/FxAccountUpdateCredentialsActivityWeb.java', - 'fxa/activities/FxAccountWebFlowActivity.java', - 'fxa/activities/PicassoPreferenceIconTarget.java', - 'fxa/authenticator/AccountPickler.java', - 'fxa/authenticator/AndroidFxAccount.java', - 'fxa/authenticator/FxAccountAuthenticator.java', - 'fxa/authenticator/FxAccountAuthenticatorService.java', - 'fxa/authenticator/FxAccountLoginDelegate.java', - 'fxa/authenticator/FxAccountLoginException.java', - 'fxa/authenticator/FxADefaultLoginStateMachineDelegate.java', - 'fxa/FirefoxAccounts.java', - 'fxa/FxAccountConstants.java', - 'fxa/FxAccountDevice.java', - 'fxa/FxAccountDeviceRegistrator.java', - 'fxa/FxAccountPushHandler.java', - 'fxa/login/BaseRequestDelegate.java', - 'fxa/login/Cohabiting.java', - 'fxa/login/Doghouse.java', - 'fxa/login/Engaged.java', - 'fxa/login/FxAccountLoginStateMachine.java', - 'fxa/login/FxAccountLoginTransition.java', - 'fxa/login/Married.java', - 'fxa/login/MigratedFromSync11.java', - 'fxa/login/Separated.java', - 'fxa/login/State.java', - 'fxa/login/StateFactory.java', - 'fxa/login/TokensAndKeysState.java', - 'fxa/receivers/FxAccountDeletedService.java', - 'fxa/receivers/FxAccountUpgradeReceiver.java', - 'fxa/sync/FxAccountNotificationManager.java', - 'fxa/sync/FxAccountProfileService.java', - 'fxa/sync/FxAccountSchedulePolicy.java', - 'fxa/sync/FxAccountSyncAdapter.java', - 'fxa/sync/FxAccountSyncDelegate.java', - 'fxa/sync/FxAccountSyncService.java', - 'fxa/sync/FxAccountSyncStatusHelper.java', - 'fxa/sync/SchedulePolicy.java', - 'fxa/SyncStatusListener.java', 'push/autopush/AutopushClient.java', 'push/autopush/AutopushClientException.java', 'push/RegisterUserAgentResponse.java', diff --git a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java index 8d3a92e48..7c3a9434f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java +++ b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java @@ -22,7 +22,6 @@ import org.mozilla.gecko.Telemetry; import org.mozilla.gecko.TelemetryContract; import org.mozilla.gecko.annotation.ReflectionTarget; import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.fxa.FxAccountPushHandler; import org.mozilla.gecko.gcm.GcmTokenClient; import org.mozilla.gecko.push.autopush.AutopushClientException; import org.mozilla.gecko.util.BundleEventListener; @@ -66,13 +65,10 @@ public class PushService implements BundleEventListener { "PushServiceAndroidGCM:UnregisterUserAgent", "PushServiceAndroidGCM:SubscribeChannel", "PushServiceAndroidGCM:UnsubscribeChannel", - "FxAccountsPush:Initialized", - "FxAccountsPush:ReceivedPushMessageToDecode:Response", "History:GetPrePathLastVisitedTimeMilliseconds", }; private enum GeckoComponent { - FxAccountsPush, PushServiceAndroidGCM } @@ -98,7 +94,6 @@ public class PushService implements BundleEventListener { // NB: These are not thread-safe, we're depending on these being access from the same background thread. private boolean isReadyPushServiceAndroidGCM = false; - private boolean isReadyFxAccountsPush = false; private final List pendingPushMessages; public PushService(Context context) { @@ -238,9 +233,6 @@ public class PushService implements BundleEventListener { protected static void sendMessageToDecodeToGeckoService(final @NonNull JSONObject message) { Log.i(LOG_TAG, "Delivering dom/push message to decode to Gecko!"); - GeckoAppShell.notifyObservers("FxAccountsPush:ReceivedPushMessageToDecode", - message.toString(), - GeckoThread.State.PROFILE_READY); } protected void registerGeckoEventListener() { @@ -279,11 +271,6 @@ public class PushService implements BundleEventListener { callback.sendSuccess(null); return; } - if ("FxAccountsPush:Initialized".equals(event)) { - processComponentState(GeckoComponent.FxAccountsPush, true); - callback.sendSuccess(null); - return; - } if ("PushServiceAndroidGCM:Configure".equals(event)) { final String endpoint = message.getString("endpoint"); if (endpoint == null) { @@ -390,10 +377,6 @@ public class PushService implements BundleEventListener { callback.sendError("Could not unsubscribe from channel: " + channelID); return; } - if ("FxAccountsPush:ReceivedPushMessageToDecode:Response".equals(event)) { - FxAccountPushHandler.handleFxAPushMessage(context, message); - return; - } if ("History:GetPrePathLastVisitedTimeMilliseconds".equals(event)) { if (callback == null) { Log.e(LOG_TAG, "callback must not be null in " + event); @@ -420,10 +403,7 @@ public class PushService implements BundleEventListener { } private void processComponentState(@NonNull GeckoComponent component, boolean isReady) { - if (component == GeckoComponent.FxAccountsPush) { - isReadyFxAccountsPush = isReady; - - } else if (component == GeckoComponent.PushServiceAndroidGCM) { + if (component == GeckoComponent.PushServiceAndroidGCM) { isReadyPushServiceAndroidGCM = isReady; } @@ -435,7 +415,7 @@ public class PushService implements BundleEventListener { } private boolean canSendPushMessagesToGecko() { - return isReadyFxAccountsPush && isReadyPushServiceAndroidGCM; + return isReadyPushServiceAndroidGCM; } private static void sendPushMessagesToGecko(@NonNull List messages) { diff --git a/mobile/android/base/resources/values-v21/themes.xml b/mobile/android/base/resources/values-v21/themes.xml index ddb08d052..140f066c4 100644 --- a/mobile/android/base/resources/values-v21/themes.xml +++ b/mobile/android/base/resources/values-v21/themes.xml @@ -21,11 +21,6 @@ @color/fennec_ui_orange - - - - - - diff --git a/mobile/android/services/src/main/res/values/fxaccount_colors.xml b/mobile/android/services/src/main/res/values/fxaccount_colors.xml deleted file mode 100644 index f7140faff..000000000 --- a/mobile/android/services/src/main/res/values/fxaccount_colors.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - #424f59 - #fad4d2 - diff --git a/mobile/android/services/src/main/res/values/fxaccount_dimens.xml b/mobile/android/services/src/main/res/values/fxaccount_dimens.xml deleted file mode 100644 index d1d44585d..000000000 --- a/mobile/android/services/src/main/res/values/fxaccount_dimens.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - 0dp - - 16dp - - 0x02000000 - - - 48dp - - 48dp - diff --git a/mobile/android/services/src/main/res/values/fxaccount_styles.xml b/mobile/android/services/src/main/res/values/fxaccount_styles.xml deleted file mode 100644 index d74efac91..000000000 --- a/mobile/android/services/src/main/res/values/fxaccount_styles.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/mobile/android/services/src/main/res/xml/fxaccount_authenticator.xml b/mobile/android/services/src/main/res/xml/fxaccount_authenticator.xml deleted file mode 100644 index 7b004e209..000000000 --- a/mobile/android/services/src/main/res/xml/fxaccount_authenticator.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/mobile/android/services/src/main/res/xml/fxaccount_options.xml b/mobile/android/services/src/main/res/xml/fxaccount_options.xml deleted file mode 100644 index 449fc0545..000000000 --- a/mobile/android/services/src/main/res/xml/fxaccount_options.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - diff --git a/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml b/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml deleted file mode 100644 index 570e362cc..000000000 --- a/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/android/services/src/main/res/xml/fxaccount_syncadapter.xml b/mobile/android/services/src/main/res/xml/fxaccount_syncadapter.xml deleted file mode 100644 index 761920667..000000000 --- a/mobile/android/services/src/main/res/xml/fxaccount_syncadapter.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/mobile/android/services/strings.xml.in b/mobile/android/services/strings.xml.in deleted file mode 100644 index 143a3db42..000000000 --- a/mobile/android/services/strings.xml.in +++ /dev/null @@ -1,86 +0,0 @@ - - - -&sync.configure.engines.title.passwords2; -&sync.configure.engines.title.history; -&sync.configure.engines.title.tabs; - - -&bookmarks.folder.menu.label; -&bookmarks.folder.places.label; -&bookmarks.folder.tags.label; -&bookmarks.folder.toolbar.label; -&bookmarks.folder.other.label; -&bookmarks.folder.desktop.label; -&bookmarks.folder.mobile.label; -&bookmarks.folder.pinned.label; - - -&sync.default.client.name; - - -https://accounts.firefox.com/legal/terms -https://accounts.firefox.com/legal/privacy - -&fxaccount_getting_started_welcome_to_sync; -&fxaccount_getting_started_description2; -&fxaccount_getting_started_get_started; - -&syncBrand.shortName.label; -&fxaccount_status_signed_in_as; -&fxaccount_status_manage_account; -&fxaccount_status_auth_server; -&fxaccount_status_sync_now; -&fxaccount_status_syncing2; -&remote_tabs_last_synced; -&remote_tabs_never_synced; -&fxaccount_status_device_name; -&fxaccount_status_sync_server; -&fxaccount_status_sync; -&fxaccount_status_sync_enabled; -&fxaccount_status_needs_verification2; -&fxaccount_status_needs_credentials; -&fxaccount_status_needs_upgrade; -&fxaccount_status_needs_master_sync_automatically_enabled; -&fxaccount_status_needs_master_sync_automatically_enabled_v21; -&fxaccount_status_needs_finish_migrating; -&fxaccount_status_bookmarks; -&fxaccount_status_history; -&fxaccount_status_passwords2; -&fxaccount_status_tabs; -&fxaccount_status_legal; -&fxaccount_status_linktos2; -&fxaccount_status_linkprivacy2; -&fxaccount_status_more; -&fxaccount_remove_account; - -&fxaccount_account_type_label; - -&fxaccount_options_title; -&fxaccount_options_configure_title; - -&fxaccount_remote_error_UPGRADE_REQUIRED; -&fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS_2; -&fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST; -&fxaccount_remote_error_INCORRECT_PASSWORD; -&fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT; -&fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS; -&fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD; -&fxaccount_remote_error_UNKNOWN_ERROR; -&fxaccount_remote_error_ACCOUNT_LOCKED; - -&fxaccount_sync_sign_in_error_notification_title2; -&fxaccount_sync_sign_in_error_notification_text2; - - -&fxaccount_remove_account_dialog_title; -&fxaccount_remove_account_dialog_message; -&fxaccount_remove_account_toast; - -&fxaccount_sync_finish_migrating_notification_title; -&fxaccount_sync_finish_migrating_notification_text; - - -&fxaccount_enable_debug_mode; -- cgit v1.2.3