Skip to content

Commit 2f9919e

Browse files
committed
Merge pull request square#371 from square/dimitris/minor
Move declaration to AssetBtimapHunter.
2 parents 6770af1 + f6b411f commit 2f9919e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

picasso/src/main/java/com/squareup/picasso/AssetBitmapHunter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@
77
import java.io.IOException;
88
import java.io.InputStream;
99

10+
import static android.content.ContentResolver.SCHEME_FILE;
1011
import static com.squareup.picasso.Picasso.LoadedFrom.DISK;
1112

1213
class AssetBitmapHunter extends BitmapHunter {
14+
protected static final String ANDROID_ASSET = "android_asset";
15+
private static final int ASSET_PREFIX_LENGTH =
16+
(SCHEME_FILE + ":///" + ANDROID_ASSET + "/").length();
17+
1318
private AssetManager assetManager;
1419

1520
public AssetBitmapHunter(Context context, Picasso picasso, Dispatcher dispatcher, Cache cache,

picasso/src/main/java/com/squareup/picasso/BitmapHunter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static android.content.ContentResolver.SCHEME_CONTENT;
3434
import static android.content.ContentResolver.SCHEME_FILE;
3535
import static android.provider.ContactsContract.Contacts;
36+
import static com.squareup.picasso.AssetBitmapHunter.ANDROID_ASSET;
3637
import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
3738

3839
abstract class BitmapHunter implements Runnable {
@@ -43,9 +44,6 @@ abstract class BitmapHunter implements Runnable {
4344
* well as potential OOMs. Shamelessly stolen from Volley.
4445
*/
4546
private static final Object DECODE_LOCK = new Object();
46-
private static final String ANDROID_ASSET = "android_asset";
47-
protected static final int ASSET_PREFIX_LENGTH =
48-
(SCHEME_FILE + ":///" + ANDROID_ASSET + "/").length();
4947

5048
final Picasso picasso;
5149
final Dispatcher dispatcher;

0 commit comments

Comments
 (0)