Skip to content

Commit

Permalink
EP-513-4: Remove Datalake Events And Worker (#1236)
Browse files Browse the repository at this point in the history
* removed lake event class

* removed koala events

* fixed failing test cases

* fixed failing test cases

* Replace lake tracker with segment

* fix  segment

* Remove koalaEvent

* Remove CommentDialog ,ExternalLink,Update enums

* fixed failing test cases

* Remove Koala context

* Revert "Remove CommentDialog ,ExternalLink,Update enums"

This reverts commit 77e2fa2.

# Conflicts:
#	app/src/main/java/com/kickstarter/libs/KoalaContext.kt

* Remove Koala context enums

* refactored viewmodels

* refactored koalacontext class

* removed laketests

* Remove Dagger lake decencies

* Refactor rename kolacontext and use only MessagePreviousScreenType enum

* Clean code from commented unused lines

* Rename lake to analyticEvents events in base viewmodel

* refactor lake to analyticEvents in FragmentViewModel

* removed lake events

* removed lake events

* removed lake events

* removed lake events

* removed lake events

* removed lake events

* refactored segment test

* refactored segment test

* fixed failing test cases

* fixed failing test cases

* fixed failing test cases

* removed unused methods

* removed optimizely experiments

* removed unsused imports

* removed unsused imports

* Create unit test for messageThreadIntent

* Create unit test for messageThreadIntent

* fix ktlint format

* removed unsused imports

* removed unsused imports

* fix the test

* fix format

* fix style

* update the test

Co-authored-by: hadia <hadiamohamed.iti@gmail.com>
  • Loading branch information
sunday-okpoluaefe and hadia authored May 7, 2021
1 parent 0f5733c commit 03acaf0
Show file tree
Hide file tree
Showing 74 changed files with 387 additions and 2,422 deletions.
2 changes: 0 additions & 2 deletions app/src/main/java/com/kickstarter/ApplicationGraph.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.kickstarter.libs.Environment;
import com.kickstarter.libs.utils.ApplicationLifecycleUtil;
import com.kickstarter.services.LakeWorker;
import com.kickstarter.services.firebase.MessageService;
import com.kickstarter.services.firebase.RegisterTokenWorker;
import com.kickstarter.services.firebase.ResetDeviceIdWorker;
Expand All @@ -18,7 +17,6 @@ public interface ApplicationGraph {
void inject(IconTextView __);
void inject(KSWebView __);
void inject(KSApplication __);
void inject(LakeWorker __);
void inject(MessageService __);
void inject(RegisterTokenWorker __);
void inject(ResetDeviceIdWorker __);
Expand Down
38 changes: 2 additions & 36 deletions app/src/main/java/com/kickstarter/ApplicationModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.kickstarter.libs.KSCurrency;
import com.kickstarter.libs.KSString;
import com.kickstarter.libs.AnalyticEvents;
import com.kickstarter.libs.LakeTrackingClient;
import com.kickstarter.libs.Logout;
import com.kickstarter.libs.OptimizelyExperimentsClient;
import com.kickstarter.libs.PushNotifications;
Expand Down Expand Up @@ -63,9 +62,6 @@
import com.kickstarter.libs.qualifiers.ConfigPreference;
import com.kickstarter.libs.qualifiers.FirstSessionPreference;
import com.kickstarter.libs.qualifiers.GamesNewsletterPreference;
import com.kickstarter.libs.qualifiers.LakeEndpoint;
import com.kickstarter.libs.qualifiers.LakeRetrofit;
import com.kickstarter.libs.qualifiers.LakeTracker;
import com.kickstarter.libs.qualifiers.PackageNameString;
import com.kickstarter.libs.qualifiers.UserPreference;
import com.kickstarter.libs.qualifiers.WebEndpoint;
Expand All @@ -76,7 +72,6 @@
import com.kickstarter.services.ApiService;
import com.kickstarter.services.ApolloClientType;
import com.kickstarter.services.KSWebViewClient;
import com.kickstarter.services.LakeService;
import com.kickstarter.services.WebClient;
import com.kickstarter.services.WebClientType;
import com.kickstarter.services.WebService;
Expand Down Expand Up @@ -137,7 +132,7 @@ static Environment provideEnvironment(final @NonNull @ActivitySamplePreference I
final @NonNull InternalToolsType internalToolsType,
final @NonNull KSCurrency ksCurrency,
final @NonNull KSString ksString,
final @NonNull @LakeTracker AnalyticEvents analytics,
final @NonNull AnalyticEvents analytics,
final @NonNull Logout logout,
final @NonNull ExperimentsClientType optimizely,
final @NonNull PlayServicesCapability playServicesCapability,
Expand Down Expand Up @@ -253,16 +248,6 @@ static Retrofit provideApiRetrofit(final @NonNull ApiEndpoint apiEndpoint,
return createRetrofit(apiEndpoint.url(), gson, okHttpClient);
}

@Provides
@Singleton
@LakeRetrofit
@NonNull
static Retrofit provideLakeRetrofit(@NonNull @LakeEndpoint final String lakeEndpoint,
final @NonNull Gson gson,
final @NonNull OkHttpClient okHttpClient) {
return createRetrofit(lakeEndpoint, gson, okHttpClient);
}

@Provides
@Singleton
@NonNull
Expand All @@ -288,13 +273,6 @@ static ApiService provideApiService(final @ApiRetrofit @NonNull Retrofit retrofi
return retrofit.create(ApiService.class);
}

@Provides
@Singleton
@NonNull
static LakeService provideLakeService(final @LakeRetrofit @NonNull Retrofit retrofit) {
return retrofit.create(LakeService.class);
}

@Provides
@Singleton
static String provideClientId(final @NonNull ApiEndpoint apiEndpoint) {
Expand Down Expand Up @@ -432,7 +410,6 @@ SegmentTrackingClient provideSegmentTrackingClient(
}

@Provides
@LakeTracker
@Singleton
static AnalyticEvents provideAnalytics(
final @ApplicationContext @NonNull Context context,
Expand All @@ -441,8 +418,7 @@ static AnalyticEvents provideAnalytics(
final @NonNull CurrentConfigType currentConfig,
final @NonNull ExperimentsClientType experimentsClientType,
final @NonNull SegmentTrackingClient segmentClient) {
final LakeTrackingClient lakeTrackingClient = new LakeTrackingClient(context, currentUser, build, currentConfig, experimentsClientType);
final List<TrackingClientType> clients = Arrays.asList(lakeTrackingClient, segmentClient);
final List<TrackingClientType> clients = Arrays.asList(segmentClient);
return new AnalyticEvents(clients);
}

Expand Down Expand Up @@ -527,16 +503,6 @@ static String provideWebEndpoint(final @NonNull ApiEndpoint apiEndpoint) {
apiEndpoint.url().replaceAll("(?<=\\Ahttps?:\\/\\/)api.", "");
}

@Provides
@Singleton
@LakeEndpoint
@NonNull
static String provideLakeEndpoint(final @NonNull ApiEndpoint apiEndpoint) {
return (apiEndpoint == ApiEndpoint.PRODUCTION) ?
Secrets.LakeEndpoint.PRODUCTION :
Secrets.LakeEndpoint.STAGING;
}

@Provides
@Singleton
static Font provideFont(final @NonNull AssetManager assetManager) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/kickstarter/libs/ActivityViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ public class ActivityViewModel<ViewType extends ActivityLifecycleType> {
private final PublishSubject<ActivityResult> activityResult = PublishSubject.create();

private final PublishSubject<Intent> intent = PublishSubject.create();
protected final AnalyticEvents lake;
protected final AnalyticEvents analyticEvents;

public ActivityViewModel(final @NonNull Environment environment) {
this.lake = environment.analytics();
this.analyticEvents = environment.analytics();
}

/**
Expand Down
Loading

0 comments on commit 03acaf0

Please sign in to comment.