wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1147473 - Follow-up: move ReadingListConstants to avoid build flag pain.

Browse Source
This commit is contained in:
Richard Newman 2015-03-27 13:11:08 -07:00
parent b3049cff0d
commit 3e989f526f
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/android-services.mozbuild
View File

@ -833,6 +833,7 @@ sync_java_files = [
'background/nativecode/NativeCrypto.java',
'background/preferences/PreferenceFragment.java',
'background/preferences/PreferenceManagerCompat.java',
'background/ReadingListConstants.java',
'browserid/ASNUtils.java',
'browserid/BrowserIDKeyPair.java',
'browserid/DSACryptoImplementation.java',
@ -1170,7 +1171,6 @@ reading_list_service_java_files = [
'reading/ReadingListClient.java',
'reading/ReadingListClientContentValuesFactory.java',
'reading/ReadingListClientRecordFactory.java',
'reading/ReadingListConstants.java',
'reading/ReadingListDeleteDelegate.java',
'reading/ReadingListInvalidAuthenticationException.java',
'reading/ReadingListRecord.java',

6
mobile/android/base/reading/ReadingListConstants.java → mobile/android/base/background/ReadingListConstants.java
View File

@ -2,10 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.reading;
package org.mozilla.gecko.background;
import org.mozilla.gecko.AppConstants;
/**
* This is in 'background' not 'reading' so that it's still usable even when the
* Reading List feature is build-time disabled.
*/
public class ReadingListConstants {
public static final String GLOBAL_LOG_TAG = "FxReadingList";
public static final String USER_AGENT = "Firefox-Android-FxReader/" + AppConstants.MOZ_APP_VERSION + " (" + AppConstants.MOZ_APP_DISPLAYNAME + ")";

2
mobile/android/base/fxa/activities/FxAccountStatusFragment.java
View File

@ -13,6 +13,7 @@ import java.util.Set;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.R;
import org.mozilla.gecko.background.ReadingListConstants;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.background.fxa.FxAccountUtils;
import org.mozilla.gecko.background.preferences.PreferenceFragment;
@ -24,7 +25,6 @@ import org.mozilla.gecko.fxa.login.Married;
import org.mozilla.gecko.fxa.login.State;
import org.mozilla.gecko.fxa.sync.FxAccountSyncStatusHelper;
import org.mozilla.gecko.fxa.tasks.FxAccountCodeResender;
import org.mozilla.gecko.reading.ReadingListConstants;
import org.mozilla.gecko.sync.ExtendedJSONObject;
import org.mozilla.gecko.sync.SharedPreferencesClientsDataDelegate;
import org.mozilla.gecko.sync.SyncConfiguration;

1
mobile/android/base/reading/ReadingListClient.java
View File

@ -11,6 +11,7 @@ import java.security.GeneralSecurityException;
import java.util.Queue;
import java.util.concurrent.Executor;
import org.mozilla.gecko.background.ReadingListConstants;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.reading.ReadingListResponse.ResponseFactory;
import org.mozilla.gecko.sync.ExtendedJSONObject;

1
mobile/android/base/reading/ReadingListSyncAdapter.java
View File

@ -12,6 +12,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.mozilla.gecko.background.ReadingListConstants;
import org.mozilla.gecko.background.common.PrefsBranch;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.background.fxa.FxAccountUtils;