Skip to content

Commit 21f62db

Browse files
SpartanJSpartanJ
committed
Fixes #45.
Services fixes.
1 parent 5cfed3a commit 21f62db

File tree

15 files changed

+75
-54
lines changed

15 files changed

+75
-54
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ build
1111
imgurviewer.jks
1212
app/release/output.json
1313
/app/release/output-metadata.json
14+
java_pid*

‎app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
def versionMajor = 2
44
def versionMinor = 3
5-
def versionPatch = 1
5+
def versionPatch = 4
66
// We need to use a static versionCode and versionName to support automatic updates in F-Droid
77
def versionCodeNum = versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100
88

@@ -14,8 +14,8 @@ android {
1414
applicationId "com.ensoft.imgurviewer"
1515
minSdkVersion 21
1616
targetSdkVersion 32
17-
versionCode 23300
18-
versionName "2.3.3"
17+
versionCode 23400
18+
versionName "2.3.4"
1919
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2020
}
2121
buildTypes {
@@ -28,6 +28,7 @@ android {
2828
targetCompatibility 1.8
2929
sourceCompatibility 1.8
3030
}
31+
namespace 'com.imgurviewer'
3132
}
3233

3334
dependencies {

‎app/src/androidTest/java/com/ensoft/imgurviewer/service/ResourceSolverTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,17 @@ public void loadFailed( Uri uri, String error )
111111
});
112112

113113
String[] testUris = new String[] {
114+
"https://prnt.sc/10jpuxg",
115+
"https://prnt.sc/10jpuxg/direct",
116+
"https://prntscr.com/10jpuxg",
117+
"https://prntscr.com/10jpuxg/direct",
114118
"https://www.reddit.com/gallery/pc1m7t",
115119
"https://v.redd.it/zv89llsvexdz",
116120
"https://v.redd.it/ulz7g757bb581",
117121
"https://www.reddit.com/gallery/huxc4s",
118122
"https://www.redgifs.com/watch/terrificaridbrownbutterfly",
119123
"https://redgifs.com/watch/jaggedunselfishgannet",
120124
"https://gfycat.com/whoppingcostlyairedale",
121-
"https://clips.twitch.tv/SmoggySmallHummingbirdOSkomodo-KeUalcW_KTZl_XRH?tt_medium=redt",
122125
"https://clips.twitch.tv/FaintLightGullWholeWheat",
123126
"http://imgur.com/gallery/fADjkcW",
124127
"https://imgur.com/A61SaA1",
@@ -131,10 +134,6 @@ public void loadFailed( Uri uri, String error )
131134
"https://ibb.co/f2D3BNg",
132135
"https://gyazo.com/1eae60fbb44ba44cdcd89064ffbaacef",
133136
"https://imgflip.com/i/3dhvnl",
134-
"https://prnt.sc/10jpuxg",
135-
"https://prnt.sc/10jpuxg/direct",
136-
"https://prntscr.com/10jpuxg",
137-
"https://prntscr.com/10jpuxg/direct",
138137
"http://gfycat.com/DeadlyDecisiveGermanpinscher",
139138
"http://gfycat.com/ifr/JauntyTimelyAmazontreeboa",
140139
"https://streamable.com/dnd1",
@@ -144,9 +143,9 @@ public void loadFailed( Uri uri, String error )
144143
"http://www.flickr.com/photos/forestwander-nature-pictures/5645318632/in/photostream/",
145144
"https://www.flickr.com/photos/10795027@N08/37124872560/in/photostream/lightbox/",
146145
"https://www.flickr.com/photos/wernerkrause/albums/72157649599416957",
147-
"https://media.giphy.com/media/9r1gg8vm3lbTcQI1Gw/giphy.gif",
148-
"https://media.giphy.com/media/l4EoMdmBWzc69MSm4/giphy.gif",
149-
"https://streamja.com/ggz",
146+
"https://giphy.com/gifs/warnerbrosde-R6gvnAxj2ISzJdbA63",
147+
"https://giphy.com/gifs/love-i-you-that-70s-show-2dQ3FMaMFccpi",
148+
"https://streamja.com/6BGLa",
150149
"https://vimeo.com/247872788",
151150
"https://vimeo.com/311794663",
152151
"https://www.clippituser.tv/c/dnbaba",

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.imgurviewer"
4-
android:installLocation="auto">
3+
android:installLocation="auto">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickAlbumImageData.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.ensoft.imgurviewer.model;
2+
3+
public class FlickAlbumImageData
4+
{
5+
public FlickrAlbumImage data;
6+
}

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickrAlbumImage.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,49 @@ public class FlickrAlbumImage
1212

1313
public String description;
1414

15-
public FlickrAlbumImageSizes sizes;
15+
public FlickrAlbumImageSizesData sizes;
1616

1717
public String getImage()
1818
{
1919
String url = null;
2020

2121
ThumbnailSize thumbnailSize = App.getInstance().getPreferencesService().thumbnailSizeOnGallery();
2222

23-
if ( thumbnailSize == ThumbnailSize.SMALL_SQUARE && null != sizes.sq )
24-
url = sizes.sq.displayUrl;
25-
else if ( thumbnailSize == ThumbnailSize.BIG_SQUARE && null != sizes.q )
26-
url = sizes.q.displayUrl;
27-
else if ( thumbnailSize == ThumbnailSize.SMALL_THUMBNAIL && null != sizes.s )
28-
url = sizes.s.displayUrl;
29-
else if ( thumbnailSize == ThumbnailSize.MEDIUM_THUMBNAIL && null != sizes.m )
30-
url = sizes.m.displayUrl;
31-
else if ( thumbnailSize == ThumbnailSize.LARGE_THUMBNAIL && null != sizes.l )
32-
url = sizes.l.displayUrl;
33-
else if ( thumbnailSize == ThumbnailSize.HUGE_THUMBNAIL && null != sizes.h )
34-
url = sizes.h.displayUrl;
35-
else if ( thumbnailSize == ThumbnailSize.FULL_IMAGE && null != sizes.k )
36-
url = sizes.k.displayUrl;
23+
if ( thumbnailSize == ThumbnailSize.SMALL_SQUARE && null != sizes.data.sq )
24+
url = sizes.data.sq.data.displayUrl;
25+
else if ( thumbnailSize == ThumbnailSize.BIG_SQUARE && null != sizes.data.q )
26+
url = sizes.data.q.data.displayUrl;
27+
else if ( thumbnailSize == ThumbnailSize.SMALL_THUMBNAIL && null != sizes.data.s )
28+
url = sizes.data.s.data.displayUrl;
29+
else if ( thumbnailSize == ThumbnailSize.MEDIUM_THUMBNAIL && null != sizes.data.m )
30+
url = sizes.data.m.data.displayUrl;
31+
else if ( thumbnailSize == ThumbnailSize.LARGE_THUMBNAIL && null != sizes.data.l )
32+
url = sizes.data.l.data.displayUrl;
33+
else if ( thumbnailSize == ThumbnailSize.HUGE_THUMBNAIL && null != sizes.data.h )
34+
url = sizes.data.h.data.displayUrl;
35+
else if ( thumbnailSize == ThumbnailSize.FULL_IMAGE && null != sizes.data.k )
36+
url = sizes.data.k.data.displayUrl;
3737

3838
return ( url != null ) ? "https:" + url : null;
3939
}
4040

4141
public String getFullSizeImage()
4242
{
43-
return null != sizes.k ? "https:" + sizes.k.displayUrl : null;
43+
return null != sizes.data.k ? "https:" + sizes.data.k.data.displayUrl : null;
4444
}
4545

4646
public Uri getThumbnail()
4747
{
4848
String url = null;
4949

50-
if ( sizes.t != null )
51-
url = sizes.t.displayUrl;
50+
if ( sizes.data.t != null )
51+
url = sizes.data.t.data.displayUrl;
5252

53-
if ( null == url && sizes.s != null )
54-
url = sizes.s.displayUrl;
53+
if ( null == url && sizes.data.s != null )
54+
url = sizes.data.s.data.displayUrl;
5555

56-
if ( null == url && null != sizes.sq )
57-
url = sizes.sq.displayUrl;
56+
if ( null == url && null != sizes.data.sq )
57+
url = sizes.data.sq.data.displayUrl;
5858

5959
return null != url ? Uri.parse( "https:" + url ) : null;
6060
}

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickrAlbumImageSize.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ public class FlickrAlbumImageSize
99
public String displayUrl;
1010

1111
public String url;
12-
13-
public String key;
1412
}

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickrAlbumImageSizeData.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.ensoft.imgurviewer.model;
2+
3+
public class FlickrAlbumImageSizeData
4+
{
5+
public FlickrAlbumImageSize data;
6+
}

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickrAlbumImageSizes.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22

