Skip to content

Commit 6a99255

Browse files
yuvipandayuvipanda
committed
Upgrade version of UIL
1 parent e50f50c commit 6a99255

File tree

5 files changed

+15
-37
lines changed

5 files changed

+15
-37
lines changed

‎commons/commons.iml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@
3636
<content url="file://$MODULE_DIR$">
3737
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
3838
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
39-
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
4039
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
4140
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
4241
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
4342
<excludeFolder url="file://$MODULE_DIR$/target/idea-classes" />
4443
<excludeFolder url="file://$MODULE_DIR$/target/idea-test-classes" />
45-
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
46-
<excludeFolder url="file://$MODULE_DIR$/target/unpack" />
4744
</content>
4845
<orderEntry type="sourceFolder" forTests="false" />
4946
<orderEntry type="library" name="Maven: org.mediawiki:api:1.3" level="project" />
@@ -53,10 +50,11 @@
5350
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
5451
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
5552
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.2.2" level="project" />
53+
<orderEntry type="library" name="Maven: com.actionbarsherlock:actionbarsherlock:apklib:4.2.0" level="project" />
5654
<orderEntry type="library" scope="PROVIDED" name="Maven: android:android:4.1_r2" level="project" />
5755
<orderEntry type="library" name="Maven: android.support:compatibility-v4:11" level="project" />
5856
<orderEntry type="library" name="Maven: de.akquinet.android.androlog:androlog:1.0.5" level="project" />
59-
<orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.7.1" level="project" />
57+
<orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.8.2" level="project" />
6058
<orderEntry type="library" name="Maven: ch.acra:acra:4.4.0" level="project" />
6159
<orderEntry type="library" name="Maven: de.keyboardsurfer.android.widget:crouton:1.7" level="project" />
6260
<orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />

‎commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.nostra13.universalimageloader</groupId>
5151
<artifactId>universal-image-loader</artifactId>
52-
<version>1.7.1</version>
52+
<version>1.8.2</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>ch.acra</groupId>

‎commons/src/main/java/org/wikimedia/commons/CommonsApplication.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
import android.app.Application;
1010
import android.content.pm.PackageInfo;
1111
import android.content.pm.PackageManager;
12+
import android.graphics.Bitmap;
1213
import android.net.Uri;
1314
import android.os.Build;
1415

1516
import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
17+
import com.nostra13.universalimageloader.cache.memory.impl.LimitedAgeMemoryCache;
1618
import com.nostra13.universalimageloader.core.ImageLoader;
1719
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
18-
import com.nostra13.universalimageloader.core.download.URLConnectionImageDownloader;
1920
import com.nostra13.universalimageloader.utils.StorageUtils;
2021
import org.acra.ACRA;
2122
import org.acra.ReportingInteractionMode;
@@ -73,15 +74,6 @@ public DBOpenHelper getDbOpenHelper() {
7374
return dbOpenHelper;
7475
}
7576

76-
public class ContentUriImageDownloader extends URLConnectionImageDownloader {
77-
@Override
78-
protected InputStream getStreamFromOtherSource(URI imageUri) throws IOException {
79-
if(imageUri.getScheme().equals("content")) {
80-
return getContentResolver().openInputStream(Uri.parse(imageUri.toString()));
81-
}
82-
throw new RuntimeException("Not a content URI: " + imageUri);
83-
}
84-
}
8577

8678
@Override
8779
public void onCreate() {
@@ -94,7 +86,7 @@ public void onCreate() {
9486

9587
ImageLoaderConfiguration imageLoaderConfiguration = new ImageLoaderConfiguration.Builder(getApplicationContext())
9688
.discCache(new TotalSizeLimitedDiscCache(StorageUtils.getCacheDirectory(this), 128 * 1024 * 1024))
97-
.imageDownloader(new ContentUriImageDownloader()).build();
89+
.build();
9890
ImageLoader.getInstance().init(imageLoaderConfiguration);
9991

10092
try {

‎commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.nostra13.universalimageloader.core.assist.FailReason;
2727
import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
2828
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
29+
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
2930
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
3031
import org.wikimedia.commons.R;
3132
import org.wikimedia.commons.ShareActivity;
@@ -85,25 +86,16 @@ public void bindView(View view, Context context, Cursor cursor) {
8586
String actualUrl = TextUtils.isEmpty(contribution.getImageUrl()) ? contribution.getLocalUri().toString() : contribution.getThumbnailUrl(320);
8687

8788
if(views.url == null || !views.url.equals(actualUrl)) {
88-
ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new ImageLoadingListener() {
89-
public void onLoadingStarted() {
89+
ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() {
9090

91-
}
92-
93-
public void onLoadingFailed(FailReason failReason) {
94-
95-
}
96-
97-
public void onLoadingComplete(Bitmap bitmap) {
98-
if(bitmap.hasAlpha()) {
91+
@Override
92+
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
93+
if(loadedImage.hasAlpha()) {
9994
views.imageView.setBackgroundResource(android.R.color.white);
10095
}
10196
views.seqNumView.setVisibility(View.GONE);
10297
}
10398

104-
public void onLoadingCancelled() {
105-
106-
}
10799
});
108100
views.url = actualUrl;
109101
}

‎commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,30 +55,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
5555

5656
String actualUrl = TextUtils.isEmpty(media.getImageUrl()) ? media.getLocalUri().toString() : media.getThumbnailUrl(640);
5757
ImageLoader.getInstance().displayImage(actualUrl, image, displayOptions, new ImageLoadingListener() {
58-
public void onLoadingStarted() {
58+
public void onLoadingStarted(String s, View view) {
5959
loadingProgress.setVisibility(View.VISIBLE);
6060
}
6161

62-
public void onLoadingFailed(FailReason failReason) {
62+
public void onLoadingFailed(String s, View view, FailReason failReason) {
6363
loadingProgress.setVisibility(View.GONE);
6464
loadingFailed.setVisibility(View.VISIBLE);
65-
6665
}
6766

68-
public void onLoadingComplete(Bitmap bitmap) {
67+
public void onLoadingComplete(String s, View view, Bitmap bitmap) {
6968
loadingProgress.setVisibility(View.GONE);
7069
loadingFailed.setVisibility(View.GONE);
7170
image.setVisibility(View.VISIBLE);
7271
if(bitmap.hasAlpha()) {
7372
image.setBackgroundResource(android.R.color.white);
7473
}
75-
7674
}
7775

78-
public void onLoadingCancelled() {
79-
// wat?
76+
public void onLoadingCancelled(String s, View view) {
8077
throw new RuntimeException("Image loading cancelled. But why?");
81-
8278
}
8379
});
8480
title.setText(media.getDisplayTitle());

0 commit comments

Comments
 (0)