From 90daf3069cc3876fe13a43c5d486da1ada7a2409 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sun, 2 Aug 2020 10:41:59 -0400 Subject: [PATCH] foundation for signing capabilities --- .../java/awais/instagrabber/InstaApp.java | 3 -- .../java/awais/instagrabber/MainHelper.java | 4 +- .../asyncs/StoryStatusFetcher.java | 1 - .../awais/instagrabber/utils/Constants.java | 12 +++++- .../java/awais/instagrabber/utils/Utils.java | 39 ++++++++++++------- 5 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/InstaApp.java b/app/src/main/java/awais/instagrabber/InstaApp.java index 9d9f67fe..64f12df6 100755 --- a/app/src/main/java/awais/instagrabber/InstaApp.java +++ b/app/src/main/java/awais/instagrabber/InstaApp.java @@ -22,8 +22,6 @@ import static awais.instagrabber.utils.Utils.clipboardManager; import static awais.instagrabber.utils.Utils.dataBox; import static awais.instagrabber.utils.Utils.datetimeParser; import static awais.instagrabber.utils.Utils.getInstalledTelegramPackage; -import static awais.instagrabber.utils.Utils.isInstaInstalled; -import static awais.instagrabber.utils.Utils.isInstagramInstalled; import static awais.instagrabber.utils.Utils.logCollector; import static awais.instagrabber.utils.Utils.notificationManager; import static awais.instagrabber.utils.Utils.settingsHelper; @@ -41,7 +39,6 @@ public final class InstaApp extends MultiDexApplication { final Context appContext = getApplicationContext(); - isInstagramInstalled = isInstaInstalled(appContext); telegramPackage = getInstalledTelegramPackage(appContext); if (dataBox == null) diff --git a/app/src/main/java/awais/instagrabber/MainHelper.java b/app/src/main/java/awais/instagrabber/MainHelper.java index 501852c6..914c4132 100755 --- a/app/src/main/java/awais/instagrabber/MainHelper.java +++ b/app/src/main/java/awais/instagrabber/MainHelper.java @@ -1205,11 +1205,11 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener { if (!isLoggedIn && Utils.dataBox.getFavorite(main.userQuery) != null && v == main.mainBinding.btnFollow) { Utils.dataBox.delFavorite(new DataBox.FavoriteModel(main.userQuery, Long.parseLong(Utils.dataBox.getFavorite(main.userQuery).split("/")[1]), - main.locationModel != null ? main.locationModel.getName() : main.userQuery)); + main.locationModel != null ? main.locationModel.getName() : main.userQuery.replaceAll("^@", ""))); onRefresh(); } else if (!isLoggedIn && v == main.mainBinding.btnFollow) { Utils.dataBox.addFavorite(new DataBox.FavoriteModel(main.userQuery, System.currentTimeMillis(), - main.locationModel != null ? main.locationModel.getName() : main.userQuery)); + main.locationModel != null ? main.locationModel.getName() : main.userQuery.replaceAll("^@", ""))); onRefresh(); } else if (v == main.mainBinding.btnFollow) { new ProfileAction().execute("follow"); diff --git a/app/src/main/java/awais/instagrabber/asyncs/StoryStatusFetcher.java b/app/src/main/java/awais/instagrabber/asyncs/StoryStatusFetcher.java index 2929c67a..b9e6cb52 100755 --- a/app/src/main/java/awais/instagrabber/asyncs/StoryStatusFetcher.java +++ b/app/src/main/java/awais/instagrabber/asyncs/StoryStatusFetcher.java @@ -83,7 +83,6 @@ public final class StoryStatusFetcher extends AsyncTask