Skip to content

Commit 3308eaf

Browse files
graycreategraycreate
committed
remove flurry
1 parent 85d04c0 commit 3308eaf

19 files changed

+4
-78
lines changed

‎app/build.gradle

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
//apply plugin: "com.flurry.android.symbols"
32

43
android {
54
compileSdk 33
@@ -108,11 +107,6 @@ dependencies {
108107
implementation 'pub.devrel:easypermissions:1.0.1'
109108
implementation 'org.greenrobot:eventbus:3.1.1'
110109
implementation 'com.oasisfeng.condom:library:2.2.0'
111-
implementation 'com.flurry.android:analytics:14.3.0'
112110
implementation 'org.slf4j:slf4j-nop:1.7.25'
113111
implementation 'androidx.core:core-splashscreen:1.0.1'
114-
}
115-
116-
//flurryCrash {
117-
// configPath "flurry.config"
118-
//}
112+
}

‎app/src/main/AndroidManifest.xml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6-
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
76

87
<application
98
android:name=".general.App"

‎app/src/main/java/me/ghui/v2er/general/App.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package me.ghui.v2er.general;
22

33
import android.app.Application;
4-
import android.preference.PreferenceManager;
4+
55
import androidx.annotation.Nullable;
66

7-
import com.flurry.android.FlurryAgent;
87
import com.oasisfeng.condom.CondomContext;
98
import com.orhanobut.logger.AndroidLogAdapter;
109
import com.orhanobut.logger.FormatStrategy;
@@ -15,12 +14,10 @@
1514

1615
import io.reactivex.plugins.RxJavaPlugins;
1716
import me.ghui.v2er.BuildConfig;
18-
import me.ghui.v2er.R;
1917
import me.ghui.v2er.injector.component.AppComponent;
2018
import me.ghui.v2er.injector.component.DaggerAppComponent;
2119
import me.ghui.v2er.injector.module.AppModule;
2220
import me.ghui.v2er.network.APIService;
23-
import me.ghui.v2er.util.Flurry;
2421
import me.ghui.v2er.util.L;
2522
import me.ghui.v2er.util.UserUtils;
2623

@@ -57,7 +54,6 @@ private void rxjava() {
5754
RxJavaPlugins.setErrorHandler(e -> {
5855
L.e("globalHandler: " + e.getMessage());
5956
// V2er.capture("globalHandler: " + e.getMessage());
60-
Flurry.capture("globalHandler: " + e.getMessage());
6157
});
6258
}
6359

@@ -77,18 +73,9 @@ public boolean isLoggable(int priority, @Nullable String tag) {
7773
}
7874

7975
private void initThirdPartySDK() {
80-
initFlurry();
8176
initWechat();
8277
}
8378

84-
private void initFlurry() {
85-
new FlurryAgent.Builder()
86-
.withLogEnabled(BuildConfig.DEBUG)
87-
.withCaptureUncaughtExceptions(true)
88-
.build(this, "4PZMS4HSZP3YNMBP8W4R");
89-
FlurryAgent.setUserId(UserUtils.getUserName());
90-
}
91-
9279
private void initWechat() {
9380
mWechat = WXAPIFactory.createWXAPI(CondomContext.wrap(this, "wechat"), null);
9481
mWechat.registerApp("wxdb7f82c706f4516c");

‎app/src/main/java/me/ghui/v2er/module/base/BaseActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import butterknife.ButterKnife;
4040
import io.reactivex.ObservableTransformer;
4141
import me.ghui.v2er.util.Check;
42-
import me.ghui.v2er.util.Flurry;
4342
import me.ghui.v2er.util.Theme;
4443
import me.ghui.v2er.R;
4544
import me.ghui.v2er.bus.Bus;

‎app/src/main/java/me/ghui/v2er/module/home/NewsFragment.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import me.ghui.v2er.module.topic.TopicActivity;
1919
import me.ghui.v2er.network.bean.NewsInfo;
2020
import me.ghui.v2er.network.bean.TopicBasicInfo;
21-
import me.ghui.v2er.util.Flurry;
2221
import me.ghui.v2er.util.L;
2322
import me.ghui.v2er.util.UserUtils;
2423
import me.ghui.v2er.widget.LoadMoreRecyclerView;
@@ -163,7 +162,6 @@ public TabInfo getCurrentTab() {
163162
@Override
164163
public void onItemClick(View view, ViewHolder holder, int position) {
165164
if (position < 0) {
166-
Flurry.capture("NewsFragment.onItemClick.postion < 0");
167165
return;
168166
}
169167
View shareView = holder.getView(R.id.avatar_img);

‎app/src/main/java/me/ghui/v2er/module/home/SearchFragment.java

-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.widget.EditText;
1212
import android.widget.ImageView;
1313

14-
import com.flurry.android.FlurryAgent;
1514

1615
import javax.inject.Inject;
1716

@@ -20,7 +19,6 @@
2019
import me.ghui.v2er.module.topic.TopicActivity;
2120
import me.ghui.v2er.network.bean.SoV2EXSearchResultInfo;
2221
import me.ghui.v2er.util.Check;
23-
import me.ghui.v2er.util.Flurry;
2422
import me.ghui.v2er.util.Theme;
2523
import me.ghui.v2er.R;
2624
import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
@@ -165,8 +163,6 @@ public void onAnimationStart(Animator animation) {
165163
});
166164
if (mSearchRootView.isAttachedToWindow()) {
167165
mSearchRootView.animate().alpha(1f).start();
168-
} else {
169-
Flurry.capture("mSearchRootView is Detached");
170166
}
171167
} else {
172168
animator = ViewAnimationUtils.createCircularReveal(mCardView,
@@ -188,7 +184,6 @@ public void onAnimationEnd(Animator animation) {
188184
getActivity().getSupportFragmentManager().popBackStack();
189185
} catch (Exception e) {
190186
e.printStackTrace();
191-
FlurryAgent.logEvent("mCardView is null");
192187
}
193188
}
194189
});

