diff --git a/app/src/main/java/com/hippo/ehviewer/Analytics.java b/app/src/main/java/com/hippo/ehviewer/Analytics.java index b25814974..e4d275b33 100644 --- a/app/src/main/java/com/hippo/ehviewer/Analytics.java +++ b/app/src/main/java/com/hippo/ehviewer/Analytics.java @@ -20,24 +20,16 @@ import android.content.Context; import android.os.Bundle; import com.google.firebase.analytics.FirebaseAnalytics; import com.hippo.scene.SceneFragment; -import com.hippo.util.ExceptionUtils; -import com.hippo.util.IoThreadPoolExecutor; -import okhttp3.OkHttpClient; -import okhttp3.Request; public final class Analytics { private static FirebaseAnalytics analytics; - private static String userId; - private static OkHttpClient client; private Analytics() {} public static void start(Context context) { analytics = FirebaseAnalytics.getInstance(context); - userId = Settings.getUserID(); - analytics.setUserId(userId); - client = EhApplication.getOkHttpClient(context); + analytics.setUserId(Settings.getUserID()); } public static boolean isEnabled() { @@ -52,89 +44,4 @@ public final class Analytics { analytics.logEvent("scene_view", bundle); } } - - public static void signIn() { - addRecord("sign_in", null, null, null); - } - - public static void viewGalleryList() { - addRecord("view_gallery_list", null, null, null); - } - - public static void imageSearch() { - addRecord("image_search", null, null, null); - } - - public static void viewWhatsHot() { - addRecord("view_whats_hot", null, null, null); - } - - public static void viewHistory() { - addRecord("view_history", null, null, null); - } - - public static void viewFavourite() { - addRecord("view_favourite", null, null, null); - } - - public static void viewGallery(long gid, String token) { - addRecord("view_gallery", gid, token, null); - } - - public static void readGallery(long gid, String token) { - addRecord("read_gallery", gid, token, null); - } - - public static void downloadGallery(long gid, String token) { - addRecord("download_gallery", gid, token, null); - } - - public static void rateGallery(long gid, String token) { - addRecord("rate_gallery", gid, token, null); - } - - public static void commentGallery(long gid, String token) { - addRecord("comment_gallery", gid, token, null); - } - - public static void voteComment(long gid, String token) { - addRecord("vote_comment", gid, token, null); - } - - public static void addGalleryToFavourite(long gid, String token) { - addRecord("add_gallery_to_favourite", gid, token, null); - } - - public static void downloadArchive(long gid, String token) { - addRecord("download_archive", gid, token, null); - } - - private static void addRecord(String action, Long gid, String token, Integer page) { - if (isEnabled()) { - IoThreadPoolExecutor.getInstance().execute(() -> { - try { - StringBuilder sb = new StringBuilder(150) - .append("http://155.138.199.206:8080/addRecord?userId=") - .append(userId) - .append("&action=") - .append(action); - if (gid != null) { - sb.append("&gid=").append(gid); - } - if (token != null) { - sb.append("&token=").append(token); - } - if (page != null) { - sb.append("&page=").append(page); - } - String url = sb.toString(); - - Request request = new Request.Builder().url(url).build(); - client.newCall(request).execute().close(); - } catch (Throwable t) { - ExceptionUtils.throwIfFatal(t); - } - }); - } - } } diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java index c9b12aa73..d054ae2e6 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java @@ -22,7 +22,6 @@ import android.os.AsyncTask; import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.client.data.GalleryInfo; import com.hippo.ehviewer.dao.DownloadInfo; @@ -448,8 +447,6 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener { for (DownloadInfoListener l: mDownloadInfoListeners) { l.onAdd(info, list, list.size() - 1); } - - Analytics.downloadGallery(galleryInfo.gid, galleryInfo.token); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java index 005f92a06..8ae36e915 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java @@ -25,7 +25,6 @@ import android.os.AsyncTask; import android.util.Log; import androidx.appcompat.app.AlertDialog; import com.hippo.app.ListCheckBoxDialogBuilder; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.R; @@ -195,7 +194,6 @@ public final class CommonOperations { if (slot == -1) { EhDB.putLocalFavorites(galleryInfo); listener.onSuccess(null); - Analytics.addGalleryToFavourite(galleryInfo.gid, galleryInfo.token); } else if (slot >= 0 && slot <= 9) { EhClient client = EhApplication.getEhClient(activity); EhRequest request = new EhRequest(); @@ -203,7 +201,6 @@ public final class CommonOperations { request.setArgs(galleryInfo.gid, galleryInfo.token, slot, ""); request.setCallback(listener); client.execute(request); - Analytics.addGalleryToFavourite(galleryInfo.gid, galleryInfo.token); } else { listener.onFailure(new Exception()); // TODO Add text } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index dab34ba90..671c9b945 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -49,7 +49,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SwitchCompat; import com.hippo.android.resource.AttrResources; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.AppConfig; import com.hippo.ehviewer.BuildConfig; import com.hippo.ehviewer.R; @@ -207,7 +206,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } else if (ACTION_EH.equals(mAction)) { if (mGalleryInfo != null) { mGalleryProvider = new EhGalleryProvider(this, mGalleryInfo); - Analytics.readGallery(mGalleryInfo.gid, mGalleryInfo.token); } } else if (Intent.ACTION_VIEW.equals(mAction)) { if (mUri != null) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index a6880c63a..8ca266b91 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -55,7 +55,6 @@ import com.hippo.annotation.Implemented; import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.R; @@ -303,8 +302,6 @@ public class FavoritesScene extends BaseScene implements guideCollections(); - Analytics.viewFavourite(); - return view; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index e4cbe9074..c892d12ff 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -57,7 +57,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.LinearDividerItemDecoration; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.UrlOpener; @@ -284,8 +283,6 @@ public final class GalleryCommentsScene extends ToolbarScene .setCallback(new VoteCommentListener(context, activity.getStageId(), getTag())); EhApplication.getEhClient(context).execute(request); - - Analytics.voteComment(mGid, mToken); } private class InfoHolder extends RecyclerView.ViewHolder { @@ -594,8 +591,6 @@ public final class GalleryCommentsScene extends ToolbarScene EhApplication.getEhClient(context).execute(request); hideSoftInput(); hideEditPanel(true); - - Analytics.commentGallery(mGid, mToken); } } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 616d204d9..7ca7023d6 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -58,7 +58,6 @@ import com.hippo.android.resource.AttrResources; import com.hippo.beerbelly.BeerBelly; import com.hippo.drawable.RoundSideRectDrawable; import com.hippo.drawerlayout.DrawerLayout; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.AppConfig; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; @@ -677,14 +676,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene .setCallback(callback); EhApplication.getEhClient(context).execute(request); - if (mGalleryDetail != null) { - Analytics.viewGallery(mGalleryDetail.gid, mGalleryDetail.token); - } else if (mGalleryInfo != null) { - Analytics.viewGallery(mGalleryInfo.gid, mGalleryInfo.token); - } else { - Analytics.viewGallery(mGid, mToken); - } - return true; } @@ -1760,7 +1751,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene request.setArgs(mGalleryDetail.gid, mGalleryDetail.token, mArchiveFormParamOr, res); request.setCallback(new DownloadArchiveListener(context, activity.getStageId(), getTag())); EhApplication.getEhClient(context).execute(request); - Analytics.downloadArchive(mGalleryDetail.gid, mGalleryDetail.token); } if (mDialog != null) { @@ -2014,8 +2004,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene .setCallback(new RateGalleryListener(context, activity.getStageId(), getTag(), mGalleryDetail.gid)); EhApplication.getEhClient(context).execute(request); - - Analytics.rateGallery(mGalleryDetail.gid, mGalleryDetail.token); } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 80886c7e5..3d2cf683b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -61,7 +61,6 @@ import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.drawerlayout.DrawerLayout; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.FavouriteStatusRouter; @@ -1494,7 +1493,6 @@ public final class GalleryListScene extends BaseScene mUrlBuilder.isUseSimilarityScan(), mUrlBuilder.isOnlySearchCovers(), mUrlBuilder.isShowExpunged()); mClient.execute(request); - Analytics.imageSearch(); } else { String url = mUrlBuilder.build(); EhRequest request = new EhRequest(); @@ -1503,12 +1501,6 @@ public final class GalleryListScene extends BaseScene activity.getStageId(), getTag(), taskId)); request.setArgs(url); mClient.execute(request); - - if (ListUrlBuilder.MODE_WHATS_HOT == mUrlBuilder.getMode()) { - Analytics.viewWhatsHot(); - } else { - Analytics.viewGalleryList(); - } } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index 0c9862ed1..a0dac5440 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java @@ -49,7 +49,6 @@ import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; import com.hippo.easyrecyclerview.HandlerDrawable; import com.hippo.easyrecyclerview.MarginItemDecoration; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; @@ -150,8 +149,6 @@ public class HistoryScene extends ToolbarScene updateLazyList(); updateView(false); - Analytics.viewHistory(); - return view; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java index cdec4b490..bacc573f1 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java @@ -29,7 +29,6 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import com.google.android.material.textfield.TextInputLayout; -import com.hippo.ehviewer.Analytics; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; @@ -296,7 +295,6 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc .setArgs(username, password, challenge, response) .setCallback(callback); EhApplication.getEhClient(context).execute(request); - Analytics.signIn(); mSigningIn = true; }