From 60d9e64a57d977fcf2c3d7594ace11a04ae6f913 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 11 Sep 2020 23:10:27 +0900 Subject: [PATCH] Rename services package to webservices to avoid confusion with native Android services --- .../instagrabber/fragments/CommentsViewerFragment.java | 4 ++-- .../instagrabber/fragments/NotificationsViewerFragment.java | 6 +++--- .../java/awais/instagrabber/fragments/PostViewFragment.java | 4 ++-- .../awais/instagrabber/fragments/StoryViewerFragment.java | 4 ++-- .../awais/instagrabber/fragments/main/FeedFragment.java | 4 ++-- .../awais/instagrabber/fragments/main/ProfileFragment.java | 4 ++-- .../fragments/settings/MorePreferencesFragment.java | 4 ++-- .../{services => webservices}/AddCookiesInterceptor.java | 2 +- .../instagrabber/{services => webservices}/BaseService.java | 2 +- .../{services => webservices}/FriendshipService.java | 2 +- .../{services => webservices}/LoggingInterceptor.java | 2 +- .../{services => webservices}/MediaService.java | 2 +- .../instagrabber/{services => webservices}/NewsService.java | 2 +- .../{services => webservices}/ProfileService.java | 2 +- .../{services => webservices}/ServiceCallback.java | 2 +- .../{services => webservices}/StoriesService.java | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) rename app/src/main/java/awais/instagrabber/{services => webservices}/AddCookiesInterceptor.java (95%) rename app/src/main/java/awais/instagrabber/{services => webservices}/BaseService.java (98%) rename app/src/main/java/awais/instagrabber/{services => webservices}/FriendshipService.java (99%) rename app/src/main/java/awais/instagrabber/{services => webservices}/LoggingInterceptor.java (97%) rename app/src/main/java/awais/instagrabber/{services => webservices}/MediaService.java (99%) rename app/src/main/java/awais/instagrabber/{services => webservices}/NewsService.java (98%) rename app/src/main/java/awais/instagrabber/{services => webservices}/ProfileService.java (98%) rename app/src/main/java/awais/instagrabber/{services => webservices}/ServiceCallback.java (72%) rename app/src/main/java/awais/instagrabber/{services => webservices}/StoriesService.java (99%) diff --git a/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java index 5738236e..abcb90e3 100644 --- a/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java @@ -41,8 +41,8 @@ import awais.instagrabber.dialogs.ProfilePicDialogFragment; import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.CommentModel; import awais.instagrabber.models.ProfileModel; -import awais.instagrabber.services.MediaService; -import awais.instagrabber.services.ServiceCallback; +import awais.instagrabber.webservices.MediaService; +import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.TextUtils; diff --git a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java index 9db22df9..a3f820fd 100644 --- a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java @@ -31,9 +31,9 @@ import awais.instagrabber.fragments.settings.MorePreferencesFragmentDirections; import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.enums.NotificationType; import awais.instagrabber.repositories.responses.FriendshipRepoChangeRootResponse; -import awais.instagrabber.services.FriendshipService; -import awais.instagrabber.services.NewsService; -import awais.instagrabber.services.ServiceCallback; +import awais.instagrabber.webservices.FriendshipService; +import awais.instagrabber.webservices.NewsService; +import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.TextUtils; diff --git a/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java b/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java index 405bcfee..6a030374 100644 --- a/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java @@ -35,8 +35,8 @@ import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.ViewerPostModel; import awais.instagrabber.models.ViewerPostModelWrapper; import awais.instagrabber.models.enums.DownloadMethod; -import awais.instagrabber.services.MediaService; -import awais.instagrabber.services.ServiceCallback; +import awais.instagrabber.webservices.MediaService; +import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.DownloadUtils; diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java index d3d78cb0..68b3eaa1 100644 --- a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java @@ -78,8 +78,8 @@ import awais.instagrabber.models.enums.MediaItemType; import awais.instagrabber.models.stickers.PollModel; import awais.instagrabber.models.stickers.QuestionModel; import awais.instagrabber.models.stickers.QuizModel; -import awais.instagrabber.services.ServiceCallback; -import awais.instagrabber.services.StoriesService; +import awais.instagrabber.webservices.ServiceCallback; +import awais.instagrabber.webservices.StoriesService; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.DownloadUtils; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java index 300c84cc..c18bd36d 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java @@ -54,8 +54,8 @@ import awais.instagrabber.models.ProfileModel; import awais.instagrabber.models.ViewerPostModel; import awais.instagrabber.models.enums.DownloadMethod; import awais.instagrabber.models.enums.MediaItemType; -import awais.instagrabber.services.ServiceCallback; -import awais.instagrabber.services.StoriesService; +import awais.instagrabber.webservices.ServiceCallback; +import awais.instagrabber.webservices.StoriesService; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.DownloadUtils; import awais.instagrabber.utils.NumberUtils; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java index 2f4c14be..465343ed 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java @@ -73,8 +73,8 @@ import awais.instagrabber.models.enums.DownloadMethod; import awais.instagrabber.models.enums.PostItemType; import awais.instagrabber.repositories.responses.FriendshipRepoChangeRootResponse; import awais.instagrabber.repositories.responses.FriendshipRepoRestrictRootResponse; -import awais.instagrabber.services.FriendshipService; -import awais.instagrabber.services.ServiceCallback; +import awais.instagrabber.webservices.FriendshipService; +import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.DataBox; diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java index 36419e5b..0e76ff02 100644 --- a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java @@ -31,8 +31,8 @@ import awais.instagrabber.adapters.AccountSwitcherListAdapter; import awais.instagrabber.adapters.AccountSwitcherListAdapter.OnAccountClickListener; import awais.instagrabber.databinding.PrefAccountSwitcherBinding; import awais.instagrabber.repositories.responses.UserInfo; -import awais.instagrabber.services.ProfileService; -import awais.instagrabber.services.ServiceCallback; +import awais.instagrabber.webservices.ProfileService; +import awais.instagrabber.webservices.ServiceCallback; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.CookieUtils; import awais.instagrabber.utils.DataBox; diff --git a/app/src/main/java/awais/instagrabber/services/AddCookiesInterceptor.java b/app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java similarity index 95% rename from app/src/main/java/awais/instagrabber/services/AddCookiesInterceptor.java rename to app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java index 6b6d04bb..fa9a8a39 100644 --- a/app/src/main/java/awais/instagrabber/services/AddCookiesInterceptor.java +++ b/app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import androidx.annotation.NonNull; diff --git a/app/src/main/java/awais/instagrabber/services/BaseService.java b/app/src/main/java/awais/instagrabber/webservices/BaseService.java similarity index 98% rename from app/src/main/java/awais/instagrabber/services/BaseService.java rename to app/src/main/java/awais/instagrabber/webservices/BaseService.java index 1f78a22d..5cdeb7c6 100644 --- a/app/src/main/java/awais/instagrabber/services/BaseService.java +++ b/app/src/main/java/awais/instagrabber/webservices/BaseService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; diff --git a/app/src/main/java/awais/instagrabber/services/FriendshipService.java b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java similarity index 99% rename from app/src/main/java/awais/instagrabber/services/FriendshipService.java rename to app/src/main/java/awais/instagrabber/webservices/FriendshipService.java index f6ec3b3a..205b601f 100644 --- a/app/src/main/java/awais/instagrabber/services/FriendshipService.java +++ b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import androidx.annotation.NonNull; diff --git a/app/src/main/java/awais/instagrabber/services/LoggingInterceptor.java b/app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java similarity index 97% rename from app/src/main/java/awais/instagrabber/services/LoggingInterceptor.java rename to app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java index d4f9ca09..c9358a72 100644 --- a/app/src/main/java/awais/instagrabber/services/LoggingInterceptor.java +++ b/app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import android.util.Log; diff --git a/app/src/main/java/awais/instagrabber/services/MediaService.java b/app/src/main/java/awais/instagrabber/webservices/MediaService.java similarity index 99% rename from app/src/main/java/awais/instagrabber/services/MediaService.java rename to app/src/main/java/awais/instagrabber/webservices/MediaService.java index aad0f997..decbc85f 100644 --- a/app/src/main/java/awais/instagrabber/services/MediaService.java +++ b/app/src/main/java/awais/instagrabber/webservices/MediaService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/awais/instagrabber/services/NewsService.java b/app/src/main/java/awais/instagrabber/webservices/NewsService.java similarity index 98% rename from app/src/main/java/awais/instagrabber/services/NewsService.java rename to app/src/main/java/awais/instagrabber/webservices/NewsService.java index d8acc607..af56f058 100644 --- a/app/src/main/java/awais/instagrabber/services/NewsService.java +++ b/app/src/main/java/awais/instagrabber/webservices/NewsService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import androidx.annotation.NonNull; diff --git a/app/src/main/java/awais/instagrabber/services/ProfileService.java b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java similarity index 98% rename from app/src/main/java/awais/instagrabber/services/ProfileService.java rename to app/src/main/java/awais/instagrabber/webservices/ProfileService.java index 5352b6db..251442f1 100644 --- a/app/src/main/java/awais/instagrabber/services/ProfileService.java +++ b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import android.util.Log; diff --git a/app/src/main/java/awais/instagrabber/services/ServiceCallback.java b/app/src/main/java/awais/instagrabber/webservices/ServiceCallback.java similarity index 72% rename from app/src/main/java/awais/instagrabber/services/ServiceCallback.java rename to app/src/main/java/awais/instagrabber/webservices/ServiceCallback.java index f296bc1e..68a4bea4 100644 --- a/app/src/main/java/awais/instagrabber/services/ServiceCallback.java +++ b/app/src/main/java/awais/instagrabber/webservices/ServiceCallback.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; public interface ServiceCallback { void onSuccess(T result); diff --git a/app/src/main/java/awais/instagrabber/services/StoriesService.java b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java similarity index 99% rename from app/src/main/java/awais/instagrabber/services/StoriesService.java rename to app/src/main/java/awais/instagrabber/webservices/StoriesService.java index 0556af52..14e3fc7e 100644 --- a/app/src/main/java/awais/instagrabber/services/StoriesService.java +++ b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java @@ -1,4 +1,4 @@ -package awais.instagrabber.services; +package awais.instagrabber.webservices; import android.util.Log;