Remove code for unsupported API levels (e4d26b8c) · Commits · e / os / Mail

src/com/fsck/k9/activity/K9PreferenceActivity.java

+1 −11

Original line number	Diff line number	Diff line
		package com.fsck.k9.activity;

		import android.os.Build;
		import android.os.Bundle;
		import android.preference.ListPreference;
		import android.preference.Preference;
		@@ -13,16 +12,7 @@ public class K9PreferenceActivity extends PreferenceActivity {
		@Override
		public void onCreate(Bundle icicle) {
		K9ActivityCommon.setLanguage(this, K9.getK9Language());

		if (Build.VERSION.SDK_INT >= 6 && Build.VERSION.SDK_INT < 14) {
		// There's a display bug in all supported Android versions before 4.0 (SDK 14) which
		// causes PreferenceScreens to have a black background.
		// http://code.google.com/p/android/issues/detail?id=4611
		setTheme(K9.getK9ThemeResourceId(K9.Theme.DARK));
		} else {
		setTheme(K9.getK9ThemeResourceId());
		}

		super.onCreate(icicle);
		}

src/com/fsck/k9/activity/MessageCompose.java

+1 −22

Original line number	Diff line number	Diff line
		@@ -8,10 +8,8 @@ import java.io.UnsupportedEncodingException;
		import java.text.DateFormat;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Date;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;
		@@ -3697,7 +3695,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,

		public List<String> getQueryParameters(String key) {
		final List<String> params = new ArrayList<String>();
		for (String paramName : getQueryParameterNames()) {
		for (String paramName : uri.getQueryParameterNames()) {
		if (paramName.equalsIgnoreCase(key)) {
		params.addAll(uri.getQueryParameters(paramName));
		}
		@@ -3705,25 +3703,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
		return params;
		}

		@TargetApi(11)
		private Set<String> getQueryParameterNames() {
		if (Build.VERSION.SDK_INT >= 11) {
		return uri.getQueryParameterNames();
		}

		return getQueryParameterNamesPreSdk11();
		}

		private Set<String> getQueryParameterNamesPreSdk11() {
		if (mParamNames == null) {
		String query = uri.getQuery();
		Set<String> paramNames = new HashSet<String>();
		Collections.addAll(paramNames, query.split("(=[^&]*(&\|$))\|&"));
		mParamNames = paramNames;
		}

		return mParamNames;
		}
		}

		private class SendMessageTask extends AsyncTask<Void, Void, Void> {

src/com/fsck/k9/activity/MessageList.java

+1 −15

Original line number	Diff line number	Diff line
		@@ -1391,20 +1391,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
		}
		}

		private void restartActivity() {
		// restart the current activity, so that the theme change can be applied
		if (Build.VERSION.SDK_INT < 11) {
		Intent intent = getIntent();
		intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
		finish();
		overridePendingTransition(0, 0); // disable animations to speed up the switch
		startActivity(intent);
		overridePendingTransition(0, 0);
		} else {
		recreate();
		}
		}

		@Override
		public void displayMessageSubject(String subject) {
		if (mDisplayMode == DisplayMode.MESSAGE_VIEW) {
		@@ -1541,7 +1527,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
		}
		}).start();

		restartActivity();
		recreate();
		}

		private void showDefaultTitleView() {

src/com/fsck/k9/activity/misc/ContactPictureLoader.java

+2 −18

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ import java.util.concurrent.RejectedExecutionException;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		import android.annotation.TargetApi;
		import android.app.ActivityManager;
		import android.content.ContentResolver;
		import android.content.Context;
		@@ -23,7 +22,6 @@ import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Build;
		import android.support.v4.util.LruCache;
		import android.widget.QuickContactBadge;
		import com.fsck.k9.helper.Contacts;
		@@ -103,16 +101,11 @@ public class ContactPictureLoader {
		final int cacheSize = 1024 * 1024 * memClass / 16;

		mBitmapCache = new LruCache<Address, Bitmap>(cacheSize) {
		@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
		@Override
		protected int sizeOf(Address key, Bitmap bitmap) {
		// The cache size will be measured in bytes rather than number of items.
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
		return bitmap.getByteCount();
		}

		return bitmap.getRowBytes() * bitmap.getHeight();
		}
		};
		}

		@@ -148,7 +141,7 @@ public class ContactPictureLoader {
		calculateFallbackBitmap(address), task);
		badge.setImageDrawable(asyncDrawable);
		try {
		task.exec();
		task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
		} catch (RejectedExecutionException e) {
		// We flooded the thread pool queue... use a fallback picture
		badge.setImageBitmap(calculateFallbackBitmap(address));
		@@ -275,15 +268,6 @@ public class ContactPictureLoader {
		mAddress = new Address(address);
		}

		@TargetApi(Build.VERSION_CODES.HONEYCOMB)
		public void exec(Void... args) {
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
		executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, args);
		} else {
		execute(args);
		}
		}

		public Address getAddress() {
		return mAddress;
		}

src/com/fsck/k9/fragment/MessageListFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ package com.fsck.k9.fragment;

		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.EnumMap;
		@@ -150,7 +151,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		private static final int FOLDER_NAME_COLUMN = 17;
		private static final int THREAD_COUNT_COLUMN = 18;

		private static final String[] PROJECTION = Utility.copyOf(THREADED_PROJECTION,
		private static final String[] PROJECTION = Arrays.copyOf(THREADED_PROJECTION,
		THREAD_COUNT_COLUMN);