diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt index 309882f97..dd7c4256f 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.kt @@ -41,7 +41,6 @@ import com.hippo.util.ReadableTime import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.collect.LongList -import com.hippo.yorozuya.collect.SparseJBArray class DownloadService : Service(), DownloadManager.DownloadListener { private var mNotifyManager: NotificationManagerCompat? = null @@ -533,7 +532,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener { private const val ID_DOWNLOADING = 1 private const val ID_DOWNLOADED = 2 private const val ID_509 = 3 - private val sItemStateArray = SparseJBArray() + private val sItemStateArray = LongSparseArray() private val sItemTitleArray = LongSparseArray() private var sFailedCount = 0 private var sFinishedCount = 0 diff --git a/app/src/main/java/com/hippo/yorozuya/collect/SparseJBArray.java b/app/src/main/java/com/hippo/yorozuya/collect/SparseJBArray.java deleted file mode 100644 index c7a2872f2..000000000 --- a/app/src/main/java/com/hippo/yorozuya/collect/SparseJBArray.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hippo.yorozuya.collect; - -/** - * SparseJBArrays map longs to booleans. - * Unlike a normal array of booleans - * there can be gaps in the indices. It is intended to be more memory efficient - * than using a HashMap to map Integers to Booleans, both because it avoids - * auto-boxing keys and values and its data structure doesn't rely on an extra entry object - * for each mapping. - * - *

Note that this container keeps its mappings in an array data structure, - * using a binary search to find keys. The implementation is not intended to be appropriate for - * data structures - * that may contain large numbers of items. It is generally slower than a traditional - * HashMap, since lookups require a binary search and adds and removes require inserting - * and deleting entries in the array. For containers holding up to hundreds of items, - * the performance difference is not significant, less than 50%.

- * - *

It is possible to iterate over the items in this container using - * {@link #keyAt(int)} and {@link #valueAt(int)}. Iterating over the keys using - * keyAt(int) with ascending values of the index will return the - * keys in ascending order, or the values corresponding to the keys in ascending - * order in the case of valueAt(int).

- */ -public class SparseJBArray implements Cloneable { - private long[] mKeys; - private boolean[] mValues; - private int mSize; - - /** - * Creates a new SparseJBArray containing no mappings. - */ - public SparseJBArray() { - this(10); - } - - /** - * Creates a new SparseJBArray containing no mappings that will not - * require any additional memory allocation to store the specified - * number of mappings. If you supply an initial capacity of 0, the - * sparse array will be initialized with a light-weight representation - * not requiring any additional array allocations. - */ - public SparseJBArray(int initialCapacity) { - if (initialCapacity == 0) { - mKeys = CollectionUtils.EMPTY_LONG_ARRAY; - mValues = CollectionUtils.EMPTY_BOOLEAN_ARRAY; - } else { - mKeys = new long[initialCapacity]; - mValues = new boolean[initialCapacity]; - } - mSize = 0; - } - - @Override - public SparseJBArray clone() { - SparseJBArray clone = null; - try { - clone = (SparseJBArray) super.clone(); - clone.mKeys = mKeys.clone(); - clone.mValues = mValues.clone(); - } catch (CloneNotSupportedException e) { - /* ignore */ - } - return clone; - } - - /** - * Gets the boolean mapped from the specified key, or false - * if no such mapping has been made. - */ - public boolean get(long key) { - return get(key, false); - } - - /** - * Gets the boolean mapped from the specified key, or the specified value - * if no such mapping has been made. - */ - public boolean get(long key, boolean valueIfKeyNotFound) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i < 0) { - return valueIfKeyNotFound; - } else { - return mValues[i]; - } - } - - /** - * Removes the mapping from the specified key, if there was any. - */ - public void delete(long key) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - System.arraycopy(mKeys, i + 1, mKeys, i, mSize - (i + 1)); - System.arraycopy(mValues, i + 1, mValues, i, mSize - (i + 1)); - mSize--; - } - } - - public void removeAt(int index) { - System.arraycopy(mKeys, index + 1, mKeys, index, mSize - (index + 1)); - System.arraycopy(mValues, index + 1, mValues, index, mSize - (index + 1)); - mSize--; - } - - /** - * Adds a mapping from the specified key to the specified value, - * replacing the previous mapping from the specified key if there - * was one. - */ - public void put(long key, boolean value) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - mValues[i] = value; - } else { - i = ~i; - - mKeys = CollectionUtils.insert(mKeys, mSize, i, key); - mValues = CollectionUtils.insert(mValues, mSize, i, value); - mSize++; - } - } - - /** - * Returns the number of key-value mappings that this SparseJBArray - * currently stores. - */ - public int size() { - return mSize; - } - - /** - * Given an index in the range 0...size()-1, returns - * the key from the indexth key-value mapping that this - * SparseJBArray stores. - * - *

The keys corresponding to indices in ascending order are guaranteed to - * be in ascending order, e.g., keyAt(0) will return the - * smallest key and keyAt(size()-1) will return the largest - * key.

- */ - public long keyAt(int index) { - return mKeys[index]; - } - - /** - * Given an index in the range 0...size()-1, returns - * the value from the indexth key-value mapping that this - * SparseJBArray stores. - * - *

The values corresponding to indices in ascending order are guaranteed - * to be associated with keys in ascending order, e.g., - * valueAt(0) will return the value associated with the - * smallest key and valueAt(size()-1) will return the value - * associated with the largest key.

- */ - public boolean valueAt(int index) { - return mValues[index]; - } - - public void setValueAt(int index, boolean value) { - mValues[index] = value; - } - - /** - * Returns the index for which {@link #keyAt} would return the - * specified key, or a negative number if the specified - * key is not mapped. - */ - public int indexOfKey(long key) { - return ContainerHelpers.binarySearch(mKeys, mSize, key); - } - - /** - * Returns an index for which {@link #valueAt} would return the - * specified key, or a negative number if no keys map to the - * specified value. - * Beware that this is a linear search, unlike lookups by key, - * and that multiple keys can map to the same value and this will - * find only one of them. - */ - public int indexOfValue(boolean value) { - for (int i = 0; i < mSize; i++) - if (mValues[i] == value) - return i; - - return -1; - } - - /** - * Removes all key-value mappings from this SparseJBArray. - */ - public void clear() { - mSize = 0; - } - - /** - * Puts a key/value pair into the array, optimizing for the case where - * the key is greater than all existing keys in the array. - */ - public void append(long key, boolean value) { - if (mSize != 0 && key <= mKeys[mSize - 1]) { - put(key, value); - return; - } - - mKeys = CollectionUtils.append(mKeys, mSize, key); - mValues = CollectionUtils.append(mValues, mSize, value); - mSize++; - } - - /** - * {@inheritDoc} - * - *

This implementation composes a string by iterating over its mappings. - */ - @Override - public String toString() { - if (size() <= 0) { - return "{}"; - } - - StringBuilder buffer = new StringBuilder(mSize * 28); - buffer.append('{'); - for (int i = 0; i < mSize; i++) { - if (i > 0) { - buffer.append(", "); - } - long key = keyAt(i); - buffer.append(key); - buffer.append('='); - boolean value = valueAt(i); - buffer.append(value); - } - buffer.append('}'); - return buffer.toString(); - } -}