‎app/src/main/java/me/ghui/v2er/module/login/LoginPresenter.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.ghui.v2er.module.login;
22

33

4-
import com.flurry.android.FlurryAgent;
54

65
import me.ghui.v2er.util.Check;
76
import me.ghui.v2er.R;
@@ -72,7 +71,6 @@ public void onConsume(BaseInfo info) {
7271
DailyInfo resultInfo = (DailyInfo) info;
7372
UserUtils.saveLogin(UserInfo.build(resultInfo.getUserName(), resultInfo.getAvatar()));
7473
mView.onLoginSuccess();
75-
FlurryAgent.setUserId(resultInfo.getUserName());
7674
} else if (info instanceof LoginParam) {
7775
//login failure
7876
LoginParam loginParam = (LoginParam) info;

‎app/src/main/java/me/ghui/v2er/module/login/SignInWithGoogleActivity.java

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.Intent;
55
import android.webkit.WebSettings;
66

7-
import com.flurry.android.FlurryAgent;
87

98
import java.util.HashMap;
109
import java.util.Map;
@@ -81,7 +80,6 @@ public void onConsume(DailyInfo checkInInfo) {
8180
Navigator.from(SignInWithGoogleActivity.this)
8281
.setFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP)
8382
.to(MainActivity.class).start();
84-
FlurryAgent.setUserId(checkInInfo.getUserName());
8583
finish();
8684
}
8785
});

‎app/src/main/java/me/ghui/v2er/module/login/TwoStepLoginActivity.java

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.text.TextWatcher;
99
import android.widget.Button;
1010

11-
import com.flurry.android.FlurryAgent;
1211

1312
import org.jsoup.helper.StringUtil;
1413