33
public class FlickrAlbumImageSizes
44
{
5-
FlickrAlbumImageSize c;
5+
FlickrAlbumImageSizeData c;
66

7-
FlickrAlbumImageSize h;
7+
FlickrAlbumImageSizeData h;
88

9-
FlickrAlbumImageSize k;
9+
FlickrAlbumImageSizeData k;
1010

11-
FlickrAlbumImageSize l;
11+
FlickrAlbumImageSizeData l;
1212

13-
FlickrAlbumImageSize m;
13+
FlickrAlbumImageSizeData m;
1414

15-
FlickrAlbumImageSize n;
15+
FlickrAlbumImageSizeData n;
1616

17-
FlickrAlbumImageSize q;
17+
FlickrAlbumImageSizeData q;
1818

19-
FlickrAlbumImageSize s;
19+
FlickrAlbumImageSizeData s;
2020

21-
FlickrAlbumImageSize t;
21+
FlickrAlbumImageSizeData t;
2222

23-
FlickrAlbumImageSize z;
23+
FlickrAlbumImageSizeData z;
2424

25-
FlickrAlbumImageSize sq;
25+
FlickrAlbumImageSizeData sq;
2626
}

‎app/src/main/java/com/ensoft/imgurviewer/model/FlickrAlbumImageSizesData.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.ensoft.imgurviewer.model;
2+
3+
public class FlickrAlbumImageSizesData
4+
{
5+
public FlickrAlbumImageSizes data;
6+
}

0 commit comments

Comments
 (0)