Skip to content

Commit

Permalink
2.3.2:
Browse files Browse the repository at this point in the history
Fixed issue #28. Added imgur /r/ gallery links support.
Fixed issue #37. Added imgur.io support.
Fixed issue #39. Added support for GitHub images.
Fixed issue #31. Added support for discordapp and steam CDNs.
Removed instagram support.
  • Loading branch information
SpartanJ committed Jun 25, 2022
1 parent d82b69d commit d9bb873
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "com.ensoft.imgurviewer"
minSdkVersion 21
targetSdkVersion 32
versionCode 23100
versionName "2.3.1"
versionCode 23200
versionName "2.3.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
124 changes: 123 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
<data android:scheme="http" />

<data android:pathPattern="/p/.*" />
<data android:pathPattern="/reel/.*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand Down Expand Up @@ -240,13 +241,16 @@

<data android:host="www.imgur.com" />
<data android:host="imgur.com" />
<data android:host="www.imgur.io" />
<data android:host="imgur.io" />

<data android:scheme="https" />
<data android:scheme="http" />

<data android:pathPattern="/gallery/.*" />
<data android:pathPattern="/topic/.*" />
<data android:pathPattern="/a/.*" />
<data android:pathPattern="/r/.*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand All @@ -257,6 +261,8 @@
<data android:host="imgur.com" />
<data android:host="i.imgur.com" />
<data android:host="m.imgur.com" />
<data android:host="www.imgur.io" />
<data android:host="imgur.io" />

<data android:scheme="https" />
<data android:scheme="http" />
Expand Down Expand Up @@ -441,6 +447,75 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="user-images.githubusercontent.com" />

<data android:scheme="https" />
<data android:scheme="http" />

<data android:pathPattern="/.*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="camo.githubusercontent.com" />

<data android:scheme="https" />
<data android:scheme="http" />

<data android:pathPattern="/.*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="raw.githubusercontent.com" />

<data android:scheme="https" />
<data android:scheme="http" />

<data android:pathPattern="/\\.png" />
<data android:pathPattern="/\\.jpg" />
<data android:pathPattern="/\\.gif" />
<data android:pathPattern="/\\.webp" />
<data android:pathPattern="/\\.mp4" />
<data android:pathPattern="/\\.webm" />
<data android:pathPattern="/\\.avi" />
<data android:pathPattern="/\\.mkv" />
<data android:pathPattern="/\\.png?.*" />
<data android:pathPattern="/\\.jpg?.*" />
<data android:pathPattern="/\\.gif?.*" />
<data android:pathPattern="/\\.webp?.*" />
<data android:pathPattern="/\\.mp4?.*" />
<data android:pathPattern="/\\.webm?.*" />
<data android:pathPattern="/\\.avi?.*" />
<data android:pathPattern="/\\.mkv?.*" />

<data android:pathPattern="/\\.PNG" />
<data android:pathPattern="/\\.JPG" />
<data android:pathPattern="/\\.GIF" />
<data android:pathPattern="/\\.WEBP" />
<data android:pathPattern="/\\.MP4" />
<data android:pathPattern="/\\.WEBM" />
<data android:pathPattern="/\\.AVI" />
<data android:pathPattern="/\\.MKV" />

<data android:pathPattern="/\\.PNG?.*" />
<data android:pathPattern="/\\.JPG?.*" />
<data android:pathPattern="/\\.GIF?.*" />
<data android:pathPattern="/\\.WEBP?.*" />
<data android:pathPattern="/\\.MP4?.*" />
<data android:pathPattern="/\\.WEBM?.*" />
<data android:pathPattern="/\\.AVI?.*" />
<data android:pathPattern="/\\.MKV?.*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="nhentai.net" />
<data android:host="www.nhentai.net" />

Expand Down Expand Up @@ -490,6 +565,54 @@
<data android:pathPattern="/image/.*" />
<data android:pathPattern="/video/.*" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="cdn.discordapp.com" />
<data android:host="cdn.cloudflare.steamstatic.com" />

<data android:scheme="https" />
<data android:scheme="http" />

