From b7a40b7b39a9b678df0899b7bc731e2535161d5a Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Wed, 6 Jan 2021 13:44:28 -0500 Subject: [PATCH 1/3] close #532 --- .../awais/instagrabber/utils/ResponseBodyUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java index 12505689..d161609f 100644 --- a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java +++ b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java @@ -1,5 +1,6 @@ package awais.instagrabber.utils; +import android.net.Uri; import android.util.Log; import android.util.Pair; @@ -962,10 +963,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) From f1e6c8042165b85b66105377e949546c5bf319ee Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Wed, 6 Jan 2021 13:47:19 -0500 Subject: [PATCH 2/3] oops --- .../main/java/awais/instagrabber/utils/ResponseBodyUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java index d161609f..c4058b9c 100644 --- a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java +++ b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java @@ -965,7 +965,7 @@ public final class ResponseBodyUtils { JSONObject tappableObject = data.getJSONArray("story_cta").getJSONObject(0).getJSONArray("links").getJSONObject(0); String swipeUpUrl = tappableObject.optString("webUri"); final String backupSwipeUpUrl = swipeUpUrl; - if (swipeUpUrl != null && swipeUpUrl.startsWith("https://l.instagram.com/") { + if (swipeUpUrl != null && swipeUpUrl.startsWith("https://l.instagram.com/")) { swipeUpUrl = Uri.parse(swipeUpUrl).getQueryParameter("u"); } if (swipeUpUrl != null && swipeUpUrl.startsWith("http")) From 24b4b7de90db54f7b44b346f71d133f35163254e Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Wed, 6 Jan 2021 14:06:56 -0500 Subject: [PATCH 3/3] v19.0.5 --- app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/57.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/57.txt diff --git a/app/build.gradle b/app/build.gradle index 259b7149..8fe6befe 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { minSdkVersion 21 targetSdkVersion 29 - versionCode 56 - versionName '19.0.4' + versionCode 57 + versionName '19.0.5' multiDexEnabled true diff --git a/fastlane/metadata/android/en-US/changelogs/57.txt b/fastlane/metadata/android/en-US/changelogs/57.txt new file mode 100644 index 00000000..77b86f46 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/57.txt @@ -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 \ No newline at end of file