remove flurry

graycreate · graycreate · commit 3308eaf85906 · 2023-08-20T16:51:36.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-//apply plugin: "com.flurry.android.symbols"
 
 android {
     compileSdk 33
@@ -108,11 +107,6 @@ dependencies {
     implementation 'pub.devrel:easypermissions:1.0.1'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.oasisfeng.condom:library:2.2.0'
-    implementation 'com.flurry.android:analytics:14.3.0'
     implementation 'org.slf4j:slf4j-nop:1.7.25'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-}
-
-//flurryCrash {
-//    configPath "flurry.config"
-//}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <application
         android:name=".general.App"
diff --git a/app/src/main/java/me/ghui/v2er/general/App.java b/app/src/main/java/me/ghui/v2er/general/App.java
@@ -1,10 +1,9 @@
 package me.ghui.v2er.general;
 
 import android.app.Application;
-import android.preference.PreferenceManager;
+
 import androidx.annotation.Nullable;
 
-import com.flurry.android.FlurryAgent;
 import com.oasisfeng.condom.CondomContext;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.FormatStrategy;
@@ -15,12 +14,10 @@
 
 import io.reactivex.plugins.RxJavaPlugins;
 import me.ghui.v2er.BuildConfig;
-import me.ghui.v2er.R;
 import me.ghui.v2er.injector.component.AppComponent;
 import me.ghui.v2er.injector.component.DaggerAppComponent;
 import me.ghui.v2er.injector.module.AppModule;
 import me.ghui.v2er.network.APIService;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.L;
 import me.ghui.v2er.util.UserUtils;
 
@@ -57,7 +54,6 @@ private void rxjava() {
         RxJavaPlugins.setErrorHandler(e -> {
             L.e("globalHandler: " + e.getMessage());
 //            V2er.capture("globalHandler: " + e.getMessage());
-            Flurry.capture("globalHandler: " + e.getMessage());
         });
     }
 
@@ -77,18 +73,9 @@ public boolean isLoggable(int priority, @Nullable String tag) {
     }
 
     private void initThirdPartySDK() {
-        initFlurry();
         initWechat();
     }
 
-    private void initFlurry() {
-        new FlurryAgent.Builder()
-                .withLogEnabled(BuildConfig.DEBUG)
-                .withCaptureUncaughtExceptions(true)
-                .build(this, "4PZMS4HSZP3YNMBP8W4R");
-        FlurryAgent.setUserId(UserUtils.getUserName());
-    }
-
     private void initWechat() {
         mWechat = WXAPIFactory.createWXAPI(CondomContext.wrap(this, "wechat"), null);
         mWechat.registerApp("wxdb7f82c706f4516c");
diff --git a/app/src/main/java/me/ghui/v2er/module/base/BaseActivity.java b/app/src/main/java/me/ghui/v2er/module/base/BaseActivity.java
@@ -39,7 +39,6 @@
 import butterknife.ButterKnife;
 import io.reactivex.ObservableTransformer;
 import me.ghui.v2er.util.Check;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.Theme;
 import me.ghui.v2er.R;
 import me.ghui.v2er.bus.Bus;
diff --git a/app/src/main/java/me/ghui/v2er/module/home/NewsFragment.java b/app/src/main/java/me/ghui/v2er/module/home/NewsFragment.java
@@ -18,7 +18,6 @@
 import me.ghui.v2er.module.topic.TopicActivity;
 import me.ghui.v2er.network.bean.NewsInfo;
 import me.ghui.v2er.network.bean.TopicBasicInfo;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.L;
 import me.ghui.v2er.util.UserUtils;
 import me.ghui.v2er.widget.LoadMoreRecyclerView;
@@ -163,7 +162,6 @@ public TabInfo getCurrentTab() {
     @Override
     public void onItemClick(View view, ViewHolder holder, int position) {
         if (position < 0) {
-            Flurry.capture("NewsFragment.onItemClick.postion < 0");
             return;
         }
         View shareView = holder.getView(R.id.avatar_img);
diff --git a/app/src/main/java/me/ghui/v2er/module/home/SearchFragment.java b/app/src/main/java/me/ghui/v2er/module/home/SearchFragment.java
@@ -11,7 +11,6 @@
 import android.widget.EditText;
 import android.widget.ImageView;
 
-import com.flurry.android.FlurryAgent;
 
 import javax.inject.Inject;
 
@@ -20,7 +19,6 @@
 import me.ghui.v2er.module.topic.TopicActivity;
 import me.ghui.v2er.network.bean.SoV2EXSearchResultInfo;
 import me.ghui.v2er.util.Check;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.Theme;
 import me.ghui.v2er.R;
 import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
@@ -165,8 +163,6 @@ public void onAnimationStart(Animator animation) {
             });
             if (mSearchRootView.isAttachedToWindow()) {
                 mSearchRootView.animate().alpha(1f).start();
-            } else {
-                Flurry.capture("mSearchRootView is Detached");
             }
         } else {
             animator = ViewAnimationUtils.createCircularReveal(mCardView,
@@ -188,7 +184,6 @@ public void onAnimationEnd(Animator animation) {
                         getActivity().getSupportFragmentManager().popBackStack();
                     } catch (Exception e) {
                         e.printStackTrace();
-                        FlurryAgent.logEvent("mCardView is null");
                     }
                 }
             });
diff --git a/app/src/main/java/me/ghui/v2er/module/login/LoginPresenter.java b/app/src/main/java/me/ghui/v2er/module/login/LoginPresenter.java
@@ -1,7 +1,6 @@
 package me.ghui.v2er.module.login;
 
 
-import com.flurry.android.FlurryAgent;
 
 import me.ghui.v2er.util.Check;
 import me.ghui.v2er.R;
@@ -72,7 +71,6 @@ public void onConsume(BaseInfo info) {
                             DailyInfo resultInfo = (DailyInfo) info;
                             UserUtils.saveLogin(UserInfo.build(resultInfo.getUserName(), resultInfo.getAvatar()));
                             mView.onLoginSuccess();
-                            FlurryAgent.setUserId(resultInfo.getUserName());
                         } else if (info instanceof LoginParam) {
                             //login failure
                             LoginParam loginParam = (LoginParam) info;
diff --git a/app/src/main/java/me/ghui/v2er/module/login/SignInWithGoogleActivity.java b/app/src/main/java/me/ghui/v2er/module/login/SignInWithGoogleActivity.java
@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.webkit.WebSettings;
 
-import com.flurry.android.FlurryAgent;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -81,7 +80,6 @@ public void onConsume(DailyInfo checkInInfo) {
                         Navigator.from(SignInWithGoogleActivity.this)
                                 .setFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                                 .to(MainActivity.class).start();
-                        FlurryAgent.setUserId(checkInInfo.getUserName());
                         finish();
                     }
                 });