<data android:pathPattern="/\\.png" />
<data android:pathPattern="/\\.jpg" />
<data android:pathPattern="/\\.gif" />
<data android:pathPattern="/\\.webp" />
<data android:pathPattern="/\\.mp4" />
<data android:pathPattern="/\\.webm" />
<data android:pathPattern="/\\.avi" />
<data android:pathPattern="/\\.mkv" />
<data android:pathPattern="/\\.png?.*" />
<data android:pathPattern="/\\.jpg?.*" />
<data android:pathPattern="/\\.gif?.*" />
<data android:pathPattern="/\\.webp?.*" />
<data android:pathPattern="/\\.mp4?.*" />
<data android:pathPattern="/\\.webm?.*" />
<data android:pathPattern="/\\.avi?.*" />
<data android:pathPattern="/\\.mkv?.*" />

<data android:pathPattern="/\\.PNG" />
<data android:pathPattern="/\\.JPG" />
<data android:pathPattern="/\\.GIF" />
<data android:pathPattern="/\\.WEBP" />
<data android:pathPattern="/\\.MP4" />
<data android:pathPattern="/\\.WEBM" />
<data android:pathPattern="/\\.AVI" />
<data android:pathPattern="/\\.MKV" />

<data android:pathPattern="/\\.PNG?.*" />
<data android:pathPattern="/\\.JPG?.*" />
<data android:pathPattern="/\\.GIF?.*" />
<data android:pathPattern="/\\.WEBP?.*" />
<data android:pathPattern="/\\.MP4?.*" />
<data android:pathPattern="/\\.WEBM?.*" />
<data android:pathPattern="/\\.AVI?.*" />
<data android:pathPattern="/\\.MKV?.*" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down Expand Up @@ -828,7 +951,6 @@
<data android:mimeType="application/x-matroska"/>
<data android:mimeType="application/x-mpegurl"/>
</intent-filter>

</activity>

<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ else if ( uriString.contains( "/a/" ) )
{
endPart = uriString.substring( uriString.lastIndexOf( "/a/" ) + 3 );
}
else if ( uriString.contains( "/r/" ) )
{
return uriString.substring( uriString.lastIndexOf( "/r/" ) );
}
else if ( uriString.contains( "/album/" ) )
{
endPart = uriString.substring( uriString.lastIndexOf( "/album/" ) + 7 );
Expand All @@ -147,6 +151,7 @@ public boolean isAlbum( Uri uri )
{
return new ImgurService().isServicePath( uri ) && (
uri.toString().contains( "/a/" ) ||
uri.toString().contains( "/r/" ) ||
uri.toString().contains( "/gallery/" ) ||
uri.toString().contains( "/topic/" ) ||
uri.toString().contains( "/t/" ) ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
public class ImgurService extends MediaServiceSolver
{
public static final String IMGUR_DOMAIN = "imgur.com";
public static final String IMGURIO_DOMAIN = "imgur.io";
public static final String IMGUR_IMAGE_DOMAIN = "i.imgur.com";
public static final String IMGUR_MOBILE_DOMAIN = "m.imgur.com";
public static final String IMGUR_API_URL = "https://api.imgur.com/3";
Expand Down Expand Up @@ -81,6 +82,10 @@ else if ( url.contains( "//" + IMGUR_MOBILE_DOMAIN ) )
{
url = url.replace( "//" + IMGUR_MOBILE_DOMAIN, "//" + IMGUR_IMAGE_DOMAIN );
}
else if ( url.contains( "//" + IMGURIO_DOMAIN ) )
{
url = url.replace( "//" + IMGURIO_DOMAIN, "//" + IMGUR_IMAGE_DOMAIN );
}

if ( url.contains( "/r/" ) )
{
Expand Down Expand Up @@ -155,7 +160,7 @@ else if ( new ImgurAlbumService().isAlbum( uri ) )
@Override
public boolean isServicePath( Uri uri )
{
return uri.toString().contains( IMGUR_DOMAIN );
return uri.toString().contains( IMGUR_DOMAIN ) || uri.toString().contains( IMGURIO_DOMAIN );
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public boolean isAlbum( Uri uri )
public String getMediaUrl( Uri uri )
{
String url = uri.toString();
String mediaSep = "/p/";
String mediaSep = url.contains( "/p/" ) ? "/p/" : "/reel/";

int pos = url.indexOf( mediaSep );

Expand Down
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/23200.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
2.3.2:
Fixed issue #28. Added imgur /r/ gallery links support.
Fixed issue #37. Added imgur.io support.
Fixed issue #39. Added support for GitHub images.
Fixed issue #31. Added support for discordapp and steam CDNs.
Removed instagram support.

0 comments on commit d9bb873

Please sign in to comment.