Merge branch 'master' into pr/503

This commit is contained in:
Austin Huang 2021-01-06 14:17:30 -05:00
commit 0f7fde38cd
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
3 changed files with 14 additions and 5 deletions

View File

@ -10,8 +10,8 @@ android {
minSdkVersion 21
targetSdkVersion 29
versionCode 56
versionName '19.0.4'
versionCode 57
versionName '19.0.5'
multiDexEnabled true

View File

@ -1,5 +1,6 @@
package awais.instagrabber.utils;
import android.net.Uri;
import android.util.Log;
import android.util.Pair;
@ -957,10 +958,15 @@ public final class ResponseBodyUtils {
}
if (data.has("story_cta") && data.has("link_text")) {
JSONObject tappableObject = data.getJSONArray("story_cta").getJSONObject(0).getJSONArray("links").getJSONObject(0);
String swipeUpUrl = tappableObject.getString("webUri");
if (swipeUpUrl.startsWith("http")) {
model.setSwipeUp(new SwipeUpModel(swipeUpUrl, data.getString("link_text")));
String swipeUpUrl = tappableObject.optString("webUri");
final String backupSwipeUpUrl = swipeUpUrl;
if (swipeUpUrl != null && swipeUpUrl.startsWith("https://l.instagram.com/")) {
swipeUpUrl = Uri.parse(swipeUpUrl).getQueryParameter("u");
}
if (swipeUpUrl != null && swipeUpUrl.startsWith("http"))
model.setSwipeUp(new SwipeUpModel(swipeUpUrl, data.getString("link_text")));
else if (backupSwipeUpUrl != null && backupSwipeUpUrl.startsWith("http"))
model.setSwipeUp(new SwipeUpModel(backupSwipeUpUrl, data.getString("link_text")));
}
if (data.has("story_sliders")) {
final JSONObject tappableObject = data.getJSONArray("story_sliders").getJSONObject(0)

View File

@ -0,0 +1,3 @@
Preliminary support for live videos, as well as bug fixes.
For details see https://github.com/austinhuang0131/barinsta/releases/tag/v19.0.5