Clean up a bunch of warnings
Bug: 9565838
Change-Id: Ieb65ab41c1e320647a1a17b835371c5eb8e342db
diff --git a/src/com/android/exchange/CalendarSyncEnabler.java b/src/com/android/exchange/CalendarSyncEnabler.java
index ce2f327..ce0addd 100644
--- a/src/com/android/exchange/CalendarSyncEnabler.java
+++ b/src/com/android/exchange/CalendarSyncEnabler.java
@@ -111,7 +111,7 @@
}
/** @return {@link Intent} to launch the Calendar app. */
- private Intent createLaunchCalendarIntent() {
+ private static Intent createLaunchCalendarIntent() {
return new Intent(Intent.ACTION_VIEW, Uri.parse("content://com.android.calendar/time"));
}
}
diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
index 02bca39..ecb8ef0 100644
--- a/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java
@@ -240,7 +240,7 @@
}
}
- private void sendCallback(long msgId, String subject, int status) {
+ private static void sendCallback(long msgId, String subject, int status) {
try {
ExchangeService.callback().sendMessageStatus(msgId, subject, status, 0);
} catch (RemoteException e) {
@@ -320,7 +320,7 @@
* @param atts the array of attachments to look in
* @return whether the test attachment is among the array of attachments
*/
- private boolean amongAttachments(Attachment att, Attachment[] atts) {
+ private static boolean amongAttachments(Attachment att, Attachment[] atts) {
String location = att.mLocation;
if (location == null) return false;
for (Attachment a: atts) {
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 5d19fbb..e635b2b 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -171,7 +171,6 @@
private boolean mSsl = true;
private boolean mTrustSsl = false;
private String mClientCertAlias = null;
- private int mPort;
public ContentResolver mContentResolver;
// Whether or not the sync service is valid (usable)
@@ -706,7 +705,6 @@
mHostAuth = hostAuth;
mUserName = hostAuth.mLogin;
mPassword = hostAuth.mPassword;
- mPort = hostAuth.mPort;
mSsl = hostAuth.shouldUseSsl();
// Make sure the authentication string is recreated and cached
@@ -1224,7 +1222,6 @@
mSsl = hostAuth.shouldUseSsl();
mTrustSsl = hostAuth.shouldTrustAllServerCerts();
mClientCertAlias = hostAuth.mClientCertAlias;
- mPort = hostAuth.mPort;
// Register the new alias, if needed.
if (mClientCertAlias != null) {
diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index 74a1f80..118c704 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -118,7 +118,6 @@
int status;
boolean moreAvailable = false;
boolean newSyncKey = false;
- int interval = mMailbox.mSyncInterval;
mLooping = false;
// If we're not at the top of the xml tree, throw an exception
if (nextTag(START_DOCUMENT) != Tags.SYNC_SYNC) {
diff --git a/src/com/android/exchange/adapter/AttachmentLoader.java b/src/com/android/exchange/adapter/AttachmentLoader.java
index 4058c52..2747644 100644
--- a/src/com/android/exchange/adapter/AttachmentLoader.java
+++ b/src/com/android/exchange/adapter/AttachmentLoader.java
@@ -155,7 +155,7 @@
* Close, ignoring errors (as during cleanup)
* @param c a Closeable
*/
- private void close(Closeable c) {
+ private static void close(Closeable c) {
try {
c.close();
} catch (IOException e) {
@@ -166,7 +166,7 @@
* Save away the contentUri for this Attachment and notify listeners
* @throws IOException
*/
- private void finishLoadAttachment(File file, OutputStream os) throws IOException {
+ private void finishLoadAttachment(File file) throws IOException {
InputStream in = null;
try {
in = new FileInputStream(file);
@@ -228,7 +228,7 @@
mAttachmentSize);
p.parse();
if (p.getStatusCode() == 1 /* Success */) {
- finishLoadAttachment(tmpFile, os);
+ finishLoadAttachment(tmpFile);
return;
}
} else {
@@ -237,7 +237,7 @@
// len > 0 means that Content-Length was set in the headers
// len < 0 means "chunked" transfer-encoding
readChunked(is, os, (len < 0) ? mAttachmentSize : len);
- finishLoadAttachment(tmpFile, os);
+ finishLoadAttachment(tmpFile);
return;
}
}
diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 2fab97b..c435ea6 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -19,7 +19,6 @@
import android.content.ContentProviderClient;
import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -162,8 +161,6 @@
super(service);
mEmailAddress = mAccount.mEmailAddress;
- final String amType = Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE;
-
Cursor c = mService.mContentResolver.query(Calendars.CONTENT_URI,
new String[] {Calendars._ID}, CALENDAR_SELECTION,
new String[] {mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE}, null);
@@ -515,7 +512,7 @@
break;
case Tags.CALENDAR_ATTENDEES:
// If eventId >= 0, this is an update; otherwise, a new Event
- attendeeValues = attendeesParser(ops, eventId);
+ attendeeValues = attendeesParser();
break;
case Tags.BASE_BODY:
cv.put(Events.DESCRIPTION, bodyParser());
@@ -599,7 +596,7 @@
responseType = getValueInt();
break;
case Tags.CALENDAR_CATEGORIES:
- String categories = categoriesParser(ops);
+ String categories = categoriesParser();
if (categories.length() > 0) {
ops.newExtendedProperty(EXTENDED_PROPERTY_CATEGORIES, categories);
}
@@ -1006,7 +1003,7 @@
}
}
- private String categoriesParser(CalendarOperations ops) throws IOException {
+ private String categoriesParser() throws IOException {
StringBuilder categories = new StringBuilder();
while (nextTag(Tags.CALENDAR_CATEGORIES) != END) {
switch (tag) {
@@ -1038,14 +1035,14 @@
}
}
- private ArrayList<ContentValues> attendeesParser(CalendarOperations ops, long eventId)
+ private ArrayList<ContentValues> attendeesParser()
throws IOException {
int attendeeCount = 0;
ArrayList<ContentValues> attendeeValues = new ArrayList<ContentValues>();
while (nextTag(Tags.CALENDAR_ATTENDEES) != END) {
switch (tag) {
case Tags.CALENDAR_ATTENDEE:
- ContentValues cv = attendeeParser(ops, eventId);
+ ContentValues cv = attendeeParser();
// If we're going to redact these attendees anyway, let's avoid unnecessary
// memory pressure, and not keep them around
// We still need to parse them all, however
@@ -1063,7 +1060,7 @@
return attendeeValues;
}
- private ContentValues attendeeParser(CalendarOperations ops, long eventId)
+ private ContentValues attendeeParser()
throws IOException {
ContentValues cv = new ContentValues();
while (nextTag(Tags.CALENDAR_ATTENDEE) != END) {
@@ -1222,7 +1219,7 @@
// Execute our CPO's safely
try {
- mOps.mResults = safeExecute(mContentResolver, CalendarContract.AUTHORITY, mOps);
+ safeExecute(mContentResolver, CalendarContract.AUTHORITY, mOps);
} catch (RemoteException e) {
throw new IOException("Remote exception caught; will retry");
}
@@ -1313,7 +1310,6 @@
protected static class CalendarOperations extends ArrayList<Operation> {
private static final long serialVersionUID = 1L;
public int mCount = 0;
- private ContentProviderResult[] mResults = null;
private int mEventStart = 0;
private final ContentResolver mContentResolver;
private final Uri mAsSyncAdapterAttendees;
@@ -1830,8 +1826,7 @@
if (!entityValues.containsKey(Events.DTSTART)
|| (!entityValues.containsKey(Events.DURATION) &&
- !entityValues.containsKey(Events.DTEND))
- || organizerEmail == null) {
+ !entityValues.containsKey(Events.DTEND))) {
continue;
}
diff --git a/src/com/android/exchange/adapter/ContactsSyncAdapter.java b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
index 8bc024d..7daaf5b 100644
--- a/src/com/android/exchange/adapter/ContactsSyncAdapter.java
+++ b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
@@ -666,21 +666,7 @@
}
}
- // We must have first name, last name, or company name
- String name = null;
- if (firstName != null || lastName != null) {
- if (firstName == null) {
- name = lastName;
- } else if (lastName == null) {
- name = firstName;
- } else {
- name = firstName + ' ' + lastName;
- }
- } else if (companyName != null) {
- name = companyName;
- }
-
- ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name,
+ ops.addName(entity, prefix, firstName, lastName, middleName, suffix,
yomiFirstName, yomiLastName);
ops.addBusiness(entity, business);
ops.addPersonal(entity, personal);
@@ -1290,8 +1276,7 @@
}
public void addName(Entity entity, String prefix, String givenName, String familyName,
- String middleName, String suffix, String displayName, String yomiFirstName,
- String yomiLastName) {
+ String middleName, String suffix, String yomiFirstName, String yomiLastName) {
RowBuilder builder = untypedRowBuilder(entity, StructuredName.CONTENT_ITEM_TYPE);
ContentValues cv = builder.cv;
if (cv != null && cvCompareString(cv, StructuredName.GIVEN_NAME, givenName) &&
diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index 9cac3f2..1b4f46c 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -808,7 +808,6 @@
// We'll ignore the attachments, as we'll get them directly from EAS
ArrayList<Part> attachments = new ArrayList<Part>();
MimeUtility.collectParts(mimeMessage, viewables, attachments);
- Body tempBody = new Body();
// parseBodyFields fills in the content fields of the Body
ConversionUtilities.BodyFieldData data =
ConversionUtilities.parseBodyFields(viewables);
diff --git a/src/com/android/exchange/adapter/ProvisionParser.java b/src/com/android/exchange/adapter/ProvisionParser.java
index 5522f7a..7b69b06 100644
--- a/src/com/android/exchange/adapter/ProvisionParser.java
+++ b/src/com/android/exchange/adapter/ProvisionParser.java
@@ -21,7 +21,6 @@
import android.os.storage.StorageManager;
import com.android.emailcommon.provider.Policy;
-import com.android.exchange.EasSyncService;
import com.android.exchange.R;
import com.android.exchange.service.EasAccountValidator;
import com.android.mail.utils.LogUtils;
@@ -415,7 +414,7 @@
/**
* Return true if password is required; otherwise false.
*/
- private boolean parseSecurityPolicy(XmlPullParser parser, Policy policy)
+ private static boolean parseSecurityPolicy(XmlPullParser parser)
throws XmlPullParserException, IOException {
boolean passwordRequired = true;
while (true) {
@@ -438,7 +437,7 @@
return passwordRequired;
}
- private void parseCharacteristic(XmlPullParser parser, Policy policy)
+ private static void parseCharacteristic(XmlPullParser parser, Policy policy)
throws XmlPullParserException, IOException {
boolean enforceInactivityTimer = true;
while (true) {
@@ -480,7 +479,7 @@
}
}
- private void parseRegistry(XmlPullParser parser, Policy policy)
+ private static void parseRegistry(XmlPullParser parser, Policy policy)
throws XmlPullParserException, IOException {
while (true) {
int type = parser.nextTag();
@@ -495,7 +494,7 @@
}
}
- private void parseWapProvisioningDoc(XmlPullParser parser, Policy policy)
+ private static void parseWapProvisioningDoc(XmlPullParser parser, Policy policy)
throws XmlPullParserException, IOException {
while (true) {
int type = parser.nextTag();
@@ -507,7 +506,7 @@
String atype = parser.getAttributeValue(null, "type");
if (atype.equals("SecurityPolicy")) {
// If a password isn't required, stop here
- if (!parseSecurityPolicy(parser, policy)) {
+ if (!parseSecurityPolicy(parser)) {
return;
}
} else if (atype.equals("Registry")) {
diff --git a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index db190af..75740bd 100644
--- a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
@@ -104,8 +104,8 @@
private Object[] row;
static long dataId = 1;
- GalContactRow(GalProjection projection, long contactId, String lookupKey,
- String accountName, String displayName) {
+ GalContactRow(GalProjection projection, long contactId, String accountName,
+ String displayName) {
this.mProjection = projection;
row = new Object[projection.size];
@@ -140,11 +140,10 @@
}
static void addEmailAddress(MatrixCursor cursor, GalProjection galProjection,
- long contactId, String lookupKey, String accountName, String displayName,
- String address) {
+ long contactId, String accountName, String displayName, String address) {
if (!TextUtils.isEmpty(address)) {
GalContactRow r = new GalContactRow(
- galProjection, contactId, lookupKey, accountName, displayName);
+ galProjection, contactId, accountName, displayName);
r.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
r.put(Email.TYPE, Email.TYPE_WORK);
r.put(Email.ADDRESS, address);
@@ -153,10 +152,10 @@
}
static void addPhoneRow(MatrixCursor cursor, GalProjection projection, long contactId,
- String lookupKey, String accountName, String displayName, int type, String number) {
+ String accountName, String displayName, int type, String number) {
if (!TextUtils.isEmpty(number)) {
GalContactRow r = new GalContactRow(
- projection, contactId, lookupKey, accountName, displayName);
+ projection, contactId, accountName, displayName);
r.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
r.put(Phone.TYPE, type);
r.put(Phone.NUMBER, number);
@@ -165,10 +164,10 @@
}
public static void addNameRow(MatrixCursor cursor, GalProjection galProjection,
- long contactId, String lookupKey, String accountName, String displayName,
+ long contactId, String accountName, String displayName,
String firstName, String lastName) {
GalContactRow r = new GalContactRow(
- galProjection, contactId, lookupKey, accountName, displayName);
+ galProjection, contactId, accountName, displayName);
r.put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE);
r.put(StructuredName.GIVEN_NAME, firstName);
r.put(StructuredName.FAMILY_NAME, lastName);
@@ -322,15 +321,15 @@
: DEFAULT_CONTACT_ID;
ps = new PackedString(lookupKey);
String displayName = ps.get(GalData.DISPLAY_NAME);
- GalContactRow.addEmailAddress(cursor, galProjection, contactId, lookupKey,
+ GalContactRow.addEmailAddress(cursor, galProjection, contactId,
accountName, displayName, ps.get(GalData.EMAIL_ADDRESS));
- GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+ GalContactRow.addPhoneRow(cursor, galProjection, contactId,
displayName, displayName, Phone.TYPE_HOME, ps.get(GalData.HOME_PHONE));
- GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+ GalContactRow.addPhoneRow(cursor, galProjection, contactId,
displayName, displayName, Phone.TYPE_WORK, ps.get(GalData.WORK_PHONE));
- GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
+ GalContactRow.addPhoneRow(cursor, galProjection, contactId,
displayName, displayName, Phone.TYPE_MOBILE, ps.get(GalData.MOBILE_PHONE));
- GalContactRow.addNameRow(cursor, galProjection, contactId, accountName, displayName,
+ GalContactRow.addNameRow(cursor, galProjection, contactId, displayName,
ps.get(GalData.FIRST_NAME), ps.get(GalData.LAST_NAME), displayName);
return cursor;
}
diff --git a/src/com/android/exchange/service/CalendarSyncAdapterService.java b/src/com/android/exchange/service/CalendarSyncAdapterService.java
index 4fb2d5a..a6919c5 100644
--- a/src/com/android/exchange/service/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/service/CalendarSyncAdapterService.java
@@ -57,8 +57,7 @@
@Override
public void onPerformSync(Account account, Bundle extras,
String authority, ContentProviderClient provider, SyncResult syncResult) {
- CalendarSyncAdapterService.performSync(getContext(), account, extras, authority,
- provider, syncResult);
+ CalendarSyncAdapterService.performSync(getContext(), account, extras);
}
}
@@ -68,8 +67,7 @@
* The missing piece at this point is integration with the push/ping mechanism in EAS; this will
* be put in place at a later time.
*/
- private static void performSync(Context context, Account account, Bundle extras,
- String authority, ContentProviderClient provider, SyncResult syncResult) {
+ private static void performSync(Context context, Account account, Bundle extras) {
ContentResolver cr = context.getContentResolver();
boolean logging = Eas.USER_LOG;
if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
diff --git a/src/com/android/exchange/service/ContactsSyncAdapterService.java b/src/com/android/exchange/service/ContactsSyncAdapterService.java
index 32e01a6..d7191b3 100644
--- a/src/com/android/exchange/service/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/service/ContactsSyncAdapterService.java
@@ -57,8 +57,7 @@
@Override
public void onPerformSync(Account account, Bundle extras,
String authority, ContentProviderClient provider, SyncResult syncResult) {
- ContactsSyncAdapterService.performSync(getContext(), account, extras, authority,
- provider, syncResult);
+ ContactsSyncAdapterService.performSync(getContext(), account, extras);
}
}
@@ -77,8 +76,7 @@
* The missing piece at this point is integration with the push/ping mechanism in EAS; this will
* be put in place at a later time.
*/
- private static void performSync(Context context, Account account, Bundle extras,
- String authority, ContentProviderClient provider, SyncResult syncResult) {
+ private static void performSync(Context context, Account account, Bundle extras) {
ContentResolver cr = context.getContentResolver();
// If we've been asked to do an upload, make sure we've got work to do
diff --git a/src/com/android/exchange/service/EasAutoDiscover.java b/src/com/android/exchange/service/EasAutoDiscover.java
index 582ccfa..54a9fba 100644
--- a/src/com/android/exchange/service/EasAutoDiscover.java
+++ b/src/com/android/exchange/service/EasAutoDiscover.java
@@ -233,7 +233,7 @@
* @throws XmlPullParserException
* @throws IOException
*/
- private void parseServer(final XmlPullParser parser, final HostAuth hostAuth)
+ private static void parseServer(final XmlPullParser parser, final HostAuth hostAuth)
throws XmlPullParserException, IOException {
boolean mobileSync = false;
while (true) {
@@ -264,7 +264,7 @@
* @throws XmlPullParserException
* @throws IOException
*/
- private void parseSettings(final XmlPullParser parser, final HostAuth hostAuth)
+ private static void parseSettings(final XmlPullParser parser, final HostAuth hostAuth)
throws XmlPullParserException, IOException {
while (true) {
final int type = parser.next();
@@ -286,7 +286,7 @@
* @throws XmlPullParserException
* @throws IOException
*/
- private void parseAction(final XmlPullParser parser, final HostAuth hostAuth)
+ private static void parseAction(final XmlPullParser parser, final HostAuth hostAuth)
throws XmlPullParserException, IOException {
while (true) {
final int type = parser.next();
@@ -312,7 +312,7 @@
* @throws XmlPullParserException
* @throws IOException
*/
- private void parseUser(final XmlPullParser parser, final HostAuth hostAuth)
+ private static void parseUser(final XmlPullParser parser, final HostAuth hostAuth)
throws XmlPullParserException, IOException {
while (true) {
int type = parser.next();
@@ -338,7 +338,7 @@
* @throws XmlPullParserException
* @throws IOException
*/
- private void parseResponse(final XmlPullParser parser, final HostAuth hostAuth)
+ private static void parseResponse(final XmlPullParser parser, final HostAuth hostAuth)
throws XmlPullParserException, IOException {
while (true) {
final int type = parser.next();
@@ -360,7 +360,7 @@
* @param resp The {@link EasResponse} from the server.
* @return The final {@link HostAuth} for this server.
*/
- private HostAuth parseAutodiscover(final EasResponse resp) {
+ private static HostAuth parseAutodiscover(final EasResponse resp) {
// The response to Autodiscover is regular XML (not WBXML)
try {
final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
diff --git a/src/com/android/exchange/service/EasCalendarSyncHandler.java b/src/com/android/exchange/service/EasCalendarSyncHandler.java
index a483fe8..5f6889a 100644
--- a/src/com/android/exchange/service/EasCalendarSyncHandler.java
+++ b/src/com/android/exchange/service/EasCalendarSyncHandler.java
@@ -249,7 +249,7 @@
* @return The new version number for this event (i.e. 0 if it's a new event, or the old version
* number + 1).
*/
- private String getEntityVersion(final ContentValues entityValues) {
+ private static String getEntityVersion(final ContentValues entityValues) {
final String version = entityValues.getAsString(EVENT_SYNC_VERSION);
// This should never be null, but catch this error anyway
// Version should be "0" when we create the event, so use that
diff --git a/src/com/android/exchange/service/EasContactsSyncHandler.java b/src/com/android/exchange/service/EasContactsSyncHandler.java
index 35df7a8..8e1cc47 100644
--- a/src/com/android/exchange/service/EasContactsSyncHandler.java
+++ b/src/com/android/exchange/service/EasContactsSyncHandler.java
@@ -124,44 +124,29 @@
}
// Classes for each type of contact.
- // For now the constants in each class are all that matters; these are copied from
- // ContactSyncAdapter verbatim, but the parser hasn't been moved over yet. When that happens,
- // the variables and functions will also matter.
+ // These are copied from ContactSyncAdapter, with unused fields and methods removed, but the
+ // parser hasn't been moved over yet. When that happens, the variables and functions may also
+ // need to be copied over.
/**
* Data and constants for a Personal contact.
*/
private static final class EasPersonal {
- String anniversary;
- String fileAs;
-
/** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/eas_personal";
public static final String ANNIVERSARY = "data2";
public static final String FILE_AS = "data4";
-
- boolean hasData() {
- return anniversary != null || fileAs != null;
- }
}
/**
* Data and constants for a Business contact.
*/
private static final class EasBusiness {
- String customerId;
- String governmentId;
- String accountName;
-
/** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/eas_business";
public static final String CUSTOMER_ID = "data6";
public static final String GOVERNMENT_ID = "data7";
public static final String ACCOUNT_NAME = "data8";
-
- boolean hasData() {
- return customerId != null || governmentId != null || accountName != null;
- }
}
public EasContactsSyncHandler(final Context context, final ContentResolver contentResolver,
diff --git a/src/com/android/exchange/service/EasMailboxSyncHandler.java b/src/com/android/exchange/service/EasMailboxSyncHandler.java
index 4a3cd71..3264b88 100644
--- a/src/com/android/exchange/service/EasMailboxSyncHandler.java
+++ b/src/com/android/exchange/service/EasMailboxSyncHandler.java
@@ -293,7 +293,7 @@
* @param firstCommand Whether any sync commands have already been written to s.
* @throws IOException
*/
- private void addDeleteMessageCommand(final Serializer s, final String serverId,
+ private static void addDeleteMessageCommand(final Serializer s, final String serverId,
final boolean firstCommand) throws IOException {
if (firstCommand) {
s.start(Tags.SYNC_COMMANDS);
diff --git a/src/com/android/exchange/service/EasOutboxSyncHandler.java b/src/com/android/exchange/service/EasOutboxSyncHandler.java
index b2f8cff..a2f9c02 100644
--- a/src/com/android/exchange/service/EasOutboxSyncHandler.java
+++ b/src/com/android/exchange/service/EasOutboxSyncHandler.java
@@ -545,7 +545,7 @@
return true;
}
- private int getModeTag(final boolean isEas14, final SmartSendInfo smartSendInfo) {
+ private static int getModeTag(final boolean isEas14, final SmartSendInfo smartSendInfo) {
if (isEas14) {
if (smartSendInfo == null) {
return Tags.COMPOSE_SEND_MAIL;
diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 7efe769..ee66ea1 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -25,7 +25,6 @@
import android.content.EntityIterator;
import android.content.res.Resources;
import android.net.Uri;
-import android.os.RemoteException;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;
import android.provider.CalendarContract.Events;
diff --git a/src/com/android/exchange/utility/FileLogger.java b/src/com/android/exchange/utility/FileLogger.java
index bb17151..11323c2 100644
--- a/src/com/android/exchange/utility/FileLogger.java
+++ b/src/com/android/exchange/utility/FileLogger.java
@@ -16,7 +16,6 @@
package com.android.exchange.utility;
-import android.content.Context;
import android.os.Environment;
import java.io.FileWriter;
@@ -30,7 +29,7 @@
public static String LOG_FILE_NAME =
Environment.getExternalStorageDirectory() + "/emaillog.txt";
- public synchronized static FileLogger getLogger (Context c) {
+ public synchronized static FileLogger getLogger() {
LOGGER = new FileLogger();
return LOGGER;
}
diff --git a/src/com/android/exchange/utility/UriCodec.java b/src/com/android/exchange/utility/UriCodec.java
index 512b159..815d2aa 100644
--- a/src/com/android/exchange/utility/UriCodec.java
+++ b/src/com/android/exchange/utility/UriCodec.java
@@ -31,7 +31,7 @@
'U', 'V', 'W', 'X', 'Y', 'Z'
};
- public static String byteToHexString(byte b, boolean upperCase) {
+ public static String byteToHexString(byte b) {
StringBuilder sb = new StringBuilder();
sb.append(UPPER_CASE_DIGITS[(b >> 4) & 0xf]);
sb.append(UPPER_CASE_DIGITS[b & 0xf]);
@@ -228,6 +228,6 @@
private static void appendHex(StringBuilder sb, byte b) {
sb.append('%');
- sb.append(Misc.byteToHexString(b, true));
+ sb.append(Misc.byteToHexString(b));
}
}
