sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some no-op CacheContentIndex cleanup

Browse source 
Push Cipher and SecretKeySpec instantiation into AtomicFileStorage,
since SQLiteStorage no longer needs them.

PiperOrigin-RevId: 233043754
This commit is contained in:
olly 2019-02-08 13:25:11 +00:00 committed by Andrew Lewis
parent 42e691519a
commit fd979790f2
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java vendored
View file

@ -116,7 +116,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
* @param cacheDir Directory where the index file is kept. * @param cacheDir Directory where the index file is kept.
* @param secretKey 16 byte AES key for reading and writing the cache index. * @param secretKey 16 byte AES key for reading and writing the cache index.
*/ */
public CachedContentIndex(File cacheDir, byte[] secretKey) { public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey) {
this(cacheDir, secretKey, secretKey != null); this(cacheDir, secretKey, secretKey != null);
} }
@ -128,27 +128,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
* @param encrypt Whether the index will be encrypted when written. Must be false if {@code * @param encrypt Whether the index will be encrypted when written. Must be false if {@code
* secretKey} is null. * secretKey} is null.
*/ */
public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) { public CachedContentIndex(File cacheDir, @Nullable byte[] secretKey, boolean encrypt) {
Cipher cipher = null;
SecretKeySpec secretKeySpec = null;
if (secretKey != null) {
Assertions.checkArgument(secretKey.length == 16);
try {
cipher = getCipher();
secretKeySpec = new SecretKeySpec(secretKey, "AES");
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
throw new IllegalStateException(e); // Should never happen.
}
} else {
Assertions.checkState(!encrypt);
}
keyToContent = new HashMap<>(); keyToContent = new HashMap<>();
idToKey = new SparseArray<>(); idToKey = new SparseArray<>();
removedIds = new SparseBooleanArray(); removedIds = new SparseBooleanArray();
Random random = new Random();
Storage atomicFileStorage = Storage atomicFileStorage =
new AtomicFileStorage( new AtomicFileStorage(new File(cacheDir, FILE_NAME_ATOMIC), secretKey, encrypt);
new File(cacheDir, FILE_NAME_ATOMIC), random, encrypt, cipher, secretKeySpec);
// Storage sqliteStorage = new SQLiteStorage(databaseProvider); // Storage sqliteStorage = new SQLiteStorage(databaseProvider);
storage = atomicFileStorage; storage = atomicFileStorage;
previousStorage = null; previousStorage = null;
@ -430,25 +415,33 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
/** {@link Storage} implementation that uses an {@link AtomicFile}. */ /** {@link Storage} implementation that uses an {@link AtomicFile}. */
private static class AtomicFileStorage implements Storage { private static class AtomicFileStorage implements Storage {
private final Random random;
private final boolean encrypt; private final boolean encrypt;
@Nullable private final Cipher cipher; @Nullable private final Cipher cipher;
@Nullable private final SecretKeySpec secretKeySpec; @Nullable private final SecretKeySpec secretKeySpec;
@Nullable private final Random random;
private final AtomicFile atomicFile; private final AtomicFile atomicFile;
private boolean changed; private boolean changed;
@Nullable private ReusableBufferedOutputStream bufferedOutputStream; @Nullable private ReusableBufferedOutputStream bufferedOutputStream;
public AtomicFileStorage( public AtomicFileStorage(File file, @Nullable byte[] secretKey, boolean encrypt) {
File file, Cipher cipher = null;
Random random, SecretKeySpec secretKeySpec = null;
boolean encrypt, if (secretKey != null) {
@Nullable Cipher cipher, Assertions.checkArgument(secretKey.length == 16);
@Nullable SecretKeySpec secretKeySpec) { try {
this.random = random; cipher = getCipher();
secretKeySpec = new SecretKeySpec(secretKey, "AES");
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
throw new IllegalStateException(e); // Should never happen.
}
} else {
Assertions.checkArgument(!encrypt);
}
this.encrypt = encrypt; this.encrypt = encrypt;
this.cipher = cipher; this.cipher = cipher;
this.secretKeySpec = secretKeySpec; this.secretKeySpec = secretKeySpec;
random = encrypt ? new Random() : null;
atomicFile = new AtomicFile(file); atomicFile = new AtomicFile(file);
} }