From eaac1915886b81df05794ff91d63acda5b72553c Mon Sep 17 00:00:00 2001
From: Ammar Githam <ammar.githam@outlook.com>
Date: Wed, 9 Jun 2021 08:46:34 +0900
Subject: [PATCH] Remove BaseService. Since RetrofitFactory was introduced,
 BaseService does nothing.

---
 .../instagrabber/webservices/BaseService.java | 30 -------------------
 .../webservices/CollectionService.java        |  2 +-
 .../webservices/CommentService.java           |  2 +-
 .../webservices/DirectMessagesService.kt      |  2 +-
 .../webservices/DiscoverService.java          |  2 +-
 .../instagrabber/webservices/FeedService.java |  2 +-
 .../webservices/FriendshipService.kt          |  2 +-
 .../instagrabber/webservices/GifService.java  |  2 +-
 .../webservices/GraphQLService.kt             |  2 +-
 .../webservices/LocationService.java          |  2 +-
 .../instagrabber/webservices/MediaService.kt  |  2 +-
 .../instagrabber/webservices/NewsService.java |  2 +-
 .../webservices/ProfileService.java           |  2 +-
 .../webservices/SearchService.java            |  2 +-
 .../webservices/StoriesService.kt             |  2 +-
 .../instagrabber/webservices/TagsService.java |  2 +-
 .../webservices/UserRepository.kt             |  2 +-
 17 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/main/java/awais/instagrabber/webservices/BaseService.java