@@ -182,7 +181,6 @@ public void onConsume(NewsInfo resultInfo) {
182181
public void onConsume(LoginResultInfo resultInfo) {
183182
toast("登录成功");
184183
UserUtils.saveLogin(UserInfo.build(resultInfo.getUserName(), resultInfo.getAvatar()));
185-
FlurryAgent.setUserId(resultInfo.getUserName());
186184
finish();
187185
Navigator.from(TwoStepLoginActivity.this)
188186
.setFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP)

‎app/src/main/java/me/ghui/v2er/module/node/NodeTopicActivity.java

-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import butterknife.BindView;
2828
import butterknife.OnClick;
2929
import jp.wasabeef.glide.transformations.BlurTransformation;
30-
import me.ghui.v2er.util.Flurry;
3130
import me.ghui.v2er.util.Theme;
3231
import me.ghui.v2er.R;
3332
import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
@@ -435,9 +434,6 @@ private void toggleStar(boolean isStared) {
435434
public void onItemClick(View view, ViewHolder holder, int position) {
436435
NodeTopicInfo.Item item = mAdapter.getItem(position);
437436
if (item == null) {
438-
Flurry.capture("NodeTopicInfo.Item is null: postion: " + position
439-
+ ", mAdapter.size: " + mAdapter.getItemCount()
440-
+ ", nodeName: " + mTagName);
441437
return;
442438
}
443439
TopicBasicInfo basicInfo = new TopicBasicInfo.Builder(item.getTitle(), item.getAvatar())

‎app/src/main/java/me/ghui/v2er/module/topic/TopicActivity.java

-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import butterknife.BindView;
3636
import butterknife.OnClick;
3737
import me.ghui.v2er.util.Check;
38-
import me.ghui.v2er.util.Flurry;
3938
import me.ghui.v2er.util.Theme;
4039
import me.ghui.v2er.R;
4140
import me.ghui.v2er.general.ActivityReloader;
@@ -799,7 +798,6 @@ private void updateReportMenuItem(boolean hasReportPermission, boolean hasReport
799798
@Override
800799
public void afterStarTopic(TopicInfo topicInfo) {
801800
if (mTopicInfo == null) {
802-
Flurry.capture("afterStarTopic.mTopicID: " + mTopicId);
803801
toast("收藏遇到问题");
804802
return;
805803
}

‎app/src/main/java/me/ghui/v2er/module/topic/TopicPresenter.java

-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import me.ghui.v2er.network.bean.NewsInfo;
1111
import me.ghui.v2er.network.bean.ThxResponseInfo;
1212
import me.ghui.v2er.network.bean.TopicInfo;
13-
import me.ghui.v2er.util.Flurry;
1413
import me.ghui.v2er.util.RefererUtils;
1514
import me.ghui.v2er.util.UserUtils;
1615

@@ -89,9 +88,6 @@ public void starTopic(String topicId, String once) {
8988
.subscribe(new GeneralConsumer<TopicInfo>(mView) {
9089
@Override
9190
public void onConsume(TopicInfo topicInfo) {
92-
if (topicInfo == null) {
93-
Flurry.capture("afterStarTopic.mTopicID: " + topicId + ", once: " + once);
94-
}
9591
mView.afterStarTopic(topicInfo);
9692
}
9793
});

‎app/src/main/java/me/ghui/v2er/module/user/UserHomeActivity.java

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import me.ghui.v2er.module.base.BaseActivity;
4343
import me.ghui.v2er.module.topic.TopicActivity;
4444
import me.ghui.v2er.network.bean.UserPageInfo;
45-
import me.ghui.v2er.util.Flurry;
4645
import me.ghui.v2er.util.L;
4746
import me.ghui.v2er.util.UserUtils;
4847
import me.ghui.v2er.util.Utils;
@@ -149,7 +148,6 @@ protected void parseExtras(Intent intent) {
149148
mUserName = intent.getStringExtra(USER_NAME_KEY);
150149
if (Check.isEmpty(mUserName)) {
151150
Voast.show("要加载的页面用户名为空");
152-
Flurry.capture(new Throwable("TEST"));
153151
finish();
154152
return;
155153
}

‎app/src/main/java/me/ghui/v2er/network/GeneralConsumer.java

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import me.ghui.v2er.network.bean.LoginParam;
1010
import me.ghui.v2er.network.bean.NewsInfo;
1111
import me.ghui.v2er.network.bean.TwoStepLoginInfo;
12-
import me.ghui.v2er.util.Flurry;
1312
import me.ghui.v2er.util.L;
1413
import me.ghui.v2er.util.RxUtils;
1514
import me.ghui.v2er.util.UserUtils;
@@ -41,7 +40,6 @@ public void onNext(T t) {
4140
if (t == null) {
4241
L.e("API RESPONSE: NULL");
4342
onError(new Throwable("Unknown Error"));
44-
Flurry.capture("GeneralConsumer: t is null");
4543
return;
4644
}
4745
L.v("API RESPONSE: \n" + t.toString() + "\n");
@@ -125,7 +123,6 @@ public void onError(Throwable e) {
125123
String msg = "Unknown Error";
126124
if (!Utils.isNetworkAvailable()) msg = "Network Connection Error";
127125
generalError = new GeneralError(ResultCode.NETWORK_ERROR, msg);
128-
Flurry.capture("generalConsumer.onError: " + e);
129126
if (BuildConfig.DEBUG) {
130127
throw new RuntimeException(e);
131128
}

‎app/src/main/java/me/ghui/v2er/network/UrlInterceptor.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import me.ghui.v2er.module.node.NodeTopicActivity;
1616
import me.ghui.v2er.module.topic.TopicActivity;
1717
import me.ghui.v2er.module.user.UserHomeActivity;
18-
import me.ghui.v2er.util.Flurry;
1918
import me.ghui.v2er.util.L;
2019
import me.ghui.v2er.util.UriUtils;
2120
import me.ghui.v2er.util.UserUtils;
@@ -84,7 +83,6 @@ public static boolean intercept(String url, Context context, boolean onlyCheck,
8483
try {
8584
customTabsIntent.launchUrl(context, Uri.parse(url));
8685
} catch (ActivityNotFoundException e) {
87-
Flurry.capture(e);
8886
WapActivity.open(url, context, true);
8987
}
9088
return true;

‎app/src/main/java/me/ghui/v2er/util/Flurry.java

-20
This file was deleted.

‎build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ buildscript {
99
}
1010
dependencies {
1111
classpath 'com.android.tools.build:gradle:8.1.0'
12-
// classpath "gradle.plugin.com.flurry:symbol-upload:+"
1312
}
1413
}
1514

‎config.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ext {
22
app = [
3-
versionCode: 210,
4-
versionName: "2.1.0"
3+
versionCode: 214,
4+
versionName: "2.1.4"
55
]
66
android = [
77
supportVersion: '26.1.0'

‎flurry.config

-2
This file was deleted.

0 commit comments

Comments
 (0)