diff --git a/app/src/main/java/me/ghui/v2er/module/login/TwoStepLoginActivity.java b/app/src/main/java/me/ghui/v2er/module/login/TwoStepLoginActivity.java
@@ -8,7 +8,6 @@
 import android.text.TextWatcher;
 import android.widget.Button;
 
-import com.flurry.android.FlurryAgent;
 
 import org.jsoup.helper.StringUtil;
 
@@ -182,7 +181,6 @@ public void onConsume(NewsInfo resultInfo) {
                                     public void onConsume(LoginResultInfo resultInfo) {
                                         toast("登录成功");
                                         UserUtils.saveLogin(UserInfo.build(resultInfo.getUserName(), resultInfo.getAvatar()));
-                                        FlurryAgent.setUserId(resultInfo.getUserName());
                                         finish();
                                         Navigator.from(TwoStepLoginActivity.this)
                                                 .setFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP)
diff --git a/app/src/main/java/me/ghui/v2er/module/node/NodeTopicActivity.java b/app/src/main/java/me/ghui/v2er/module/node/NodeTopicActivity.java
@@ -27,7 +27,6 @@
 import butterknife.BindView;
 import butterknife.OnClick;
 import jp.wasabeef.glide.transformations.BlurTransformation;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.Theme;
 import me.ghui.v2er.R;
 import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
@@ -435,9 +434,6 @@ private void toggleStar(boolean isStared) {
     public void onItemClick(View view, ViewHolder holder, int position) {
         NodeTopicInfo.Item item = mAdapter.getItem(position);
         if (item == null) {
-            Flurry.capture("NodeTopicInfo.Item is null: postion: " + position
-                    + ", mAdapter.size: " + mAdapter.getItemCount()
-                    + ", nodeName: " + mTagName);
             return;
         }
         TopicBasicInfo basicInfo = new TopicBasicInfo.Builder(item.getTitle(), item.getAvatar())
diff --git a/app/src/main/java/me/ghui/v2er/module/topic/TopicActivity.java b/app/src/main/java/me/ghui/v2er/module/topic/TopicActivity.java
@@ -35,7 +35,6 @@
 import butterknife.BindView;
 import butterknife.OnClick;
 import me.ghui.v2er.util.Check;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.Theme;
 import me.ghui.v2er.R;
 import me.ghui.v2er.general.ActivityReloader;
@@ -799,7 +798,6 @@ private void updateReportMenuItem(boolean hasReportPermission, boolean hasReport
     @Override
     public void afterStarTopic(TopicInfo topicInfo) {
         if (mTopicInfo == null) {
-            Flurry.capture("afterStarTopic.mTopicID: " + mTopicId);
             toast("收藏遇到问题");
             return;
         }
diff --git a/app/src/main/java/me/ghui/v2er/module/topic/TopicPresenter.java b/app/src/main/java/me/ghui/v2er/module/topic/TopicPresenter.java
@@ -10,7 +10,6 @@
 import me.ghui.v2er.network.bean.NewsInfo;
 import me.ghui.v2er.network.bean.ThxResponseInfo;
 import me.ghui.v2er.network.bean.TopicInfo;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.RefererUtils;
 import me.ghui.v2er.util.UserUtils;
 
@@ -89,9 +88,6 @@ public void starTopic(String topicId, String once) {
                 .subscribe(new GeneralConsumer<TopicInfo>(mView) {
                     @Override
                     public void onConsume(TopicInfo topicInfo) {
-                        if (topicInfo == null) {
-                            Flurry.capture("afterStarTopic.mTopicID: " + topicId + ", once: " + once);
-                        }
                         mView.afterStarTopic(topicInfo);
                     }
                 });
diff --git a/app/src/main/java/me/ghui/v2er/module/user/UserHomeActivity.java b/app/src/main/java/me/ghui/v2er/module/user/UserHomeActivity.java
@@ -42,7 +42,6 @@
 import me.ghui.v2er.module.base.BaseActivity;
 import me.ghui.v2er.module.topic.TopicActivity;
 import me.ghui.v2er.network.bean.UserPageInfo;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.L;
 import me.ghui.v2er.util.UserUtils;
 import me.ghui.v2er.util.Utils;
@@ -149,7 +148,6 @@ protected void parseExtras(Intent intent) {
         mUserName = intent.getStringExtra(USER_NAME_KEY);
         if (Check.isEmpty(mUserName)) {
             Voast.show("要加载的页面用户名为空");
-            Flurry.capture(new Throwable("TEST"));
             finish();
             return;
         }
diff --git a/app/src/main/java/me/ghui/v2er/network/GeneralConsumer.java b/app/src/main/java/me/ghui/v2er/network/GeneralConsumer.java
@@ -9,7 +9,6 @@
 import me.ghui.v2er.network.bean.LoginParam;
 import me.ghui.v2er.network.bean.NewsInfo;
 import me.ghui.v2er.network.bean.TwoStepLoginInfo;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.L;
 import me.ghui.v2er.util.RxUtils;
 import me.ghui.v2er.util.UserUtils;
@@ -41,7 +40,6 @@ public void onNext(T t) {
         if (t == null) {
             L.e("API RESPONSE: NULL");
             onError(new Throwable("Unknown Error"));
-            Flurry.capture("GeneralConsumer: t is null");
             return;
         }
         L.v("API RESPONSE: \n" + t.toString() + "\n");
@@ -125,7 +123,6 @@ public void onError(Throwable e) {
                 String msg = "Unknown Error";
                 if (!Utils.isNetworkAvailable()) msg = "Network Connection Error";
                 generalError = new GeneralError(ResultCode.NETWORK_ERROR, msg);
-                Flurry.capture("generalConsumer.onError: " + e);
                 if (BuildConfig.DEBUG) {
                     throw new RuntimeException(e);
                 }
diff --git a/app/src/main/java/me/ghui/v2er/network/UrlInterceptor.java b/app/src/main/java/me/ghui/v2er/network/UrlInterceptor.java
@@ -15,7 +15,6 @@
 import me.ghui.v2er.module.node.NodeTopicActivity;
 import me.ghui.v2er.module.topic.TopicActivity;
 import me.ghui.v2er.module.user.UserHomeActivity;
-import me.ghui.v2er.util.Flurry;
 import me.ghui.v2er.util.L;
 import me.ghui.v2er.util.UriUtils;
 import me.ghui.v2er.util.UserUtils;
@@ -84,7 +83,6 @@ public static boolean intercept(String url, Context context, boolean onlyCheck,
             try {
                 customTabsIntent.launchUrl(context, Uri.parse(url));
             } catch (ActivityNotFoundException e) {
-                Flurry.capture(e);
                 WapActivity.open(url, context, true);
             }
             return true;
diff --git a/app/src/main/java/me/ghui/v2er/util/Flurry.java b/app/src/main/java/me/ghui/v2er/util/Flurry.java
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.0'
-//        classpath "gradle.plugin.com.flurry:symbol-upload:+"
     }
 }
 
diff --git a/config.gradle b/config.gradle
@@ -1,7 +1,7 @@
 ext {
     app = [
-            versionCode: 210,
-            versionName: "2.1.0"
+            versionCode: 214,
+            versionName: "2.1.4"
     ]
     android = [
             supportVersion: '26.1.0'
diff --git a/flurry.config b/flurry.config