diff --git a/app/src/main/java/awais/instagrabber/webservices/BaseService.java b/app/src/main/java/awais/instagrabber/webservices/BaseService.java
deleted file mode 100644
index a6cdf060..00000000
--- a/app/src/main/java/awais/instagrabber/webservices/BaseService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package awais.instagrabber.webservices;
-
-public abstract class BaseService {
-    private static final String TAG = "BaseService";
-
-    // protected String userBreadcrumb(final int size) {
-    //     final long term = (random(2, 4) * 1000) + size + (random(15, 21) * 1000);
-    //     final float div = (float) size / random(2, 4);
-    //     final int round = Math.round(div);
-    //     final long textChangeEventCount = round > 0 ? round : 1;
-    //     final String data = String.format(Locale.getDefault(), "%d %d %d %d", size, term, textChangeEventCount, new Date().getTime());
-    //     try {
-    //         final Mac hasher = Mac.getInstance("HmacSHA256");
-    //         hasher.init(new SecretKeySpec(Constants.BREADCRUMB_KEY.getBytes(), "HmacSHA256"));
-    //         byte[] hash = hasher.doFinal(data.getBytes());
-    //         final StringBuilder hexString = new StringBuilder();
-    //         for (byte b : hash) {
-    //             final String hex = Integer.toHexString(0xff & b);
-    //             if (hex.length() == 1) hexString.append('0');
-    //             hexString.append(hex);
-    //         }
-    //         final String encodedData = Base64.encodeToString(data.getBytes(), Base64.NO_WRAP);
-    //         final String encodedHex = Base64.encodeToString(hexString.toString().getBytes(), Base64.NO_WRAP);
-    //         return String.format("%s\n%s\n", encodedHex, encodedData);
-    //     } catch (Exception e) {
-    //         Log.e(TAG, "Error creating breadcrumb", e);
-    //         return null;
-    //     }
-    // }
-}
diff --git a/app/src/main/java/awais/instagrabber/webservices/CollectionService.java b/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
index e4db2223..b237367a 100644
--- a/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
@@ -17,7 +17,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class CollectionService extends BaseService {
+public class CollectionService {
     private static final String TAG = "ProfileService";
 
     private final CollectionRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/CommentService.java b/app/src/main/java/awais/instagrabber/webservices/CommentService.java
index 70d00375..5a8945aa 100644
--- a/app/src/main/java/awais/instagrabber/webservices/CommentService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/CommentService.java
@@ -27,7 +27,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class CommentService extends BaseService {
+public class CommentService {
     private static final String TAG = "CommentService";
 
     private final CommentRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.kt b/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.kt
index ae45ca61..295faf28 100644
--- a/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.kt
@@ -9,7 +9,7 @@ import awais.instagrabber.utils.Utils
 import org.json.JSONArray
 import java.util.*
 
-object DirectMessagesService : BaseService() {
+object DirectMessagesService {
     private val repository: DirectMessagesRepository = RetrofitFactory.retrofit.create(DirectMessagesRepository::class.java)
 
     suspend fun fetchInbox(
diff --git a/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java b/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
index f893a2fb..0c6ff764 100644
--- a/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
@@ -13,7 +13,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class DiscoverService extends BaseService {
+public class DiscoverService {
 
     private static final String TAG = "DiscoverService";
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/FeedService.java b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
index 330be0d7..42fdf168 100644
--- a/app/src/main/java/awais/instagrabber/webservices/FeedService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
@@ -23,7 +23,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class FeedService extends BaseService {
+public class FeedService {
     private static final String TAG = "FeedService";
 
     private final FeedRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/FriendshipService.kt b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.kt
index 4982cd15..3ba054c6 100644
--- a/app/src/main/java/awais/instagrabber/webservices/FriendshipService.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.kt
@@ -11,7 +11,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-object FriendshipService : BaseService() {
+object FriendshipService {
     private val repository: FriendshipRepository = retrofit.create(FriendshipRepository::class.java)
 
     suspend fun follow(
diff --git a/app/src/main/java/awais/instagrabber/webservices/GifService.java b/app/src/main/java/awais/instagrabber/webservices/GifService.java
index 3e66aa74..0db0f954 100644
--- a/app/src/main/java/awais/instagrabber/webservices/GifService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/GifService.java
@@ -4,7 +4,7 @@ import awais.instagrabber.repositories.GifRepository;
 import awais.instagrabber.repositories.responses.giphy.GiphyGifResponse;
 import retrofit2.Call;
 
-public class GifService extends BaseService {
+public class GifService {
 
     private final GifRepository repository;
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.kt b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.kt
index ac6e881e..0ba90cbe 100644
--- a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.kt
@@ -12,7 +12,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
-object GraphQLService : BaseService() {
+object GraphQLService {
     private val repository: GraphQLRepository = retrofitWeb.create(GraphQLRepository::class.java)
 
     // TODO convert string response to a response class
diff --git a/app/src/main/java/awais/instagrabber/webservices/LocationService.java b/app/src/main/java/awais/instagrabber/webservices/LocationService.java
index 44059c89..e848ae1c 100644
--- a/app/src/main/java/awais/instagrabber/webservices/LocationService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/LocationService.java
@@ -14,7 +14,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class LocationService extends BaseService {
+public class LocationService {
     private static final String TAG = "LocationService";
 
     private final LocationRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/MediaService.kt b/app/src/main/java/awais/instagrabber/webservices/MediaService.kt
index a08747af..c2405447 100644
--- a/app/src/main/java/awais/instagrabber/webservices/MediaService.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/MediaService.kt
@@ -12,7 +12,7 @@ import awais.instagrabber.utils.retryContextString
 import awais.instagrabber.webservices.RetrofitFactory.retrofit
 import org.json.JSONObject
 
-object MediaService : BaseService() {
+object MediaService {
     private val DELETABLE_ITEMS_TYPES = listOf(
         MediaItemType.MEDIA_TYPE_IMAGE,
         MediaItemType.MEDIA_TYPE_VIDEO,
diff --git a/app/src/main/java/awais/instagrabber/webservices/NewsService.java b/app/src/main/java/awais/instagrabber/webservices/NewsService.java
index eccdcf22..00331a67 100644
--- a/app/src/main/java/awais/instagrabber/webservices/NewsService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/NewsService.java
@@ -23,7 +23,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class NewsService extends BaseService {
+public class NewsService {
     private static final String TAG = "NewsService";
 
     private final NewsRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/ProfileService.java b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
index 1f83e1f9..1e491906 100644
--- a/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
@@ -24,7 +24,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class ProfileService extends BaseService {
+public class ProfileService {
     private static final String TAG = "ProfileService";
 
     private final ProfileRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/SearchService.java b/app/src/main/java/awais/instagrabber/webservices/SearchService.java
index 71649cdc..840a8032 100644
--- a/app/src/main/java/awais/instagrabber/webservices/SearchService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/SearchService.java
@@ -6,7 +6,7 @@ import awais.instagrabber.repositories.SearchRepository;
 import awais.instagrabber.repositories.responses.search.SearchResponse;
 import retrofit2.Call;
 
-public class SearchService extends BaseService {
+public class SearchService {
     private static final String TAG = "LocationService";
 
     private final SearchRepository repository;
diff --git a/app/src/main/java/awais/instagrabber/webservices/StoriesService.kt b/app/src/main/java/awais/instagrabber/webservices/StoriesService.kt
index b64adf42..9274a5e4 100644
--- a/app/src/main/java/awais/instagrabber/webservices/StoriesService.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/StoriesService.kt
@@ -19,7 +19,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.util.*
 
-object StoriesService : BaseService() {
+object StoriesService {
     private val repository: StoriesRepository = retrofit.create(StoriesRepository::class.java)
 
     suspend fun fetch(mediaId: Long): StoryModel {
diff --git a/app/src/main/java/awais/instagrabber/webservices/TagsService.java b/app/src/main/java/awais/instagrabber/webservices/TagsService.java
index 674c85c2..fa4f3dce 100644
--- a/app/src/main/java/awais/instagrabber/webservices/TagsService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/TagsService.java
@@ -22,7 +22,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class TagsService extends BaseService {
+public class TagsService {
 
     private static final String TAG = "TagsService";
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/UserRepository.kt b/app/src/main/java/awais/instagrabber/webservices/UserRepository.kt
index 64f993a1..860fd71a 100644
--- a/app/src/main/java/awais/instagrabber/webservices/UserRepository.kt
+++ b/app/src/main/java/awais/instagrabber/webservices/UserRepository.kt
@@ -7,7 +7,7 @@ import awais.instagrabber.repositories.responses.UserSearchResponse
 import awais.instagrabber.webservices.RetrofitFactory.retrofit
 import java.util.*
 
-object UserRepository : BaseService() {
+object UserRepository {
     private val service: UserService = retrofit.create(UserService::class.java)
 
     suspend fun getUserInfo(uid: Long): User {