From de6d757176c12412301ba7aef3a5eac4cfbd6820 Mon Sep 17 00:00:00 2001
From: Lcukerd <Harshit97@bitbucket.org>
Date: Thu, 1 Feb 2018 17:06:09 +0530
Subject: [PATCH] changed scrapper as per changes in instagram. Fuckin stop
 changing instagramgit add .

---
 .idea/modules.xml                             |  2 +
 app/build.gradle                              |  2 +-
 .../com/instaswipe/ProfileActivity.java       |  2 +-
 .../com/instaswipe/Utils/Scrapper.java        | 67 ++++++++-----------
 .../instaswipe/adapter/GridImageAdapter.java  |  6 +-
 build.gradle                                  |  2 +
 6 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 98d6f25..b9930fc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Insta Swipe.iml" filepath="$PROJECT_DIR$/Insta Swipe.iml" />
+      <module fileurl="file://$PROJECT_DIR$/InstaSwipe.iml" filepath="$PROJECT_DIR$/InstaSwipe.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index fb89730..a55be89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "lcukerd.com.instaswipe"
         minSdkVersion 18
diff --git a/app/src/main/java/lcukerd/com/instaswipe/ProfileActivity.java b/app/src/main/java/lcukerd/com/instaswipe/ProfileActivity.java
index 258157d..53b979d 100644
--- a/app/src/main/java/lcukerd/com/instaswipe/ProfileActivity.java
+++ b/app/src/main/java/lcukerd/com/instaswipe/ProfileActivity.java
@@ -153,7 +153,7 @@ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage)
             public void onClick(View v)
             {
                 ArrayList<String> temp = new ArrayList<>();
-                temp.add(profilepicURL);
+                temp.add(Scrapper.getProfilePicHDUrl(sourceCode));
                 Intent intent = new Intent(ProfileActivity.this, SwipePic.class);
                 intent.putStringArrayListExtra("urls", temp);
                 intent.putExtra("id", "-1");
diff --git a/app/src/main/java/lcukerd/com/instaswipe/Utils/Scrapper.java b/app/src/main/java/lcukerd/com/instaswipe/Utils/Scrapper.java
index 9310a68..3aac9cc 100644
--- a/app/src/main/java/lcukerd/com/instaswipe/Utils/Scrapper.java
+++ b/app/src/main/java/lcukerd/com/instaswipe/Utils/Scrapper.java
@@ -14,19 +14,15 @@
  * Created by Programmer on 15-09-2017.
  */
 
-public class Scrapper
-{
+public class Scrapper {
     private static final String tag = Scrapper.class.getSimpleName();
 
-    public static ArrayList<User> getUsersfromsearch(String result)
-    {
+    public static ArrayList<User> getUsersfromsearch(String result) {
         ArrayList<User> userArrayList = new ArrayList<>();
-        try
-        {
+        try {
             JSONObject jsonObject = new JSONObject(result);
             JSONArray jsonArray = jsonObject.getJSONArray("users");
-            for (int i = 0; i < jsonArray.length(); i++)
-            {
+            for (int i = 0; i < jsonArray.length(); i++) {
                 User u = new User();
                 jsonObject = jsonArray.getJSONObject(i);
                 jsonObject = jsonObject.getJSONObject("user");
@@ -41,32 +37,34 @@ public static ArrayList<User> getUsersfromsearch(String result)
                     u.isprivate = "";
                 userArrayList.add(u);
             }
-        } catch (JSONException e)
-        {
+        } catch (JSONException e) {
             Log.e(tag, "Error in Json " + result);
         }
         return userArrayList;
     }
 
-    public static String getUsername(String result)
-    {
+    public static String getUsername(String result) {
         int start = result.indexOf("<meta property=\"og:title\" content=");
         int end = result.indexOf("Instagram photos", result.indexOf("<meta property=\"og:title\" content="));
         return result.substring(start + 35, end - 5);
     }
 
-    public static String getProfilePicUrl(String result)
-    {
+    public static String getProfilePicUrl(String result) {
         int start = result.indexOf("<meta property=\"og:image\" content=\"");
         int end = result.indexOf(" />", result.indexOf("<meta property=\"og:image\" content="));
         return result.substring(start + 35, end - 1);
     }
 
+    public static String getProfilePicHDUrl(String result) {
+        int start = result.indexOf("\"profile_pic_url_hd\"");
+        int end = result.indexOf("\",", start);
+        return result.substring(start + 22, end);
+    }
+
     /**
      * media link that are video start with v followedby code then '@' after that url of thumbnail starts.
      */
-    public static String getimageUrl(String result, int pos, boolean full)
-    {
+    public static String getimageUrl(String result, int pos, boolean full) {
         int start = result.indexOf("thumbnail_src", pos);
         if ((start == -1) && (pos == 0))
             return "private";
@@ -76,31 +74,26 @@ else if (start == -1)
         pos = end;
         int checkvideo = result.indexOf("\"is_video\"", pos);
         String isvideo = result.substring(checkvideo + 12, result.indexOf(',', checkvideo));
-        if (isvideo.equals("true"))
-        {
+        if (isvideo.equals("true")) {
             int cstart = result.indexOf(',', checkvideo) + 11;
             int cend = result.indexOf('"', cstart);
             String code = result.substring(cstart, cend);
             Log.i(tag, "is video " + isvideo + "  " + code);
             return "v" + code + "@" + result.substring(start + 17, end);
-        } else if (full)
-        {
+        } else if (full) {
             start = result.indexOf("display_src", pos);
             end = result.indexOf("\",", result.indexOf("display_src", pos));
-            return result.substring(start + 15, end);
-        }
-        else
-            return result.substring(start + 17, end);
+            return result.substring(start + 14, end);
+        } else
+            return result.substring(start + 16, end);
     }
 
-    public static String getnextpageID(String result, int pos)
-    {
+    public static String getnextpageID(String result, int pos) {
         int index = 21;
         int start = result.indexOf("\"GraphImage\", \"id\"", pos);
         if (start == -1)
             start = result.indexOf("\"GraphVideo\", \"id\"", pos);
-        if (start == -1)
-        {
+        if (start == -1) {
             index += 2;
             start = result.indexOf("\"GraphSidecar\", \"id\"", pos);
         }
@@ -108,8 +101,7 @@ public static String getnextpageID(String result, int pos)
         return result.substring(start + index, end);
     }
 
-    public static String formatURLforfullscreen(String tempurl)
-    {
+    public static String formatURLforfullscreen(String tempurl) {
         int istart = tempurl.indexOf("s640x640/", 0);
         if (istart == -1)
             istart = tempurl.indexOf("s360x360/", 0);
@@ -125,29 +117,25 @@ public static String formatURLforfullscreen(String tempurl)
         return tempurl.substring(0, istart) + tempurl.substring(iend);
     }
 
-    public static String getFollowers(String result)
-    {
+    public static String getFollowers(String result) {
         int index = result.indexOf("Followers");
         int start = result.indexOf('"', index - 12);
         return result.substring(start + 1, index - 1);
     }
 
-    public static String getFollowing(String result)
-    {
+    public static String getFollowing(String result) {
         int index = result.indexOf("Following");
         int start = result.indexOf(',', index - 12);
         return result.substring(start + 2, index - 1);
     }
 
-    public static String getPosts(String result)
-    {
+    public static String getPosts(String result) {
         int index = result.indexOf("Posts");
         int start = result.indexOf(',', index - 12);
         return result.substring(start + 2, index - 1);
     }
 
-    public static String getVideoPageUrl(String code, String id)
-    {
+    public static String getVideoPageUrl(String code, String id) {
         int start = id.indexOf("m/") + 2;
         int end = id.indexOf("/", start);
         String url = "https://www.instagram.com/p/" + code + "/?taken-by=" + id.substring(start, end);
@@ -155,8 +143,7 @@ public static String getVideoPageUrl(String code, String id)
         return url;
     }
 
-    public static String getVideoUrl(String result)
-    {
+    public static String getVideoUrl(String result) {
         int start = result.indexOf("\"og:video\" content") + 20;
         int end = result.indexOf("\" />", start);
         String videoUrl = result.substring(start, end);
diff --git a/app/src/main/java/lcukerd/com/instaswipe/adapter/GridImageAdapter.java b/app/src/main/java/lcukerd/com/instaswipe/adapter/GridImageAdapter.java
index 6083f13..fe61f6b 100644
--- a/app/src/main/java/lcukerd/com/instaswipe/adapter/GridImageAdapter.java
+++ b/app/src/main/java/lcukerd/com/instaswipe/adapter/GridImageAdapter.java
@@ -113,7 +113,7 @@ public boolean onLongClick(View v) {
                 }
             });
         } else {
-            if ((imgURLs.size() - 4 <= position + 1) && (imgURLs.size() >= 12)) {
+            if ((imgURLs.size() - 1 <= position + 1) && (imgURLs.size() >= 12)) {
                 Log.d(tag, "end reached");
                 if ((wait == false) && (nomoreposts == false) && (Private == false) && (internetworking == true))
                     loadmore();
@@ -231,8 +231,8 @@ public void onCompleted(Exception e, String result) {
                         }
                         pos = result.indexOf("\",", result.indexOf("thumbnail_src", pos));
                     } catch (NullPointerException ne) {
-                        internetworking = false;
-                        Toast.makeText(mContext, "Internet Not Working", Toast.LENGTH_SHORT).show();
+                        /*internetworking = false;
+                        Toast.makeText(mContext, "Internet Not Working", Toast.LENGTH_SHORT).show();*/
                         Log.e(tag, "Internet not working", ne);
                     } catch (StringIndexOutOfBoundsException finished) {
                         Toast.makeText(mContext, "No More posts", Toast.LENGTH_SHORT).show();
diff --git a/build.gradle b/build.gradle
index c8d8891..331c6a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -21,6 +22,7 @@ allprojects {
         mavenCentral()
         maven { url 'https://maven.google.com' }
         maven { url 'https://dl.bintray.com/drummer-aidan/maven' }
+        google()
     }
 }