conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import net.rrm.ehour.domain.*;
=======
import com.google.common.collect.Lists;
import net.rrm.ehour.domain.Customer;
import net.rrm.ehour.domain.CustomerObjectMother;
import net.rrm.ehour.domain.Project;
>>>>>>>
import net.rrm.ehour.domain.*;
import com.google.common.collect.Lists;
import net.rrm.ehour.domain.Customer;
import net.rrm.ehour.domain.CustomerObjectMother;
import net.rrm.ehour.domain.Project;
<<<<<<<
private CustomerServiceImpl customerService;
private UserService userService;
=======
private CustomerServiceImpl customerService;
@Mock
>>>>>>>
private CustomerServiceImpl customerService;
@Mock
private UserService userService;
@Mock
<<<<<<<
userService = createMock(UserService.class);
customerDAO = createMock(CustomerDao.class);
=======
>>>>>>>
<<<<<<<
} catch (ParentChildConstraintException ignored) {
=======
} catch (ParentChildConstraintException e) {
>>>>>>>
} catch (ParentChildConstraintException e) {
<<<<<<<
public void testDeleteCustomer() throws ParentChildConstraintException {
Customer cust = CustomerObjectMother.createCustomer(1);
cust.getProjects().clear();
customerDAO.findById(1);
expectLastCall().andReturn(cust);
=======
public void should_delete_customer() throws ParentChildConstraintException {
int customerId = 2;
Customer customer2 = new Customer(customerId);
when(customerDAO.findById(customerId)).thenReturn(customer2);
>>>>>>>
public void should_delete_customer() throws ParentChildConstraintException {
int customerId = 2;
Customer customer2 = CustomerObjectMother.createCustomer(customerId);
customer2.getProjects().clear();
when(customerDAO.findById(customerId)).thenReturn(customer2);
<<<<<<<
@Test
public void testPersistCustomerContainingReviewers() throws ObjectNotUniqueException {
Customer cust = CustomerObjectMother.createCustomer(1);
List<User> reviewers = new ArrayList<User>();
reviewers.add(new User(1, "thies"));
reviewers.add(new User(2, "morgan"));
cust.setReviewers(reviewers);
expect(customerDAO.persist(cust)).andReturn(cust);
expect(userService.addRole(1, UserRole.CUSTOMERREVIEWER)).andReturn(new User(1, "thies"));
expect(userService.addRole(2, UserRole.CUSTOMERREVIEWER)).andReturn(new User(1, "thies"));
replay(customerDAO, userService);
customerService.persistCustomer(cust);
verify(customerDAO, userService);
}
@Test
public void testPersistCustomerContainingReporters() throws ObjectNotUniqueException
{
Customer cust = CustomerObjectMother.createCustomer(1);
List<User> reporters = new ArrayList<User>();
reporters.add(new User(1, "thies"));
reporters.add(new User(2, "morgan"));
cust.setReporters(reporters);
expect(customerDAO.persist(cust)).andReturn(cust);
expect(userService.addRole(1, UserRole.CUSTOMERREPORTER)).andReturn(new User(1, "thies"));
expect(userService.addRole(2, UserRole.CUSTOMERREPORTER)).andReturn(new User(1, "thies"));
replay(customerDAO, userService);
customerService.persistCustomer(cust);
verify(customerDAO, userService);
}
@Test
public void testPersistCustomerContainingBothReportersAndReviewers() throws ObjectNotUniqueException
{
Customer cust = CustomerObjectMother.createCustomer(1);
List<User> reporters = new ArrayList<User>();
reporters.add(new User(1, "thies"));
reporters.add(new User(2, "morgan"));
cust.setReporters(reporters);
List<User> reviewers = new ArrayList<User>();
reviewers.add(new User(3, "laurent"));
cust.setReviewers(reviewers);
expect(customerDAO.persist(cust)).andReturn(cust);
expect(userService.addRole(1, UserRole.CUSTOMERREPORTER)).andReturn(new User(1, "thies"));
expect(userService.addRole(2, UserRole.CUSTOMERREPORTER)).andReturn(new User(1, "thies"));
expect(userService.addRole(3, UserRole.CUSTOMERREVIEWER)).andReturn(new User(3, "laurent"));
replay(customerDAO, userService);
customerService.persistCustomer(cust);
verify(customerDAO, userService);
}
=======
>>>>>>>
@Test
public void testPersistCustomerContainingReviewers() throws ObjectNotUniqueException {
Customer cust = CustomerObjectMother.createCustomer(1);
List<User> reviewers = new ArrayList<User>();
reviewers.add(new User(1, "thies"));
reviewers.add(new User(2, "morgan"));
cust.setReviewers(reviewers);
when(customerDAO.persist(cust)).thenReturn(cust);
when(userService.addRole(1, UserRole.CUSTOMERREVIEWER)).thenReturn(new User(1, "thies"));
when(userService.addRole(2, UserRole.CUSTOMERREVIEWER)).thenReturn(new User(1, "thies"));
customerService.persistCustomer(cust);
}
@Test
public void testPersistCustomerContainingReporters() throws ObjectNotUniqueException
{
Customer cust = CustomerObjectMother.createCustomer(1);
List<User> reporters = new ArrayList<User>();
reporters.add(new User(1, "thies"));
reporters.add(new User(2, "morgan"));
cust.setReporters(reporters);
when(customerDAO.persist(cust)).thenReturn(cust);
when(userService.addRole(1, UserRole.CUSTOMERREPORTER)).thenReturn(new User(1, "thies"));
when(userService.addRole(2, UserRole.CUSTOMERREPORTER)).thenReturn(new User(1, "thies"));
customerService.persistCustomer(cust);
} |
<<<<<<<
new DownloadFactory(
((AptoideApplication) getContext().getApplicationContext()).getMarketName())),
AndroidSchedulers.mainThread(), Schedulers.io(), CrashReport.getInstance(),
new PermissionManager(), ((PermissionService) getContext()), accountManager,
appsNavigator));
=======
downloadFactory), AndroidSchedulers.mainThread(), Schedulers.computation(),
CrashReport.getInstance(), new PermissionManager(), ((PermissionService) getContext()),
accountManager, appsNavigator));
>>>>>>>
downloadFactory), AndroidSchedulers.mainThread(), Schedulers.io(),
CrashReport.getInstance(), new PermissionManager(), ((PermissionService) getContext()),
accountManager, appsNavigator)); |
<<<<<<<
socialRepository, marketName, appCoinsManager, promotionsManager, promotionId,
installedRepository, appcMigrationManager, localNotificationSyncManager);
=======
marketName, appCoinsManager, promotionsManager, promotionId, installedRepository,
appcMigrationManager);
>>>>>>>
marketName, appCoinsManager, promotionsManager, promotionId, installedRepository,
appcMigrationManager, localNotificationSyncManager); |
<<<<<<<
import cm.aptoide.pt.model.v7.ListReviews;
=======
>>>>>>> |
<<<<<<<
public void sendAppViewOpenedFromEvent(String packageName, String publisher, String badge,
double appc) {
if (isFirstLoad) {
appViewAnalytics.sendAppViewOpenedFromEvent(packageName, publisher, badge, appc);
isFirstLoad = false;
}
}
public void sendEditorsChoiceClickEvent(String packageName, String editorsBrickPosition) {
if (isFirstLoad) {
appViewAnalytics.sendEditorsChoiceClickEvent(packageName, editorsBrickPosition);
isFirstLoad = false;
}
}
=======
public Completable appBought(String path) {
return Completable.fromAction(() -> {
cachedApp.getPay()
.setPaid();
cachedApp.setPath(path);
});
}
>>>>>>>
public Completable appBought(String path) {
return Completable.fromAction(() -> {
cachedApp.getPay()
.setPaid();
cachedApp.setPath(path);
});
}
public void sendAppViewOpenedFromEvent(String packageName, String publisher, String badge,
double appc) {
if (isFirstLoad) {
appViewAnalytics.sendAppViewOpenedFromEvent(packageName, publisher, badge, appc);
isFirstLoad = false;
}
}
public void sendEditorsChoiceClickEvent(String packageName, String editorsBrickPosition) {
if (isFirstLoad) {
appViewAnalytics.sendEditorsChoiceClickEvent(packageName, editorsBrickPosition);
isFirstLoad = false;
}
} |
<<<<<<<
clickOnPost();
=======
clickOnEmptyStateAction();
>>>>>>>
clickOnPost();
clickOnEmptyStateAction();
<<<<<<<
.doOnNext(click -> timelineAnalytics.sendFabClicked())
.doOnNext(__2 -> fragmentNavigator.navigateTo(PostFragment.newInstanceFromTimeline(),true)))
=======
.doOnNext(__2 -> timelineNavigation.navigateToCreatePost()))
>>>>>>>
.doOnNext(click -> timelineAnalytics.sendFabClicked())
.doOnNext(__2 -> timelineNavigation.navigateToCreatePost())) |
<<<<<<<
LinksHandlerFactory linkFactory, CrashReport crashReport,
AptoideNavigationTracker aptoideNavigationTracker) {
=======
LinksHandlerFactory linkFactory, CrashReport crashReport, NotificationAnalytics analytics) {
>>>>>>>
LinksHandlerFactory linkFactory, CrashReport crashReport,
AptoideNavigationTracker aptoideNavigationTracker, NotificationAnalytics analytics) {
<<<<<<<
this.aptoideNavigationTracker = aptoideNavigationTracker;
=======
this.analytics = analytics;
>>>>>>>
this.aptoideNavigationTracker = aptoideNavigationTracker;
this.analytics = analytics;
<<<<<<<
.flatMap(__ -> view.notificationSelection())
.map(notification -> linkFactory.get(LinksHandlerFactory.NOTIFICATION_LINK,
notification.getUrl()))
.doOnNext(link -> link.launch())
.doOnNext(__ -> aptoideNavigationTracker.registerView("Notification"))
=======
.flatMap(__ -> view.notificationSelection()
.flatMap(notification -> Observable.just(
linkFactory.get(LinksHandlerFactory.NOTIFICATION_LINK, notification.getUrl()))
.doOnNext(link -> link.launch())
.doOnNext(link -> analytics.notificationShown(
notification.getNotificationCenterUrlTrack()))))
>>>>>>>
.flatMap(__ -> view.notificationSelection()
.flatMap(notification -> Observable.just(
linkFactory.get(LinksHandlerFactory.NOTIFICATION_LINK, notification.getUrl()))
.doOnNext(link -> link.launch())
.doOnNext(link -> analytics.notificationShown(
notification.getNotificationCenterUrlTrack()))
.doOnNext(__ -> aptoideNavigationTracker.registerView("Notification"))
)) |
<<<<<<<
=======
import cm.aptoide.pt.v8engine.social.data.SharePreviewFactory;
import cm.aptoide.pt.v8engine.social.data.SocialAction;
>>>>>>>
import cm.aptoide.pt.v8engine.social.data.SocialAction;
<<<<<<<
private ShareDialogFactory shareDialogFactory;
private PublishSubject<ShareEvent> sharePostPublishSubject;
=======
private PublishRelay<View> loginPrompt;
>>>>>>>
private ShareDialogFactory shareDialogFactory;
private PublishSubject<ShareEvent> sharePostPublishSubject;
private PublishRelay<View> loginPrompt; |
<<<<<<<
import cm.aptoide.pt.downloadmanager.DownloadServiceHelper;
=======
import android.content.Context;
import cm.aptoide.pt.model.v7.Type;
import cm.aptoide.pt.v8engine.InstallManager;
>>>>>>>
import android.content.Context;
import cm.aptoide.pt.v8engine.InstallManager;
<<<<<<<
@Override protected Configs getConfig() {
return new Configs(1, true);
}
=======
public void pauseAllDownloads(Context context) {
installManager.stopAllInstallations(context);
}
>>>>>>>
@Override protected Configs getConfig() {
return new Configs(1, true);
}
public void pauseAllDownloads(Context context) {
installManager.stopAllInstallations(context);
} |
<<<<<<<
import cm.aptoide.pt.database.accessors.Accessor;
=======
import cm.aptoide.pt.crashreports.CrashReports;
>>>>>>>
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.database.accessors.Accessor;
<<<<<<<
=======
import io.realm.Realm;
>>>>>>>
import io.realm.Realm; |
<<<<<<<
import cm.aptoide.pt.model.v7.BaseV7Response;
import cm.aptoide.pt.networkclient.WebService;
=======
>>>>>>>
import cm.aptoide.pt.preferences.toolbox.ToolboxManager; |
<<<<<<<
import com.richemont.windchill.WindChillService;
import com.richemont.windchill.WindChillUpdateService;
=======
import com.google.common.collect.Lists;
>>>>>>>
import com.google.common.collect.Lists;
import com.richemont.windchill.WindChillService;
<<<<<<<
userService = createMock(UserService.class);
mockContext.putBean("userService", userService);
=======
UpdateService updateService = mock(UpdateService.class);
mockContext.putBean(updateService);
mockContext.putBean("menuDefinition", Lists.newArrayList());
when(updateService.isLatestVersion()).thenReturn(Boolean.TRUE);
>>>>>>>
mockContext.putBean("menuDefinition", Lists.newArrayList());
userService = mock(UserService.class);
mockContext.putBean("userService", userService); |
<<<<<<<
private static final String TAG = BaseRequestWithStore.class.getName();
=======
public BaseRequestWithStore(B body, String baseHost) {
super(body, baseHost);
}
public BaseRequestWithStore(B body, Converter.Factory converterFactory,
String baseHost) {
super(body, converterFactory, baseHost);
}
public BaseRequestWithStore(B body, OkHttpClient httpClient, String baseHost) {
super(body, httpClient, baseHost);
}
>>>>>>>
private static final String TAG = BaseRequestWithStore.class.getName();
public BaseRequestWithStore(B body, String baseHost) {
super(body, baseHost);
}
public BaseRequestWithStore(B body, Converter.Factory converterFactory,
String baseHost) {
super(body, converterFactory, baseHost);
}
public BaseRequestWithStore(B body, OkHttpClient httpClient, String baseHost) {
super(body, httpClient, baseHost);
} |
<<<<<<<
import cm.aptoide.accountmanager.AptoideAccountManager;
=======
>>>>>>>
<<<<<<<
import cm.aptoide.pt.preferences.Application;
import cm.aptoide.pt.preferences.secure.SecurePreferencesImplementation;
=======
import cm.aptoide.pt.preferences.secure.SecurePreferences;
>>>>>>>
import cm.aptoide.pt.preferences.secure.SecurePreferences;
<<<<<<<
=======
import lombok.AllArgsConstructor;
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.v8engine.interfaces.ShareCardCallback;
import cm.aptoide.pt.v8engine.repository.InstalledRepository;
import cm.aptoide.pt.v8engine.repository.SocialRepository;
import cm.aptoide.pt.v8engine.repository.TimelineAnalytics;
=======
import cm.aptoide.pt.v8engine.timeline.SocialRepository;
import cm.aptoide.pt.v8engine.timeline.TimelineAnalytics;
>>>>>>>
import cm.aptoide.pt.v8engine.install.InstalledRepository;
import cm.aptoide.pt.v8engine.timeline.SocialRepository;
import cm.aptoide.pt.v8engine.timeline.TimelineAnalytics;
<<<<<<<
linksHandlerFactory.get(LinksHandlerFactory.CUSTOM_TABS_LINK_TYPE,
video.getPublisher().getBaseUrl()), video.getPublisher().getName(),
video.getThumbnailUrl(), video.getPublisher().getLogoUrl(), appId, abTestingURL,
video.getApps(), video.getDate(), dateCalculator, spannableFactory, timelineAnalytics,
socialRepository, installedRepository);
=======
linksHandlerFactory.get(LinksHandlerFactory.CUSTOM_TABS_LINK_TYPE, video.getPublisher()
.getBaseUrl()), video.getPublisher()
.getName(), video.getThumbnailUrl(), video.getPublisher()
.getLogoUrl(), appId, abTestingURL, video.getApps(), video.getDate(), dateCalculator,
spannableFactory, timelineAnalytics, socialRepository);
>>>>>>>
linksHandlerFactory.get(LinksHandlerFactory.CUSTOM_TABS_LINK_TYPE, video.getPublisher()
.getBaseUrl()), video.getPublisher()
.getName(), video.getThumbnailUrl(), video.getPublisher()
.getLogoUrl(), appId, abTestingURL, video.getApps(), video.getDate(), dateCalculator,
spannableFactory, timelineAnalytics, socialRepository, installedRepository);
<<<<<<<
return installedRepository.getInstalled(packageNames).observeOn(Schedulers.computation());
=======
if (installedAccessor != null) {
return installedAccessor.get(packageNames)
.observeOn(Schedulers.computation());
}
>>>>>>>
return installedRepository.getInstalled(packageNames)
.observeOn(Schedulers.computation()); |
<<<<<<<
=======
import android.text.TextUtils;
import android.view.WindowManager;
>>>>>>>
import android.view.WindowManager;
<<<<<<<
return installManager.install(context, download)
.andThen(
installManager.getInstallationProgress(download.getMd5(), download.getPackageName(),
download.getVersionCode()))
=======
return installManager.install(download)
>>>>>>>
return installManager.install(download)
.andThen(
installManager.getInstallationProgress(download.getMd5(), download.getPackageName(),
download.getVersionCode())) |
<<<<<<<
CardTouchEvent.Type.LIKES_PREVIEW, position)));
=======
CardTouchEvent.Type.LIKES_PREVIEW)));
this.numberLikes.setOnClickListener(click -> this.cardTouchEventPublishSubject.onNext(
new LikesPreviewCardTouchEvent(post, post.getLikesNumber(),
CardTouchEvent.Type.LIKES_PREVIEW)));
this.numberLikesOneLike.setOnClickListener(click -> this.cardTouchEventPublishSubject.onNext(
new LikesPreviewCardTouchEvent(post, post.getLikesNumber(),
CardTouchEvent.Type.LIKES_PREVIEW)));
>>>>>>>
CardTouchEvent.Type.LIKES_PREVIEW, position)));
this.numberLikes.setOnClickListener(click -> this.cardTouchEventPublishSubject.onNext(
new LikesPreviewCardTouchEvent(post, post.getLikesNumber(),
CardTouchEvent.Type.LIKES_PREVIEW, position)));
this.numberLikesOneLike.setOnClickListener(click -> this.cardTouchEventPublishSubject.onNext(
new LikesPreviewCardTouchEvent(post, post.getLikesNumber(),
CardTouchEvent.Type.LIKES_PREVIEW, position))); |
<<<<<<<
SocialRepository socialRepository, String marketName, AppCoinsManager appCoinsManager,
PromotionsManager promotionsManager, String promotionId,
InstalledRepository installedRepository, AppcMigrationManager appcMigrationManager) {
=======
Scheduler ioScheduler, SocialRepository socialRepository, String marketName,
AppCoinsManager appCoinsManager, AppcMigrationManager appcMigrationManager) {
>>>>>>>
Scheduler ioScheduler, SocialRepository socialRepository, String marketName,
AppCoinsManager appCoinsManager, PromotionsManager promotionsManager, String promotionId,
InstalledRepository installedRepository, AppcMigrationManager appcMigrationManager) { |
<<<<<<<
=======
public Integer getWidth() {
return value;
}
>>>>>>> |
<<<<<<<
void inject(NewAccountFragment newAccountFragment);
=======
void inject(BottomHomeFragment bottomHomeFragment);
>>>>>>>
void inject(BottomHomeFragment bottomHomeFragment);
void inject(NewAccountFragment newAccountFragment); |
<<<<<<<
import cm.aptoide.pt.v8engine.repository.InstalledRepository;
=======
>>>>>>>
<<<<<<<
public static final String OBB_FOLDER =
Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/obb/";
public static final String ROOT_INSTALL_COMMAND = "pm install -r ";
=======
public static final String OBB_FOLDER = Environment.getExternalStorageDirectory()
.getAbsolutePath() + "/Android/obb/";
>>>>>>>
public static final String OBB_FOLDER = Environment.getExternalStorageDirectory()
.getAbsolutePath() + "/Android/obb/";
public static final String ROOT_INSTALL_COMMAND = "pm install -r ";
<<<<<<<
return Observable.<Void> fromCallable(() -> {
startInstallIntent(context, installation.getFile());
=======
return Observable.<Void>fromCallable(() -> {
startInstallIntent(context, file);
>>>>>>>
return Observable.<Void>fromCallable(() -> {
startInstallIntent(context, installation.getFile()); |
<<<<<<<
import cm.aptoide.pt.preferences.secure.SecurePreferences;
=======
import cm.aptoide.pt.networkclient.interfaces.ErrorRequestListener;
>>>>>>>
import cm.aptoide.pt.networkclient.interfaces.ErrorRequestListener;
import cm.aptoide.pt.preferences.secure.SecurePreferences;
<<<<<<<
DataProvider.getConfiguration().getPartnerId(), SecurePreferences.isAdultSwitchActive())
.execute(getAdsResponse -> {
=======
DataProvider.getConfiguration().getPartnerId()).execute(getAdsResponse -> {
>>>>>>>
DataProvider.getConfiguration().getPartnerId(), SecurePreferences.isAdultSwitchActive())
.execute(getAdsResponse -> {
<<<<<<<
displayables.add(new GridAppDisplayable(app, tag, false));
=======
displayables.add(new GridAppDisplayable(app, tag, true));
>>>>>>>
displayables.add(new GridAppDisplayable(app, tag, true));
<<<<<<<
displayables.add(new GridAppDisplayable(app, tag, false));
=======
displayables.add(new GridAppDisplayable(app, tag, true));
>>>>>>>
displayables.add(new GridAppDisplayable(app, tag, true));
<<<<<<<
Observable.from(list)
.forEach(wsWidget -> WSWidgetsUtils.loadInnerNodes(wsWidget,
wsWidget.getView() != null ? StoreUtils.getStoreCredentialsFromUrl(
wsWidget.getView()) : new BaseRequestWithStore.StoreCredentials(),
countDownLatch, refresh, throwable -> countDownLatch.countDown(),
AptoideAccountManager.getAccessToken(), AptoideAccountManager.getUserEmail(),
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(),
DataProvider.getContext()).getAptoideClientUUID(),
DataproviderUtils.AdNetworksUtils.isGooglePlayServicesAvailable(
V8Engine.getContext()), DataProvider.getConfiguration().getPartnerId(),
SecurePreferences.isAdultSwitchActive()));
=======
BaseRequestWithStore.StoreCredentials widgetStoreCredentials =
wsWidget.getView() != null ? StoreUtils.getStoreCredentialsFromUrlOrNull(
wsWidget.getView()) : storeCredentials;
if (widgetStoreCredentials == null) {
widgetStoreCredentials = storeCredentials;
}
WSWidgetsUtils.loadInnerNodes(wsWidget, widgetStoreCredentials, countDownLatch, refresh,
throwable -> countDownLatch.countDown(), AptoideAccountManager.getAccessToken(),
AptoideAccountManager.getUserEmail(),
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(),
DataProvider.getContext()).getAptoideClientUUID(),
DataproviderUtils.AdNetworksUtils.isGooglePlayServicesAvailable(
V8Engine.getContext()), DataProvider.getConfiguration().getPartnerId());
});
>>>>>>>
BaseRequestWithStore.StoreCredentials widgetStoreCredentials =
wsWidget.getView() != null ? StoreUtils.getStoreCredentialsFromUrlOrNull(
wsWidget.getView()) : storeCredentials;
if (widgetStoreCredentials == null) {
widgetStoreCredentials = storeCredentials;
}
WSWidgetsUtils.loadInnerNodes(wsWidget, widgetStoreCredentials, countDownLatch, refresh,
throwable -> countDownLatch.countDown(), AptoideAccountManager.getAccessToken(),
AptoideAccountManager.getUserEmail(),
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(),
DataProvider.getContext()).getAptoideClientUUID(),
DataproviderUtils.AdNetworksUtils.isGooglePlayServicesAvailable(
V8Engine.getContext()), DataProvider.getConfiguration().getPartnerId(),
AptoideAccountManager.isMatureSwitchOn());
}); |
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_AND_INSTALL, 0, null, "editorsChoice", "origin", false,
"marketName", false, false, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_AND_INSTALL, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_AND_INSTALL, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false,
null, null);
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin", false, "marketName", false,
false, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin",
false, "marketName", false, false, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin",
false, "marketName", false, false, bdsFlags, "", "", false, null, null);
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin", false, "marketName", true,
true, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin",
false, "marketName", true, true, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null, "", "origin",
false, "marketName", true, true, bdsFlags, "", "", false, null, null); |
<<<<<<<
import cm.aptoide.pt.social.commentslist.PostCommentsFragment;
=======
import cm.aptoide.pt.reviews.LatestReviewsFragment;
import cm.aptoide.pt.reviews.ListReviewsFragment;
import cm.aptoide.pt.reviews.RateAndReviewsFragment;
import cm.aptoide.pt.search.model.SearchAdResult;
>>>>>>>
import cm.aptoide.pt.social.commentslist.PostCommentsFragment;
import cm.aptoide.pt.reviews.LatestReviewsFragment;
import cm.aptoide.pt.reviews.ListReviewsFragment;
import cm.aptoide.pt.reviews.RateAndReviewsFragment;
import cm.aptoide.pt.search.model.SearchAdResult; |
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "marketName", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "marketName",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "marketName", appCoinsManager, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager);
=======
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager); |
<<<<<<<
protected Completable createStore(String storeName, String storeDescription, String storeImage,
boolean hasNewAvatar, String storeThemeName) {
=======
private Completable createStore(String storeName, String storeDescription, String storeImage,
boolean hasNewAvatar, String storeThemeName,
List<SimpleSetStoreRequest.StoreLinks> storeLinksList) {
>>>>>>>
protected Completable createStore(String storeName, String storeDescription, String storeImage,
boolean hasNewAvatar, String storeThemeName,
List<SimpleSetStoreRequest.StoreLinks> storeLinksList) { |
<<<<<<<
RoomLocalNotificationSync.class, RoomInstalled.class, RoomInstallation.class,
RoomMigratedApp.class, RoomAptoideInstallApp.class
}, version = VERSION) public abstract class AptoideDatabase extends RoomDatabase {
=======
RoomLocalNotificationSync.class, RoomInstalled.class, RoomInstallation.class,
RoomMigratedApp.class, RoomUpdate.class, RoomDownload.class
}, version = VERSION) @TypeConverters({
SplitTypeConverter.class, StringTypeConverter.class, FileToDownloadTypeConverter.class
}) public abstract class AptoideDatabase extends RoomDatabase {
>>>>>>>
RoomLocalNotificationSync.class, RoomInstalled.class, RoomInstallation.class,
RoomMigratedApp.class, RoomUpdate.class, RoomDownload.class, RoomAptoideInstallApp.class
}, version = VERSION) @TypeConverters({
SplitTypeConverter.class, StringTypeConverter.class, FileToDownloadTypeConverter.class
}) public abstract class AptoideDatabase extends RoomDatabase {
<<<<<<<
public abstract AptoideInstallDao aptoideInstallDao();
=======
public abstract UpdateDao updateDao();
public abstract DownloadDAO downloadDAO();
>>>>>>>
public abstract UpdateDao updateDao();
public abstract DownloadDAO downloadDAO();
public abstract AptoideInstallDao aptoideInstallDao(); |
<<<<<<<
import cm.aptoide.pt.networkclient.WebService;
import cm.aptoide.pt.root.RootAvailabilityManager;
=======
>>>>>>>
import cm.aptoide.pt.root.RootAvailabilityManager;
<<<<<<<
updatesRepository = RepositoryFactory.getUpdateRepository(this);
=======
installedRepository = RepositoryFactory.getInstalledRepository();
updatesRepository = RepositoryFactory.getUpdateRepository(this, sharedPreferences);
>>>>>>>
updatesRepository = RepositoryFactory.getUpdateRepository(this, sharedPreferences);
<<<<<<<
installManager =
((V8Engine) getApplicationContext()).getInstallManager(InstallerFactory.ROLLBACK);
rootAvailabilityManager = ((V8Engine) getApplicationContext()).getRootAvailabilityManager();
=======
installAnalytics =
new InstallAnalytics(analytics, AppEventsLogger.newLogger(getApplicationContext()));
>>>>>>>
installManager =
((V8Engine) getApplicationContext()).getInstallManager(InstallerFactory.ROLLBACK);
rootAvailabilityManager = ((V8Engine) getApplicationContext()).getRootAvailabilityManager();
installAnalytics =
new InstallAnalytics(analytics, AppEventsLogger.newLogger(getApplicationContext()));
packageManager = getPackageManager();
<<<<<<<
Installed installed = new Installed(packageInfo);
installManager.onAppInstalled(installed)
.subscribe(() -> {
}, throwable -> CrashReport.getInstance()
.log(throwable));
=======
installedRepository.save(new Installed(packageInfo, getPackageManager()));
installAnalytics.sendInstalledEvent(packageName);
>>>>>>>
Installed installed = new Installed(packageInfo, packageManager);
installManager.onAppInstalled(installed)
.subscribe(() -> {
}, throwable -> CrashReport.getInstance()
.log(throwable));
<<<<<<<
event.setPhoneRooted(rootAvailabilityManager.isRootAvailable()
.toBlocking()
.value());
event.setResultStatus(DownloadInstallAnalyticsBaseBody.ResultStatus.SUCC);
=======
event.setPhoneRooted(RootShell.isRootAvailable());
event.setResultStatus(Result.ResultStatus.SUCC);
>>>>>>>
event.setPhoneRooted(rootAvailabilityManager.isRootAvailable()
.toBlocking()
.value());
event.setResultStatus(Result.ResultStatus.SUCC);
<<<<<<<
final Update update = updatesRepository.get(packageName)
.first()
.doOnError(throwable -> {
CrashReport.getInstance()
.log(throwable);
})
.onErrorReturn(throwable -> null)
.toBlocking()
.first();
=======
final Update update = updatesRepository.get(packageName)
.doOnError(throwable -> {
CrashReport.getInstance()
.log(throwable);
})
.onErrorReturn(throwable -> null)
.toBlocking()
.first();
>>>>>>>
final Update update = updatesRepository.get(packageName)
.first()
.doOnError(throwable -> {
CrashReport.getInstance()
.log(throwable);
})
.onErrorReturn(throwable -> null)
.toBlocking()
.first();
<<<<<<<
installManager.onUpdateConfirmed(new Installed(packageInfo))
.andThen(updatesRepository.remove(update))
.subscribe(() -> Logger.d(TAG, "databaseOnPackageReplaced: " + packageName),
throwable -> CrashReport.getInstance()
.log(throwable));
=======
Action0 insertApp =
() -> installedRepository.save(new Installed(packageInfo, getPackageManager()));
if (update != null) {
if (packageInfo.versionCode >= update.getVersionCode()) {
// remove old update and on complete insert new app.
updatesRepository.remove(update)
.subscribe(insertApp, throwable -> CrashReport.getInstance()
.log(throwable));
}
} else {
// sync call to insert
insertApp.call();
}
>>>>>>>
installManager.onUpdateConfirmed(new Installed(packageInfo, packageManager))
.andThen(updatesRepository.remove(update))
.subscribe(() -> Logger.d(TAG, "databaseOnPackageReplaced: " + packageName),
throwable -> CrashReport.getInstance()
.log(throwable)); |
<<<<<<<
import cm.aptoide.pt.database.room.RoomDownload;
=======
import cm.aptoide.pt.app.aptoideinstall.AptoideInstallManager;
import cm.aptoide.pt.database.realm.Download;
>>>>>>>
import cm.aptoide.pt.database.room.RoomDownload;
import cm.aptoide.pt.app.aptoideinstall.AptoideInstallManager;
<<<<<<<
if (storedDownload.getOverallDownloadStatus() == RoomDownload.ERROR) {
storedDownload.setOverallDownloadStatus(RoomDownload.INVALID_STATUS);
=======
aptoideInstallManager.addAptoideInstallCandidate(storedDownload.getPackageName());
if (storedDownload.getOverallDownloadStatus() == Download.ERROR) {
storedDownload.setOverallDownloadStatus(Download.INVALID_STATUS);
>>>>>>>
aptoideInstallManager.addAptoideInstallCandidate(storedDownload.getPackageName());
if (storedDownload.getOverallDownloadStatus() == RoomDownload.ERROR) {
storedDownload.setOverallDownloadStatus(RoomDownload.INVALID_STATUS); |
<<<<<<<
private AptoideNavigationTracker aptoideNavigationTracker;
private ApplicationPreferences appPreferences;
=======
private String originTag;
private SearchBuilder searchBuilder;
>>>>>>>
private AptoideNavigationTracker aptoideNavigationTracker;
private ApplicationPreferences appPreferences;
private SearchBuilder searchBuilder;
<<<<<<<
final AptoideApplication application =
(AptoideApplication) getContext().getApplicationContext();
appPreferences = application.getApplicationPreferences();
this.appViewModel.setDefaultTheme(appPreferences.getDefaultThemeName());
this.appViewModel.setMarketName(appPreferences.getMarketName());
this.appViewModel.setBillingIdResolver(application.getBillingIdResolver());
=======
final String defaultStore =
((AptoideApplication) getContext().getApplicationContext()).getDefaultStore();
final SearchManager searchManager =
(SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE);
final SearchNavigator searchNavigator =
new SearchNavigator(getFragmentNavigator(), defaultStore);
searchBuilder = new SearchBuilder(searchManager, searchNavigator);
defaultTheme = ((AptoideApplication) getContext().getApplicationContext()).getDefaultTheme();
marketName = ((AptoideApplication) getContext().getApplicationContext()).getMarketName();
billingIdResolver =
((AptoideApplication) getContext().getApplicationContext()).getBillingIdResolver();
>>>>>>>
final AptoideApplication application =
(AptoideApplication) getContext().getApplicationContext();
appPreferences = application.getApplicationPreferences();
this.appViewModel.setDefaultTheme(appPreferences.getDefaultThemeName());
this.appViewModel.setMarketName(appPreferences.getMarketName());
this.appViewModel.setBillingIdResolver(application.getBillingIdResolver());
final String defaultStore = appPreferences.getDefaultStoreName();
final SearchManager searchManager =
(SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE);
final SearchNavigator searchNavigator =
new SearchNavigator(getFragmentNavigator(), defaultStore);
searchBuilder = new SearchBuilder(searchManager, searchNavigator);
<<<<<<<
final String defaultStore = appPreferences.getDefaultStoreName();
SearchBuilder searchBuilder =
new SearchBuilder(menu.findItem(R.id.action_search), getActivity(),
new SearchNavigator(getFragmentNavigator(), defaultStore));
searchBuilder.validateAndAttachSearch();
=======
if (searchBuilder != null && searchBuilder.isValid()) {
searchBuilder.attachSearch(getContext(), menu.findItem(R.id.action_search));
} else {
menu.removeItem(R.id.action_search);
}
>>>>>>>
if (searchBuilder != null && searchBuilder.isValid()) {
searchBuilder.attachSearch(getContext(), menu.findItem(R.id.action_search));
} else {
menu.removeItem(R.id.action_search);
} |
<<<<<<<
=======
private final StoreDataPersist storeDataPersist;
private final BodyInterceptor bodyInterceptor;
private PublishRelay<Boolean> loginStatusRelay;
private WeakReference<Account> weakRefAccount;
>>>>>>>
private final StoreDataPersist storeDataPersist;
private final AptoidePreferencesConfiguration configuration;
private PublishRelay<Boolean> loginStatusRelay;
private WeakReference<Account> weakRefAccount;
<<<<<<<
String accountType, AccountRequestFactory requestFactory) {
=======
BodyInterceptor baseBodyInterceptor, String accountType, StoreDataPersist storeDataPersist) {
this.bodyInterceptor = baseBodyInterceptor;
>>>>>>>
String accountType, AccountRequestFactory requestFactory, StoreDataPersist storeDataPersist) {
<<<<<<<
LOGIN = configuration.getAppId() + ".accountmanager.broadcast.login";
LOGIN_CANCELLED = configuration.getAppId() + ".accountmanager.broadcast.LOGIN_CANCELLED";
LOGOUT = configuration.getAppId() + ".accountmanager.broadcast.logout";
this.requestFactory = requestFactory;
=======
this.storeDataPersist = storeDataPersist;
weakRefAccount = new WeakReference<>(null);
loginStatusRelay = PublishRelay.create();
}
public Observable<Boolean> loginStatus() {
return loginStatusRelay.startWith(isLoggedIn()).distinctUntilChanged();
>>>>>>>
this.storeDataPersist = storeDataPersist;
weakRefAccount = new WeakReference<>(null);
loginStatusRelay = PublishRelay.create();
this.requestFactory = requestFactory;
}
public Observable<Boolean> loginStatus() {
return loginStatusRelay.startWith(isLoggedIn()).distinctUntilChanged(); |
<<<<<<<
import cm.aptoide.pt.search.view.SearchResultFragment;
=======
import cm.aptoide.pt.store.view.my.MyStoresFragment;
>>>>>>>
import cm.aptoide.pt.store.view.my.MyStoresFragment;
import cm.aptoide.pt.search.view.SearchResultFragment; |
<<<<<<<
.flatMap(storedDownload -> getInstall(download.getMd5(), download.getPackageName(),
download.getVersionCode()))
.flatMap(install -> installInBackground(install, forceDefaultInstall,
packageInstallerManager.shouldSetInstallerPackageName(download) || forceSplitInstall,
shouldInstall))
=======
.flatMap(install -> installInBackground(download.getMd5(), forceDefaultInstall,
packageInstallerManager.shouldSetInstallerPackageName(download) || forceSplitInstall))
>>>>>>>
.flatMap(install -> installInBackground(download.getMd5(), forceDefaultInstall,
packageInstallerManager.shouldSetInstallerPackageName(download) || forceSplitInstall,
shouldInstall))
<<<<<<<
private void startBackgroundInstallation(String md5, boolean forceDefaultInstall,
boolean shouldSetPackageInstaller, boolean shouldInstall) {
Intent intent = new Intent(context, InstallService.class);
intent.setAction(InstallService.ACTION_START_INSTALL);
intent.putExtra(InstallService.EXTRA_INSTALLATION_MD5, md5);
intent.putExtra(InstallService.EXTRA_FORCE_DEFAULT_INSTALL, forceDefaultInstall);
intent.putExtra(InstallService.EXTRA_SET_PACKAGE_INSTALLER, shouldSetPackageInstaller);
intent.putExtra(InstallService.EXTRA_SHOULD_INSTALL_DOWNLOAD, shouldInstall);
if (installer instanceof DefaultInstaller) {
intent.putExtra(InstallService.EXTRA_INSTALLER_TYPE, InstallService.INSTALLER_TYPE_DEFAULT);
}
context.startService(intent);
=======
private void initInstallationProgress(Download download) {
Installed installed = convertDownloadToInstalled(download);
installedRepository.save(installed);
}
@NonNull private Installed convertDownloadToInstalled(Download download) {
Installed installed = new Installed();
installed.setPackageAndVersionCode(download.getPackageName() + download.getVersionCode());
installed.setVersionCode(download.getVersionCode());
installed.setVersionName(download.getVersionName());
installed.setStatus(Installed.STATUS_WAITING);
installed.setType(Installed.TYPE_UNKNOWN);
installed.setPackageName(download.getPackageName());
return installed;
>>>>>>>
private void initInstallationProgress(Download download) {
Installed installed = convertDownloadToInstalled(download);
installedRepository.save(installed);
}
@NonNull private Installed convertDownloadToInstalled(Download download) {
Installed installed = new Installed();
installed.setPackageAndVersionCode(download.getPackageName() + download.getVersionCode());
installed.setVersionCode(download.getVersionCode());
installed.setVersionName(download.getVersionName());
installed.setStatus(Installed.STATUS_WAITING);
installed.setType(Installed.TYPE_UNKNOWN);
installed.setPackageName(download.getPackageName());
return installed; |
<<<<<<<
@Mock private MoPubInterstitialAdExperiment moPubInterstitialAdExperiment;
@Mock private MoPubBannerAdExperiment moPubBannerAdExperiment;
@Mock private MoPubNativeAdExperiment moPubNativeAdExperiment;
@Mock private PromotionsManager promotionsManager;
@Mock private InstalledRepository installedRepository;
=======
@Mock private MoPubAdsManager moPubAdsManager;
>>>>>>>
@Mock private MoPubAdsManager moPubAdsManager;
@Mock private PromotionsManager promotionsManager;
@Mock private InstalledRepository installedRepository;
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "marketName", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "marketName",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "marketName",
appCoinsManager, promotionsManager, "", installedRepository);
<<<<<<<
preferencesManager, downloadStateParser, appViewAnalytics, notificationAnalytics,
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
moPubInterstitialAdExperiment, moPubBannerAdExperiment, moPubNativeAdExperiment,
promotionsManager, "", installedRepository);
=======
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager);
>>>>>>>
moPubAdsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository); |
<<<<<<<
private static final String STORE_CONTEXT = "STORE_CONTEXT";
=======
private static final String LIST_STATE_KEY = "LIST_STATE";
>>>>>>>
private static final String STORE_CONTEXT = "STORE_CONTEXT";
private static final String LIST_STATE_KEY = "LIST_STATE";
<<<<<<<
private StoreContext storeContext;
=======
private BehaviorRelay<Boolean> refreshSubject;
private Parcelable listState;
private Displayable spinnerProgressDisplayable;
>>>>>>>
private BehaviorRelay<Boolean> refreshSubject;
private Parcelable listState;
private Displayable spinnerProgressDisplayable;
private StoreContext storeContext; |
<<<<<<<
import cm.aptoide.pt.notification.NotificationProvider;
import cm.aptoide.pt.notification.RealmLocalNotificationSyncMapper;
import cm.aptoide.pt.notification.RealmLocalNotificationSyncPersistence;
import cm.aptoide.pt.notification.sync.LocalNotificationSyncManager;
=======
import cm.aptoide.pt.packageinstaller.AppInstaller;
>>>>>>>
import cm.aptoide.pt.notification.NotificationProvider;
import cm.aptoide.pt.notification.RealmLocalNotificationSyncMapper;
import cm.aptoide.pt.notification.RealmLocalNotificationSyncPersistence;
import cm.aptoide.pt.notification.sync.LocalNotificationSyncManager;
import cm.aptoide.pt.packageinstaller.AppInstaller;
<<<<<<<
@Singleton @Provides NotificationProvider providesNotificationProvider(Database database) {
return new NotificationProvider(AccessorFactory.getAccessorFor(database, Notification.class),
Schedulers.io());
}
@Singleton @Provides
RealmLocalNotificationSyncPersistence providesRealmLocalNotificationSyncPersistence(
Database database, NotificationProvider provider) {
return new RealmLocalNotificationSyncPersistence(database,
new RealmLocalNotificationSyncMapper(), provider);
}
@Singleton @Provides LocalNotificationSyncManager providesLocalNotificationSyncManager(
SyncScheduler syncScheduler, NotificationProvider provider) {
return new LocalNotificationSyncManager(syncScheduler, true, provider);
}
=======
@Singleton @Provides AppInstaller providesAppInstaller(
AppInstallerStatusReceiver appInstallerStatusReceiver) {
return new AppInstaller(application.getApplicationContext(),
installStatus -> appInstallerStatusReceiver.onStatusReceived(installStatus));
}
@Singleton @Provides AppInstallerStatusReceiver providesAppInstallerStatusReceiver() {
return new AppInstallerStatusReceiver(PublishSubject.create());
}
@Singleton @Provides PackageInstallerManager providesPackageInstallerManager() {
return new PackageInstallerManager();
}
>>>>>>>
@Singleton @Provides AppInstaller providesAppInstaller(
AppInstallerStatusReceiver appInstallerStatusReceiver) {
return new AppInstaller(application.getApplicationContext(),
installStatus -> appInstallerStatusReceiver.onStatusReceived(installStatus));
}
@Singleton @Provides AppInstallerStatusReceiver providesAppInstallerStatusReceiver() {
return new AppInstallerStatusReceiver(PublishSubject.create());
}
@Singleton @Provides PackageInstallerManager providesPackageInstallerManager() {
return new PackageInstallerManager();
}
@Singleton @Provides NotificationProvider providesNotificationProvider(Database database) {
return new NotificationProvider(AccessorFactory.getAccessorFor(database, Notification.class),
Schedulers.io());
}
@Singleton @Provides
RealmLocalNotificationSyncPersistence providesRealmLocalNotificationSyncPersistence(
Database database, NotificationProvider provider) {
return new RealmLocalNotificationSyncPersistence(database,
new RealmLocalNotificationSyncMapper(), provider);
}
@Singleton @Provides LocalNotificationSyncManager providesLocalNotificationSyncManager(
SyncScheduler syncScheduler, NotificationProvider provider) {
return new LocalNotificationSyncManager(syncScheduler, true, provider);
} |
<<<<<<<
=======
@RunWith(MockitoJUnitRunner.class)
>>>>>>>
@RunWith(MockitoJUnitRunner.class)
<<<<<<<
private ApprovalStatusService approvalStatusService;
=======
@Mock
private UserService userService;
>>>>>>>
@Mock
private ApprovalStatusService approvalStatusService;
@Mock
private UserPreferenceService userPreferenceService;
@Mock
private WindChillUpdateService windChillUpdateService;
@Mock
private JiraService jiraService;
<<<<<<<
approvalStatusService = createMock(ApprovalStatusService.class);
getMockContext().putBean("approvalStatusService", approvalStatusService);
UserPreferenceService userPreferenceService = createMock(UserPreferenceService.class);
getMockContext().putBean("userPreferenceService", userPreferenceService);
WindChillUpdateService windChillUpdateService = createMock(WindChillUpdateService.class);
getMockContext().putBean("windChillUpdateService", windChillUpdateService);
JiraService jiraService = createMock(JiraService.class);
getMockContext().putBean(jiraService);
expect(jiraService.updateJiraIssues(anyObject(User.class), anyObject(List.class))).andReturn(new ArrayList<String>());
replay(jiraService);
=======
getMockContext().putBean("userService", userService);
>>>>>>>
getMockContext().putBean(approvalStatusService);
getMockContext().putBean(userPreferenceService);
getMockContext().putBean(windChillUpdateService);
getMockContext().putBean(jiraService);
when(jiraService.updateJiraIssues(isA(User.class), isA(List.class))).thenReturn(new ArrayList<String>());
<<<<<<<
expect(approvalStatusService.getApprovalStatusForUserWorkingForCustomer(isA(User.class), isA(Customer.class), isA(DateRange.class)))
.andReturn(new ArrayList<ApprovalStatus>());
expect(persistTimesheet.persistTimesheetWeek(isA(Collection.class), isA(TimesheetComment.class), isA(DateRange.class)))
.andReturn(new ArrayList<ActivityStatus>());
=======
when(persistTimesheet.persistTimesheetWeek(any(Collection.class), any(TimesheetComment.class), any(DateRange.class)))
.thenReturn(new ArrayList<ProjectAssignmentStatus>());
>>>>>>>
when(persistTimesheet.persistTimesheetWeek(any(Collection.class), any(TimesheetComment.class), any(DateRange.class)))
.thenReturn(new ArrayList<ActivityStatus>());
when(approvalStatusService.getApprovalStatusForUserWorkingForCustomer(isA(User.class), isA(Customer.class), isA(DateRange.class)))
.thenReturn(new ArrayList<ApprovalStatus>());
<<<<<<<
@After
public void verifyMocks() {
verify(overviewTimesheet);
verify(userService);
verify(persistTimesheet);
}
=======
@Test
public void shouldHideBookWholeWeekIconWhenDanybledInConfig() {
webApp.setEnableBookWholeWeek(false);
startAndReplayWithDefaultWeekOverview();
Component book = tester.getComponentFromLastRenderedPage("panel:timesheetFrame:timesheetFrame_body:timesheetForm:blueFrame:blueFrame_body:customers:0:rows:0:bookWholeWeek");
// not visible = null
assertNull(book);
}
>>>>>>>
<<<<<<<
private void startAndReplayWithLockedDays(List<Date> lockedDays) {
expectDefaultWeekOverview(withDefaultWeekOverview(lockedDays));
expectApprovalStatus();
replay(overviewTimesheet);
replay(userService);
replay(persistTimesheet);
=======
private void startWithLockedDays(List<Date> lockedDays) {
whenDefaultWeekOverview(withDefaultWeekOverview(lockedDays));
>>>>>>>
private void startWithLockedDays(List<Date> lockedDays) {
whenDefaultWeekOverview(withDefaultWeekOverview(lockedDays));
expectApprovalStatus();
<<<<<<<
private void expectApprovalStatus() {
List<ApprovalStatus> approvalStatuses = new ArrayList<ApprovalStatus>();
ApprovalStatus approvalStatus = new ApprovalStatus();
approvalStatus.setStatus(ApprovalStatusType.IN_PROGRESS);
approvalStatuses.add(approvalStatus);
expect(approvalStatusService.getApprovalStatusForUserWorkingForCustomer(isA(User.class), isA(Customer.class), isA(DateRange.class))).andReturn(approvalStatuses).anyTimes();
replay(approvalStatusService);
}
private void expectDefaultWeekOverview(WeekOverview overview) {
expect(overviewTimesheet.getWeekOverview(isA(User.class), isA(Calendar.class))).andReturn(overview);
=======
private void whenDefaultWeekOverview(WeekOverview overview) {
when(overviewTimesheet.getWeekOverview(any(User.class), any(Calendar.class))).thenReturn(overview);
>>>>>>>
private void expectApprovalStatus() {
List<ApprovalStatus> approvalStatuses = new ArrayList<ApprovalStatus>();
ApprovalStatus approvalStatus = new ApprovalStatus();
approvalStatus.setStatus(ApprovalStatusType.IN_PROGRESS);
approvalStatuses.add(approvalStatus);
when(approvalStatusService.getApprovalStatusForUserWorkingForCustomer(isA(User.class), isA(Customer.class), isA(DateRange.class))).thenReturn(approvalStatuses);
}
private void whenDefaultWeekOverview(WeekOverview overview) {
when(overviewTimesheet.getWeekOverview(any(User.class), any(Calendar.class))).thenReturn(overview); |
<<<<<<<
import cm.aptoide.pt.addressbook.view.InviteFriendsFragment;
import cm.aptoide.pt.addressbook.view.PhoneInputFragment;
import cm.aptoide.pt.addressbook.view.SyncResultFragment;
import cm.aptoide.pt.app.view.AppViewFragment;
import cm.aptoide.pt.comments.view.CommentListFragment;
import cm.aptoide.pt.download.view.DownloadsFragment;
import cm.aptoide.pt.download.view.scheduled.ScheduledDownloadsFragment;
import cm.aptoide.pt.notification.view.InboxFragment;
import cm.aptoide.pt.reviews.LatestReviewsFragment;
import cm.aptoide.pt.search.view.SearchResultFragment;
import cm.aptoide.pt.share.NotLoggedInShareFragment;
import cm.aptoide.pt.social.view.TimelineFragment;
import cm.aptoide.pt.spotandshare.view.SpotSharePreviewFragment;
import cm.aptoide.pt.store.view.FragmentTopStores;
import cm.aptoide.pt.store.view.ListStoresFragment;
import cm.aptoide.pt.store.view.StoreFragment;
import cm.aptoide.pt.store.view.StoreTabWidgetsGridRecyclerFragment;
import cm.aptoide.pt.store.view.home.HomeFragment;
import cm.aptoide.pt.store.view.my.MyStoresSubscribedFragment;
=======
import cm.aptoide.pt.social.commentslist.PostCommentsFragment;
>>>>>>>
import cm.aptoide.pt.addressbook.view.InviteFriendsFragment;
import cm.aptoide.pt.addressbook.view.PhoneInputFragment;
import cm.aptoide.pt.addressbook.view.SyncResultFragment;
import cm.aptoide.pt.app.view.AppViewFragment;
import cm.aptoide.pt.comments.view.CommentListFragment;
import cm.aptoide.pt.download.view.DownloadsFragment;
import cm.aptoide.pt.download.view.scheduled.ScheduledDownloadsFragment;
import cm.aptoide.pt.notification.view.InboxFragment;
import cm.aptoide.pt.reviews.LatestReviewsFragment;
import cm.aptoide.pt.search.view.SearchResultFragment;
import cm.aptoide.pt.share.NotLoggedInShareFragment;
import cm.aptoide.pt.social.view.TimelineFragment;
import cm.aptoide.pt.spotandshare.view.SpotSharePreviewFragment;
import cm.aptoide.pt.store.view.FragmentTopStores;
import cm.aptoide.pt.store.view.ListStoresFragment;
import cm.aptoide.pt.store.view.StoreFragment;
import cm.aptoide.pt.store.view.StoreTabWidgetsGridRecyclerFragment;
import cm.aptoide.pt.store.view.home.HomeFragment;
import cm.aptoide.pt.store.view.my.MyStoresSubscribedFragment;
import cm.aptoide.pt.social.commentslist.PostCommentsFragment;
<<<<<<<
void inject(PostFragment postFragment);
void inject(AppViewFragment appViewFragment);
void inject(HomeFragment homeFragment);
void inject(SearchResultFragment searchResultFragment);
void inject(StoreFragment storeFragment);
void inject(SyncResultFragment syncResultFragment);
void inject(InviteFriendsFragment inviteFriendsFragment);
void inject(PhoneInputFragment phoneInputFragment);
void inject(SpotSharePreviewFragment spotSharePreviewFragment);
void inject(TimelineFragment timelineFragment);
void inject(CommentListFragment commentListFragment);
void inject(FragmentTopStores fragmentTopStores);
void inject(LatestReviewsFragment latestReviewsFragment);
void inject(ListStoresFragment listStoresFragment);
void inject(MyStoresSubscribedFragment myStoresSubscribedFragment);
void inject(StoreTabWidgetsGridRecyclerFragment storeTabWidgetsGridRecyclerFragment);
void inject(InboxFragment inboxFragment);
void inject(MyAccountFragment myAccountFragment);
void inject(NotLoggedInShareFragment notLoggedInShareFragment);
=======
void inject(PostCommentsFragment postCommentsFragment);
>>>>>>>
void inject(PostCommentsFragment postCommentsFragment);
void inject(PostFragment postFragment);
void inject(AppViewFragment appViewFragment);
void inject(HomeFragment homeFragment);
void inject(SearchResultFragment searchResultFragment);
void inject(StoreFragment storeFragment);
void inject(SyncResultFragment syncResultFragment);
void inject(InviteFriendsFragment inviteFriendsFragment);
void inject(PhoneInputFragment phoneInputFragment);
void inject(SpotSharePreviewFragment spotSharePreviewFragment);
void inject(TimelineFragment timelineFragment);
void inject(CommentListFragment commentListFragment);
void inject(FragmentTopStores fragmentTopStores);
void inject(LatestReviewsFragment latestReviewsFragment);
void inject(ListStoresFragment listStoresFragment);
void inject(MyStoresSubscribedFragment myStoresSubscribedFragment);
void inject(StoreTabWidgetsGridRecyclerFragment storeTabWidgetsGridRecyclerFragment);
void inject(InboxFragment inboxFragment);
void inject(MyAccountFragment myAccountFragment);
void inject(NotLoggedInShareFragment notLoggedInShareFragment); |
<<<<<<<
import android.support.annotation.CallSuper;
import android.support.annotation.NonNull;
=======
>>>>>>>
<<<<<<<
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.dataprovider.util.CommentType;
import cm.aptoide.pt.logger.Logger;
=======
>>>>>>>
<<<<<<<
import cm.aptoide.pt.v8engine.V8Engine;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.SocialCardDisplayable;
=======
>>>>>>>
<<<<<<<
import com.like.LikeButton;
import com.like.OnLikeListener;
import rx.Observable;
import rx.functions.Action1;
=======
>>>>>>>
<<<<<<<
@Override @CallSuper public void bindView(T displayable) {
super.bindView(displayable);
if (comments != null) {
compositeSubscription.add(
RxView.clicks(comments).flatMap(aVoid -> showComments(displayable)).subscribe(aVoid -> {
}, showError()));
comments.setVisibility(View.VISIBLE);
} else {
Logger.w(TAG, "comment button is null in this view");
}
if (like != null) {
compositeSubscription.add(
RxView.clicks(like).flatMap(aVoid -> toggleLike()).subscribe(aVoid -> {
}, showError()));
like.setVisibility(View.VISIBLE);
} else {
Logger.w(TAG, "like button is null in this view");
}
likeButton.setLiked(false);
numberLikes.setVisibility(View.VISIBLE);
numberLikes.setText(String.valueOf(displayable.getNumberOfLikes()));
numberComments.setVisibility(View.VISIBLE);
numberComments.setText(String.valueOf(displayable.getNumberOfComments()));
//
// should this be inside the like button logic ??
//
likeButton.setOnLikeListener(new OnLikeListener() {
@Override public void liked(LikeButton likeButton) {
likeCard(displayable, 1);
numberLikes.setText(String.valueOf(displayable.getNumberOfLikes() + 1));
}
@Override public void unLiked(LikeButton likeButton) {
likeButton.setLiked(true);
//likeCard(displayable, cardType, -1);
//numberLikes.setText("0");
}
});
}
@NonNull private Action1<Throwable> showError() {
return err -> {
Logger.e(TAG, err);
CrashReports.logException(err);
};
}
void likeCard(T displayable, int rating) {
=======
public void likeCard(T displayable, String cardType, int rating) {
>>>>>>>
<<<<<<<
Observable<Void> toggleLike() {
return Observable.fromCallable(() -> {
// TODO: 19/12/2016 sithengineer
ShowMessage.asSnack(comments, "TO DO: like");
return null;
});
}
=======
>>>>>>> |
<<<<<<<
import android.support.annotation.NonNull;
import cm.aptoide.pt.database.accessors.NotificationAccessor;
=======
import android.content.SharedPreferences;
>>>>>>>
import android.support.annotation.NonNull;
import cm.aptoide.pt.database.accessors.NotificationAccessor;
import android.content.SharedPreferences;
<<<<<<<
import io.realm.Sort;
import java.util.List;
import java.util.concurrent.TimeUnit;
=======
>>>>>>>
import io.realm.Sort;
import java.util.List;
import java.util.concurrent.TimeUnit;
<<<<<<<
NotificationHandler notificationHandler, NotificationProvider notificationProvider,
NotificationSyncScheduler notificationSyncScheduler,
SystemNotificationShower notificationShower, CrashReport crashReport,
NotificationAccessor notificationAccessor) {
=======
NotificationHandler notificationHandler, NotificationSyncScheduler notificationSyncScheduler,
SystemNotificationShower notificationShower, CrashReport crashReport,
NotificationPolicyFactory notificationPolicyFactory, SharedPreferences sharedPreferences) {
>>>>>>>
NotificationHandler notificationHandler, NotificationProvider notificationProvider, NotificationSyncScheduler notificationSyncScheduler,
SystemNotificationShower notificationShower, CrashReport crashReport,
NotificationPolicyFactory notificationPolicyFactory,
NotificationAccessor notificationAccessor, SharedPreferences sharedPreferences) {
<<<<<<<
this.notificationAccessor = notificationAccessor;
=======
this.notificationPolicyFactory = notificationPolicyFactory;
this.sharedPreferences = sharedPreferences;
}
public void enable() {
sharedPreferences.edit()
.putBoolean(NOTIFICATION_CENTER_ENABLE, true)
.apply();
}
public void disable() {
sharedPreferences.edit()
.putBoolean(NOTIFICATION_CENTER_ENABLE, false)
.apply();
}
public void startIfEnabled() {
if (isEnable()) {
start();
}
>>>>>>>
this.notificationPolicyFactory = notificationPolicyFactory;
this.sharedPreferences = sharedPreferences;
this.notificationAccessor = notificationAccessor;
}
public void enable() {
sharedPreferences.edit()
.putBoolean(NOTIFICATION_CENTER_ENABLE, true)
.apply();
}
public void disable() {
sharedPreferences.edit()
.putBoolean(NOTIFICATION_CENTER_ENABLE, false)
.apply();
}
public void startIfEnabled() {
if (isEnable()) {
start();
} |
<<<<<<<
import cm.aptoide.aptoideviews.filters.Filter;
=======
import cm.aptoide.pt.search.SearchResultDiffModel;
>>>>>>>
import cm.aptoide.aptoideviews.filters.Filter;
import cm.aptoide.pt.search.SearchResultDiffModel;
<<<<<<<
void addAllStoresResult(String query, List<SearchAppResult> dataList);
=======
void addFollowedStoresResult(String query, SearchResultDiffModel dataList);
void addAllStoresResult(String query, SearchResultDiffModel dataList);
>>>>>>>
void addAllStoresResult(String query, SearchResultDiffModel dataList); |
<<<<<<<
downloadServiceHelper.startDownload(permissionRequest, appDownload)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(download -> manageDownload(download, displayable, app), err -> {
=======
>>>>>>>
<<<<<<<
.observeOn(AndroidSchedulers.mainThread())
.subscribe(onGoingDownload -> manageDownload(onGoingDownload, displayable, app), err -> {
=======
.subscribe(onGoingDownload -> {
manageDownload(onGoingDownload, displayable, app);
if(!resumeButtonWasClicked) {
// TODO: 09/09/16 refactor me
actionResume.setVisibility(View.GONE);
actionPause.setVisibility(View.VISIBLE);
resumeButtonWasClicked = true;
}}
, err -> {
>>>>>>>
.observeOn(AndroidSchedulers.mainThread())
.subscribe(onGoingDownload -> {
manageDownload(onGoingDownload, displayable, app);
if(!resumeButtonWasClicked) {
// TODO: 09/09/16 refactor me
actionResume.setVisibility(View.GONE);
actionPause.setVisibility(View.VISIBLE);
resumeButtonWasClicked = true;
}}
, err -> { |
<<<<<<<
private SystemNotificationShower systemNotificationShower;
private PublishRelay<NotificationInfo> notificationsPublishRelay;
private NotificationsCleaner notificationsCleaner;
=======
private SyncScheduler alarmSyncScheduler;
>>>>>>>
private SystemNotificationShower systemNotificationShower;
private PublishRelay<NotificationInfo> notificationsPublishRelay;
private NotificationsCleaner notificationsCleaner;
private SyncScheduler alarmSyncScheduler; |
<<<<<<<
import cm.aptoide.pt.dataprovider.ws.Api;
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor;
=======
>>>>>>>
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor; |
<<<<<<<
=======
import cm.aptoide.pt.v8engine.networking.image.ImageLoader;
import cm.aptoide.pt.v8engine.repository.InstalledRepository;
>>>>>>>
import cm.aptoide.pt.v8engine.networking.image.ImageLoader;
<<<<<<<
spotAndShareAnalytics, timelineAnalytics);
downloadFactory = new DownloadFactory();
=======
spotAndShareAnalytics, timelineAnalytics,
((V8Engine) getContext().getApplicationContext()).getDefaultSharedPreferences());
>>>>>>>
spotAndShareAnalytics, timelineAnalytics,
((V8Engine) getContext().getApplicationContext()).getDefaultSharedPreferences());
downloadFactory = new DownloadFactory();
<<<<<<<
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreThemeEnum.get(
V8Engine.getConfiguration()
.getDefaultTheme()));
=======
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(V8Engine.getConfiguration()
.getDefaultTheme()));
>>>>>>>
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(V8Engine.getConfiguration()
.getDefaultTheme()));
<<<<<<<
.flatMap(success -> installManager.uninstall(getContext(), packageName,
app.getFile()
.getVername())
.toObservable())
=======
.flatMap(success -> installManager.uninstall(packageName, app.getFile()
.getVername()))
>>>>>>>
.flatMap(success -> installManager.uninstall(packageName, app.getFile()
.getVername())
.toObservable())
<<<<<<<
public Observable<AppAction> installAction(String packageName, int versionCode) {
return installManager.getInstallationProgress(md5, packageName, versionCode)
.map(installationProgress -> installationProgress.getType())
.map(installationType -> {
AppAction action;
switch (installationType) {
case INSTALLED:
action = AppAction.OPEN;
break;
case INSTALL:
action = AppAction.INSTALL;
break;
case UPDATE:
action = AppAction.UPDATE;
break;
case DOWNGRADE:
action = AppAction.DOWNGRADE;
break;
default:
action = AppAction.INSTALL;
}
return action;
});
=======
public Observable<AppAction> installAction() {
InstalledAccessor installedAccessor = AccessorFactory.getAccessorFor(Installed.class);
return installedAccessor.getAsList(packageName)
.map(installedList -> {
if (installedList != null && installedList.size() > 0) {
Installed installed = installedList.get(0);
if (app.getFile()
.getVercode() == installed.getVersionCode()) {
//current installed version
return AppAction.OPEN;
} else if (app.getFile()
.getVercode() > installed.getVersionCode()) {
//update
return AppAction.UPDATE;
} else {
//downgrade
return AppAction.DOWNGRADE;
}
} else {
//app not installed
return AppAction.INSTALL;
}
});
>>>>>>>
public Observable<AppAction> installAction(String packageName, int versionCode) {
return installManager.getInstallationProgress(md5, packageName, versionCode)
.map(installationProgress -> installationProgress.getType())
.map(installationType -> {
AppAction action;
switch (installationType) {
case INSTALLED:
action = AppAction.OPEN;
break;
case INSTALL:
action = AppAction.INSTALL;
break;
case UPDATE:
action = AppAction.UPDATE;
break;
case DOWNGRADE:
action = AppAction.DOWNGRADE;
break;
default:
action = AppAction.INSTALL;
}
return action;
}); |
<<<<<<<
import cm.aptoide.pt.dataprovider.DataProvider;
import cm.aptoide.pt.dataprovider.ws.v7.BIUTMAnalyticsRequest;
import cm.aptoide.pt.dataprovider.ws.v7.BIUTMAnalyticsRequestBody;
import cm.aptoide.pt.dataprovider.ws.v7.BaseBody;
import cm.aptoide.pt.dataprovider.ws.v7.BodyInterceptor;
=======
import cm.aptoide.pt.dataprovider.model.v7.GetAppMeta;
>>>>>>>
import cm.aptoide.pt.dataprovider.DataProvider;
import cm.aptoide.pt.dataprovider.ws.v7.BIUTMAnalyticsRequest;
import cm.aptoide.pt.dataprovider.ws.v7.BIUTMAnalyticsRequestBody;
import cm.aptoide.pt.dataprovider.ws.v7.BaseBody;
import cm.aptoide.pt.dataprovider.ws.v7.BodyInterceptor;
import cm.aptoide.pt.dataprovider.model.v7.GetAppMeta;
<<<<<<<
import cm.aptoide.pt.model.v7.GetAppMeta;
import cm.aptoide.pt.networkclient.WebService;
=======
>>>>>>>
import cm.aptoide.pt.model.v7.GetAppMeta;
import cm.aptoide.pt.networkclient.WebService;
<<<<<<<
.filter(__ -> SecurePreferences.isFirstRun())
.doOnNext(__ -> setupDimensions(application))
.doOnCompleted(() -> {
firstLaunchAnalytics.sendFirstLaunchEvent(utmSource, utmMedium, utmCampaign,
utmContent, entryPoint);
UTMTrackingBuilder utmTrackingBuilder =
new UTMTrackingBuilder(getTracking(application), getUTM());
BIUTMAnalyticsRequestBody body =
new BIUTMAnalyticsRequestBody(utmTrackingBuilder.getUTMTrackingData());
BIUTMAnalyticsRequest.of(BI_ACTION, EVENT_NAME, CONTEXT, body, bodyInterceptor,
okHttpClient, converterFactory)
.observe()
.observeOn(Schedulers.io())
.subscribe(baseV7Response -> {
}, throwable -> throwable.printStackTrace());
})
=======
.filter(__ -> SecurePreferences.isFirstRun(
SecurePreferencesImplementation.getInstance(application.getApplicationContext(),
PreferenceManager.getDefaultSharedPreferences(application))))
.doOnNext(__ -> setupDimensions(application))
>>>>>>>
.filter(__ -> SecurePreferences.isFirstRun())
.doOnNext(__ -> setupDimensions(application))
.doOnCompleted(() -> {
firstLaunchAnalytics.sendFirstLaunchEvent(utmSource, utmMedium, utmCampaign,
utmContent, entryPoint);
UTMTrackingBuilder utmTrackingBuilder =
new UTMTrackingBuilder(getTracking(application), getUTM());
BIUTMAnalyticsRequestBody body =
new BIUTMAnalyticsRequestBody(utmTrackingBuilder.getUTMTrackingData());
BIUTMAnalyticsRequest.of(BI_ACTION, EVENT_NAME, CONTEXT, body, bodyInterceptor,
okHttpClient, converterFactory)
.observe()
.observeOn(Schedulers.io())
.subscribe(baseV7Response -> {
}, throwable -> throwable.printStackTrace());
})
<<<<<<<
private static UTM getUTM() {
return new UTM(utmSource, utmMedium, utmCampaign, utmContent, entryPoint);
}
private static void setupDimensions(android.app.Application application) {
if (!checkForUTMFileInMetaINF(application)) {
=======
private static void setupDimensions(android.app.Application application) {
if (!checkForUTMFileInMetaINF(application)) {
>>>>>>>
private static UTM getUTM() {
return new UTM(utmSource, utmMedium, utmCampaign, utmContent, entryPoint);
}
private static void setupDimensions(android.app.Application application) {
if (!checkForUTMFileInMetaINF(application)) { |
<<<<<<<
=======
import android.view.WindowManager;
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.InstalledAccessor;
>>>>>>>
import android.view.WindowManager;
<<<<<<<
SocialRepository socialRepository, InstalledRepository installedRepository) {
super(article, timelineAnalytics);
=======
SocialRepository socialRepository, WindowManager windowManager) {
super(article, timelineAnalytics, windowManager);
>>>>>>>
SocialRepository socialRepository, InstalledRepository installedRepository,
WindowManager windowManager) {
super(article, timelineAnalytics, windowManager);
<<<<<<<
TimelineAnalytics timelineAnalytics, SocialRepository socialRepository,
InstalledRepository installedRepository) {
=======
TimelineAnalytics timelineAnalytics, SocialRepository socialRepository,
WindowManager windowManager) {
>>>>>>>
TimelineAnalytics timelineAnalytics, SocialRepository socialRepository,
InstalledRepository installedRepository, WindowManager windowManager) {
<<<<<<<
spannableFactory, timelineAnalytics, socialRepository, installedRepository);
=======
spannableFactory, timelineAnalytics, socialRepository, windowManager);
>>>>>>>
spannableFactory, timelineAnalytics, socialRepository, installedRepository, windowManager); |
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_ONLY, 0, null, "editorsChoice", "origin", false,
"marketName", false, false, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false,
null, null);
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_ONLY, 0, null, "editorsChoice", "origin", false,
"marketName", false, false, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false,
null, null);
<<<<<<<
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null, null,
"weburls", false, false, "paid path", "no", true, "aptoide",
AppViewFragment.OpenType.OPEN_ONLY, 0, null, "editorsChoice", "origin", false,
"marketName", false, false, bdsFlags, "", "", false, null, null);
=======
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false);
>>>>>>>
Collections.emptyList(), Collections.emptyList()), "modified", "app added", null,
"weburls", true, "aptoide", AppViewFragment.OpenType.OPEN_ONLY, 0, null,
"editorsChoice", "origin", false, "marketName", false, false, bdsFlags, "", "", false,
null, null); |
<<<<<<<
appPreferences.getImageCachePath()).create(getContext(), InstallerFactory.ROLLBACK);
=======
((AptoideApplication) getContext().getApplicationContext()
.getApplicationContext()).getImageCachePath()).create(getContext(),
InstallerFactory.ROLLBACK);
setHasOptionsMenu(true);
>>>>>>>
appPreferences.getImageCachePath()).create(getContext(), InstallerFactory.ROLLBACK);
setHasOptionsMenu(true); |
<<<<<<<
import android.support.annotation.NonNull;
import android.util.Log;
import cm.aptoide.pt.analytics.AnalyticsDataSaver;
=======
import android.support.annotation.NonNull;
>>>>>>>
import android.support.annotation.NonNull;
import android.util.Log;
import cm.aptoide.pt.analytics.AnalyticsDataSaver;
<<<<<<<
private AnalyticsManager(Map<EventLogger, Collection<String>> eventSenders,
AnalyticsDataSaver analyticsDataSaver) {
=======
private AnalyticsManager(HttpKnockEventLogger knockLogger,
Map<EventLogger, Collection<String>> eventSenders) {
this.knockEventLogger = knockLogger;
>>>>>>>
private AnalyticsManager(HttpKnockEventLogger knockLogger, Map<EventLogger, Collection<String>> eventSenders,
AnalyticsDataSaver analyticsDataSaver) {
this.knockEventLogger = knockLogger;
<<<<<<<
public void logEvent(Event event){
logEvent(event.getData(),event.getEventName(), event.getAction(),event.getContext());
}
public void logEvent(String url){
Log.d("TAG",url);
}
public void save(@NonNull String key, @NonNull Event event){
analyticsDataSaver.save(key,event);
}
public void sendAndRemoveEvent(String eventName){
Event event = analyticsDataSaver.newGet(eventName);
logEvent(event.getData(),event.getEventName(), event.getAction(), event.getContext());
}
public Event getEvent(String key){
return analyticsDataSaver.newGet(key);
}
=======
public void logEvent(@NonNull String url) {
knockEventLogger.log(url);
}
public void setup() {
for (Map.Entry<EventLogger, Collection<String>> senderEntry : eventSenders.entrySet()) {
senderEntry.getKey()
.setup();
}
}
>>>>>>>
public void logEvent(Event event){
logEvent(event.getData(),event.getEventName(), event.getAction(),event.getContext());
}
public void logEvent(@NonNull String url) {
knockEventLogger.log(url);
}
public void setup() {
for (Map.Entry<EventLogger, Collection<String>> senderEntry : eventSenders.entrySet()) {
senderEntry.getKey()
.setup();
}
}
public void save(@NonNull String key, @NonNull Event event){
analyticsDataSaver.save(key,event);
}
public void sendAndRemoveEvent(String eventName){
Event event = analyticsDataSaver.newGet(eventName);
logEvent(event.getData(),event.getEventName(), event.getAction(), event.getContext());
}
public Event getEvent(String key){
return analyticsDataSaver.newGet(key);
}
<<<<<<<
private AnalyticsDataSaver analyticsDataSaver;
=======
private HttpKnockEventLogger httpKnockEventLogger;
>>>>>>>
private HttpKnockEventLogger httpKnockEventLogger;
private AnalyticsDataSaver analyticsDataSaver;
<<<<<<<
public Builder addDataSaver(AnalyticsDataSaver analyticsDataSaver) {
this.analyticsDataSaver=analyticsDataSaver;
return this;
}
=======
public Builder setKnockLogger(HttpKnockEventLogger httpKnockEventLogger) {
this.httpKnockEventLogger = httpKnockEventLogger;
return this;
}
>>>>>>>
public Builder setKnockLogger(HttpKnockEventLogger httpKnockEventLogger) {
this.httpKnockEventLogger = httpKnockEventLogger;
return this;
}
public Builder addDataSaver(AnalyticsDataSaver analyticsDataSaver) {
this.analyticsDataSaver=analyticsDataSaver;
return this;
}
<<<<<<<
return new AnalyticsManager(eventSenders, analyticsDataSaver);
=======
if (httpKnockEventLogger == null) {
throw new IllegalArgumentException("Analytics manager need an okhttp client");
}
if (eventSenders.size() < 1) {
throw new IllegalArgumentException("Analytics manager need at least one logger");
}
return new AnalyticsManager(httpKnockEventLogger, eventSenders);
>>>>>>>
if (httpKnockEventLogger == null) {
throw new IllegalArgumentException("Analytics manager need an okhttp client");
}
if (eventSenders.size() < 1) {
throw new IllegalArgumentException("Analytics manager need at least one logger");
}
return new AnalyticsManager(httpKnockEventLogger, eventSenders, analyticsDataSaver); |
<<<<<<<
private LikeButton likeButton;
=======
>>>>>>>
<<<<<<<
likeButton = (LikeButton) itemView.findViewById(R.id.social_like_test);
=======
>>>>>>>
//likeButton = (LikeButton) itemView.findViewById(R.id.social_like_test); |
<<<<<<<
=======
import cm.aptoide.pt.abtesting.SearchExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubBannerAdExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubNativeAdExperiment;
>>>>>>>
import cm.aptoide.pt.abtesting.SearchExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubBannerAdExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubNativeAdExperiment;
<<<<<<<
private final MoPubAdsManager moPubAdsManager;
=======
private final MoPubBannerAdExperiment moPubBannerAdExperiment;
private final MoPubNativeAdExperiment moPubNativeAdExperiment;
private final SearchExperiment searchExperiment;
>>>>>>>
private final MoPubAdsManager moPubAdsManager;
private final SearchExperiment searchExperiment;
<<<<<<<
Database database, AptoideAccountManager accountManager, MoPubAdsManager moPubAdsManager) {
=======
Database database, AptoideAccountManager accountManager,
MoPubBannerAdExperiment moPubBannerAdExperiment,
MoPubNativeAdExperiment moPubNativeAdExperiment, SearchExperiment searchExperiment) {
>>>>>>>
Database database, AptoideAccountManager accountManager, MoPubAdsManager moPubAdsManager, SearchExperiment searchExperiment) {
<<<<<<<
this.moPubAdsManager = moPubAdsManager;
=======
this.moPubBannerAdExperiment = moPubBannerAdExperiment;
this.moPubNativeAdExperiment = moPubNativeAdExperiment;
this.searchExperiment = searchExperiment;
>>>>>>>
this.moPubAdsManager = moPubAdsManager;
this.searchExperiment = searchExperiment; |
<<<<<<<
@Inject @Named("aptoide-theme") String theme;
=======
@Inject @Named("marketName") String marketName;
>>>>>>>
@Inject @Named("marketName") String marketName;
@Inject @Named("aptoide-theme") String theme; |
<<<<<<<
import java.util.List;
import rx.android.schedulers.AndroidSchedulers;
=======
import cm.aptoide.pt.v8engine.view.DeepLinkManager;
import cm.aptoide.pt.v8engine.view.navigator.FragmentNavigator;
import cm.aptoide.pt.v8engine.view.store.home.HomeFragment;
import cm.aptoide.pt.v8engine.view.wizard.WizardFragment;
>>>>>>>
import cm.aptoide.pt.v8engine.view.DeepLinkManager;
import cm.aptoide.pt.v8engine.view.navigator.FragmentNavigator;
import cm.aptoide.pt.v8engine.view.store.home.HomeFragment;
import cm.aptoide.pt.v8engine.view.wizard.WizardFragment;
import java.util.List;
import rx.android.schedulers.AndroidSchedulers;
<<<<<<<
private final InstallManager installManager;
private final RootInstallationRetryHandler rootInstallationRetryHandler;
private final CrashReport crashReport;
private NotificationSyncScheduler notificationSyncScheduler;
private InstallCompletedNotifier installCompletedNotifier;
private ApkFy apkFy;
private AutoUpdate autoUpdate;
=======
private final NotificationSyncScheduler notificationSyncScheduler;
private final ApkFy apkFy;
private final AutoUpdate autoUpdate;
private final SharedPreferences sharedPreferences;
private final SharedPreferences securePreferences;
private final CrashReport crashReport;
private final FragmentNavigator fragmentNavigator;
private final DeepLinkManager deepLinkManager;
>>>>>>>
private final InstallManager installManager;
private final RootInstallationRetryHandler rootInstallationRetryHandler;
private final CrashReport crashReport;
private final SharedPreferences sharedPreferences;
private final SharedPreferences securePreferences;
private final FragmentNavigator fragmentNavigator;
private final DeepLinkManager deepLinkManager;
private NotificationSyncScheduler notificationSyncScheduler;
private InstallCompletedNotifier installCompletedNotifier;
private ApkFy apkFy;
private AutoUpdate autoUpdate;
<<<<<<<
public MainPresenter(MainView view, InstallManager installManager,
RootInstallationRetryHandler rootInstallationRetryHandler, CrashReport crashReport,
ApkFy apkFy, AutoUpdate autoUpdate, ContentPuller contentPuller,
NotificationSyncScheduler notificationSyncScheduler,
InstallCompletedNotifier installCompletedNotifier) {
=======
public MainPresenter(MainView view, ApkFy apkFy, AutoUpdate autoUpdate,
ContentPuller contentPuller, NotificationSyncScheduler notificationSyncScheduler,
SharedPreferences sharedPreferences, SharedPreferences securePreferences,
CrashReport crashReport, FragmentNavigator fragmentNavigator,
DeepLinkManager deepLinkManager) {
>>>>>>>
public MainPresenter(MainView view, InstallManager installManager,
RootInstallationRetryHandler rootInstallationRetryHandler, CrashReport crashReport,
ApkFy apkFy, AutoUpdate autoUpdate, ContentPuller contentPuller,
NotificationSyncScheduler notificationSyncScheduler,
InstallCompletedNotifier installCompletedNotifier, SharedPreferences sharedPreferences,
SharedPreferences securePreferences, FragmentNavigator fragmentNavigator,
DeepLinkManager deepLinkManager) {
<<<<<<<
this.installCompletedNotifier = installCompletedNotifier;
=======
this.crashReport = crashReport;
this.fragmentNavigator = fragmentNavigator;
this.deepLinkManager = deepLinkManager;
>>>>>>>
this.installCompletedNotifier = installCompletedNotifier;
this.fragmentNavigator = fragmentNavigator;
this.deepLinkManager = deepLinkManager;
<<<<<<<
.subscribe(created -> {
view.showHome();
contentPuller.start();
if (ManagerPreferences.isCheckAutoUpdateEnable() && !V8Engine.isAutoUpdateWasCalled()) {
// only call auto update when the app was not on the background
autoUpdate.execute();
}
if (view.showDeepLink()) {
SecurePreferences.setWizardAvailable(false);
} else {
if (SecurePreferences.isWizardAvailable()) {
view.showWizard();
SecurePreferences.setWizardAvailable(false);
}
}
}, throwable -> crashReport.log(throwable));
setupInstallErrorsDisplay();
=======
.doOnNext(__ -> contentPuller.start())
.doOnNext(__ -> navigate())
.subscribe(__ -> {
}, throwable -> crashReport.log(throwable));
>>>>>>>
.doOnNext(__ -> contentPuller.start())
.doOnNext(__ -> navigate())
.subscribe(__ -> {
}, throwable -> crashReport.log(throwable));
setupInstallErrorsDisplay();
<<<<<<<
private void setupInstallErrorsDisplay() {
view.getLifecycle()
.filter(event -> View.LifecycleEvent.RESUME.equals(event))
.flatMap(lifecycleEvent -> rootInstallationRetryHandler.retries()
.compose(view.bindUntilEvent(View.LifecycleEvent.PAUSE)))
.distinctUntilChanged(installationProgresses -> installationProgresses.size())
.filter(installationProgresses -> installationProgresses.size() > 0)
.observeOn(AndroidSchedulers.mainThread())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(installationProgresses -> {
watchInstalls(installationProgresses);
view.showInstallationError(installationProgresses.size());
}, throwable -> crashReport.log(throwable));
view.getLifecycle()
.filter(lifecycleEvent -> View.LifecycleEvent.RESUME.equals(lifecycleEvent))
.flatMap(lifecycleEvent -> installManager.getTimedOutInstallations())
.filter(installationProgresses -> installationProgresses.size() == 0)
.observeOn(AndroidSchedulers.mainThread())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(noInstallErrors -> view.dismissInstallationError(),
throwable -> crashReport.log(throwable));
installCompletedNotifier.getWatcher()
.subscribe(allInstallsCompleted -> view.showInstallationSuccessMessage());
view.getLifecycle()
.filter(lifecycleEvent -> View.LifecycleEvent.RESUME.equals(lifecycleEvent))
.flatMap(lifecycleEvent -> view.getInstallErrorsDismiss())
.flatMapCompletable(click -> installManager.cleanTimedOutInstalls())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(timeoutErrorsCleaned -> {
}, throwable -> crashReport.log(throwable));
}
private void watchInstalls(List<InstallationProgress> installationProgresses) {
for (InstallationProgress installationProgress : installationProgresses) {
installCompletedNotifier.add(installationProgress.getPackageName(),
installationProgress.getVersionCode(), installationProgress.getMd5());
}
}
=======
// FIXME we are showing home by default when we should decide were to go here and provide
// proper up/back navigation to home if needed
private void navigate() {
showHome();
if (ManagerPreferences.isCheckAutoUpdateEnable(sharedPreferences)
&& !V8Engine.isAutoUpdateWasCalled()) {
// only call auto update when the app was not on the background
autoUpdate.execute();
}
if (deepLinkManager.showDeepLink(view.getIntentAfterCreate())) {
SecurePreferences.setWizardAvailable(false, securePreferences);
} else {
if (SecurePreferences.isWizardAvailable(securePreferences)) {
showWizard();
SecurePreferences.setWizardAvailable(false, securePreferences);
}
}
}
private void showWizard() {
fragmentNavigator.navigateTo(WizardFragment.newInstance());
}
private void showHome() {
Fragment home = HomeFragment.newInstance(V8Engine.getConfiguration()
.getDefaultStore(), StoreContext.home, V8Engine.getConfiguration()
.getDefaultTheme());
fragmentNavigator.navigateToWithoutBackSave(home);
}
>>>>>>>
private void setupInstallErrorsDisplay() {
view.getLifecycle()
.filter(event -> View.LifecycleEvent.RESUME.equals(event))
.flatMap(lifecycleEvent -> rootInstallationRetryHandler.retries()
.compose(view.bindUntilEvent(View.LifecycleEvent.PAUSE)))
.distinctUntilChanged(installationProgresses -> installationProgresses.size())
.filter(installationProgresses -> installationProgresses.size() > 0)
.observeOn(AndroidSchedulers.mainThread())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(installationProgresses -> {
watchInstalls(installationProgresses);
view.showInstallationError(installationProgresses.size());
}, throwable -> crashReport.log(throwable));
view.getLifecycle()
.filter(lifecycleEvent -> View.LifecycleEvent.RESUME.equals(lifecycleEvent))
.flatMap(lifecycleEvent -> installManager.getTimedOutInstallations())
.filter(installationProgresses -> installationProgresses.size() == 0)
.observeOn(AndroidSchedulers.mainThread())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(noInstallErrors -> view.dismissInstallationError(),
throwable -> crashReport.log(throwable));
installCompletedNotifier.getWatcher()
.subscribe(allInstallsCompleted -> view.showInstallationSuccessMessage());
view.getLifecycle()
.filter(lifecycleEvent -> View.LifecycleEvent.RESUME.equals(lifecycleEvent))
.flatMap(lifecycleEvent -> view.getInstallErrorsDismiss())
.flatMapCompletable(click -> installManager.cleanTimedOutInstalls())
.compose(view.bindUntilEvent(View.LifecycleEvent.DESTROY))
.subscribe(timeoutErrorsCleaned -> {
}, throwable -> crashReport.log(throwable));
}
// FIXME we are showing home by default when we should decide were to go here and provide
// proper up/back navigation to home if needed
private void navigate() {
showHome();
if (ManagerPreferences.isCheckAutoUpdateEnable(sharedPreferences)
&& !V8Engine.isAutoUpdateWasCalled()) {
// only call auto update when the app was not on the background
autoUpdate.execute();
}
if (deepLinkManager.showDeepLink(view.getIntentAfterCreate())) {
SecurePreferences.setWizardAvailable(false, securePreferences);
} else {
if (SecurePreferences.isWizardAvailable(securePreferences)) {
showWizard();
SecurePreferences.setWizardAvailable(false, securePreferences);
}
}
}
private void showWizard() {
fragmentNavigator.navigateTo(WizardFragment.newInstance());
}
private void showHome() {
Fragment home = HomeFragment.newInstance(V8Engine.getConfiguration()
.getDefaultStore(), StoreContext.home, V8Engine.getConfiguration()
.getDefaultTheme());
fragmentNavigator.navigateToWithoutBackSave(home);
}
private void watchInstalls(List<InstallationProgress> installationProgresses) {
for (InstallationProgress installationProgress : installationProgresses) {
installCompletedNotifier.add(installationProgress.getPackageName(),
installationProgress.getVersionCode(), installationProgress.getMd5());
}
} |
<<<<<<<
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
=======
>>>>>>> |
<<<<<<<
if (oldVersion == 8097) {
schema.create("RealmLocalNotificationSync")
.addField("notificationId", String.class, FieldAttribute.PRIMARY_KEY)
.addField("title", String.class)
.addField("body", String.class)
.addField("image", String.class)
.addField("navigationUrl", String.class)
.addField("trigger", long.class)
.addField("id", String.class);
oldVersion++;
}
=======
if (oldVersion == 8097) {
schema.get("Download")
.addField("hasAppc", boolean.class);
schema.get("Update")
.addField("hasAppc", boolean.class);
oldVersion++;
}
>>>>>>>
if (oldVersion == 8097) {
schema.create("RealmLocalNotificationSync")
.addField("notificationId", String.class, FieldAttribute.PRIMARY_KEY)
.addField("title", String.class)
.addField("body", String.class)
.addField("image", String.class)
.addField("navigationUrl", String.class)
.addField("trigger", long.class)
.addField("id", String.class);
oldVersion++;
}
if (oldVersion == 8097) {
schema.get("Download")
.addField("hasAppc", boolean.class);
schema.get("Update")
.addField("hasAppc", boolean.class);
oldVersion++;
} |
<<<<<<<
private DownloadFactory downloadFactory;
=======
private TimelineAnalytics timelineAnalytics;
private AppViewAnalytics appViewAnalytics;
>>>>>>>
private DownloadFactory downloadFactory;
private TimelineAnalytics timelineAnalytics;
private AppViewAnalytics appViewAnalytics;
<<<<<<<
spotAndShareAnalytics);
downloadFactory = new DownloadFactory();
=======
spotAndShareAnalytics, timelineAnalytics);
appViewAnalytics = new AppViewAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext()));
>>>>>>>
spotAndShareAnalytics, timelineAnalytics);
downloadFactory = new DownloadFactory();
appViewAnalytics = new AppViewAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext()));
<<<<<<<
installedRepository, downloadFactory);
=======
installedRepository, timelineAnalytics, appViewAnalytics);
>>>>>>>
installedRepository, downloadFactory, timelineAnalytics, appViewAnalytics); |
<<<<<<<
import cm.aptoide.pt.v8engine.timeline.post.PostFragment;
=======
import cm.aptoide.pt.v8engine.timeline.TimelineAnalytics;
>>>>>>>
import cm.aptoide.pt.v8engine.timeline.TimelineAnalytics;
import cm.aptoide.pt.v8engine.timeline.post.PostFragment;
<<<<<<<
AptoideAccountManager accountManager, Long userId, Long storeId, StoreContext storeContext,
Resources resources, FragmentNavigator fragmentNavigator) {
=======
AptoideAccountManager accountManager, TimelineAnalytics timelineAnalytics, Long userId,
Long storeId, StoreContext storeContext, Resources resources) {
>>>>>>>
AptoideAccountManager accountManager, TimelineAnalytics timelineAnalytics, Long userId,
Long storeId, StoreContext storeContext, Resources resources,
FragmentNavigator fragmentNavigator) { |
<<<<<<<
=======
import cm.aptoide.pt.download.DownloadAnalytics;
import cm.aptoide.pt.download.DownloadCompleteAnalytics;
import cm.aptoide.pt.download.DownloadMirrorEventInterceptor;
import cm.aptoide.pt.download.PaidAppsDownloadInterceptor;
>>>>>>>
<<<<<<<
=======
import cm.aptoide.pt.networking.UserAgentInterceptor;
import cm.aptoide.pt.notification.NotificationAnalytics;
>>>>>>>
import cm.aptoide.pt.notification.NotificationAnalytics;
<<<<<<<
@Inject @Named("multipart") MultipartBodyInterceptor multipartBodyInterceptor;
private NotificationService pnpV1NotificationService;
=======
private MultipartBodyInterceptor multipartBodyInterceptor;
>>>>>>>
@Inject @Named("multipart") MultipartBodyInterceptor multipartBodyInterceptor;
private NotificationService pnpV1NotificationService;
<<<<<<<
private NotificationSyncScheduler notificationSyncScheduler;
@Inject RootAvailabilityManager rootAvailabilityManager;
=======
private RootAvailabilityManager rootAvailabilityManager;
>>>>>>>
private NotificationSyncScheduler notificationSyncScheduler;
@Inject RootAvailabilityManager rootAvailabilityManager;
<<<<<<<
=======
dispatchPostReadEventInterval().subscribe(() -> {
}, throwable -> CrashReport.getInstance()
.log(throwable));
systemNotificationShower = getSystemNotificationShower();
>>>>>>>
dispatchPostReadEventInterval().subscribe(() -> {
}, throwable -> CrashReport.getInstance()
.log(throwable));
systemNotificationShower = getSystemNotificationShower();
<<<<<<<
new RootInstallationRetryHandler(notificationId, systemNotificationShower,
getRollbackInstallManager(), PublishRelay.create(), 0, this,
=======
new RootInstallationRetryHandler(notificationId, getSystemNotificationShower(),
getInstallManager(InstallerFactory.ROLLBACK), PublishRelay.create(), 0, this,
>>>>>>>
new RootInstallationRetryHandler(notificationId, getSystemNotificationShower(),
getInstallManager(InstallerFactory.ROLLBACK), PublishRelay.create(), 0, this,
<<<<<<<
public NotificationSyncScheduler getNotificationSyncScheduler() {
if (notificationSyncScheduler == null) {
notificationSyncScheduler = new NotificationSyncManager(getSyncScheduler(), true,
new NotificationSyncFactory(defaultSharedPreferences, getPnpV1NotificationService(),
getNotificationProvider()));
}
return notificationSyncScheduler;
}
public SyncScheduler getSyncScheduler() {
if (syncScheduler == null) {
syncScheduler =
new SyncScheduler(this, SyncService.class, (AlarmManager) getSystemService(ALARM_SERVICE),
getSyncStorage());
}
return syncScheduler;
}
=======
public abstract NotificationSyncScheduler getNotificationSyncScheduler();
>>>>>>>
public abstract NotificationSyncScheduler getNotificationSyncScheduler();
<<<<<<<
public NotificationService getPnpV1NotificationService() {
if (pnpV1NotificationService == null) {
pnpV1NotificationService =
new PnpV1NotificationService(BuildConfig.APPLICATION_ID, getDefaultClient(),
WebService.getDefaultConverter(), idsRepository, BuildConfig.VERSION_NAME,
getExtraId(), defaultSharedPreferences, getResources(), authenticationPersistence,
getAccountManager());
}
return pnpV1NotificationService;
}
=======
>>>>>>>
<<<<<<<
=======
final OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder();
okHttpClientBuilder.readTimeout(45, TimeUnit.SECONDS);
okHttpClientBuilder.writeTimeout(45, TimeUnit.SECONDS);
final Cache cache = new Cache(getCacheDir(), 10 * 1024 * 1024);
try {
// For billing to handle stale data properly the cache should only be stored in memory.
// In order to make sure it happens we clean up all data persisted in disk when client
// is first created. It only affects API calls with GET verb.
cache.evictAll();
} catch (IOException ignored) {}
okHttpClientBuilder.cache(cache); // 10 MiB
okHttpClientBuilder.addInterceptor(new POSTCacheInterceptor(getHttpClientCache()));
okHttpClientBuilder.addInterceptor(getUserAgentInterceptor());
if (ToolboxManager.isToolboxEnableRetrofitLogs(getDefaultSharedPreferences())) {
okHttpClientBuilder.addInterceptor(getToolboxRetrofitLogsInterceptor());
}
defaultClient = okHttpClientBuilder.build();
>>>>>>>
<<<<<<<
new BillingPool(defaultSharedPreferences, getBodyInterceptorV3(), getDefaultClient(),
getAccountManager(), database, getResources(), getPackageRepository(),
getTokenInvalidator(), getSyncScheduler(), getInAppBillingSerializer(),
=======
new BillingPool(getDefaultSharedPreferences(), getBodyInterceptorV3(), getDefaultClient(),
getAccountManager(), getDatabase(), getResources(), getPackageRepository(),
getTokenInvalidator(),
new RxSyncScheduler(new HashMap<>(), CrashReport.getInstance()),
getInAppBillingSerializer(),
>>>>>>>
new BillingPool(getDefaultSharedPreferences(), getBodyInterceptorV3(), getDefaultClient(),
getAccountManager(), getDatabase(), getResources(), getPackageRepository(),
getTokenInvalidator(),
new RxSyncScheduler(new HashMap<>(), CrashReport.getInstance()),
getInAppBillingSerializer(),
<<<<<<<
=======
accountAnalytics = new AccountAnalytics(Analytics.getInstance(), getBodyInterceptorPoolV7(),
getDefaultClient(), WebService.getDefaultConverter(), getTokenInvalidator(),
BuildConfig.APPLICATION_ID, getDefaultSharedPreferences(),
AppEventsLogger.newLogger(this), getNavigationTracker(), CrashReport.getInstance());
>>>>>>>
<<<<<<<
public IdsRepository getIdsRepository() {
return idsRepository;
}
=======
public ReadPostsPersistence getReadPostsPersistence() {
if (readPostsPersistence == null) {
readPostsPersistence = new ReadPostsPersistence(new ArrayList<>());
}
return readPostsPersistence;
}
private Completable dispatchPostReadEventInterval() {
return Observable.interval(10, TimeUnit.SECONDS)
.switchMap(__ -> getReadPostsPersistence().getPosts(10)
.toObservable()
.filter(postReads -> !postReads.isEmpty())
.flatMap(postsRead -> PostReadRequest.of(postsRead, getBodyInterceptorPoolV7(),
getDefaultClient(), WebService.getDefaultConverter(), getTokenInvalidator(),
getDefaultSharedPreferences())
.observe()
.flatMapCompletable(___ -> getReadPostsPersistence().removePosts(postsRead)))
.repeatWhen(completed -> completed.takeWhile(
____ -> !getReadPostsPersistence().isPostsEmpty())))
.toCompletable();
}
public SyncScheduler getAlarmSyncScheduler() {
if (alarmSyncScheduler == null) {
alarmSyncScheduler = new AlarmSyncScheduler(this, AlarmSyncService.class,
(AlarmManager) getSystemService(ALARM_SERVICE), getSyncStorage());
}
return alarmSyncScheduler;
}
>>>>>>>
public ReadPostsPersistence getReadPostsPersistence() {
if (readPostsPersistence == null) {
readPostsPersistence = new ReadPostsPersistence(new ArrayList<>());
}
return readPostsPersistence;
}
private Completable dispatchPostReadEventInterval() {
return Observable.interval(10, TimeUnit.SECONDS)
.switchMap(__ -> getReadPostsPersistence().getPosts(10)
.toObservable()
.filter(postReads -> !postReads.isEmpty())
.flatMap(postsRead -> PostReadRequest.of(postsRead, getBodyInterceptorPoolV7(),
getDefaultClient(), WebService.getDefaultConverter(), getTokenInvalidator(),
getDefaultSharedPreferences())
.observe()
.flatMapCompletable(___ -> getReadPostsPersistence().removePosts(postsRead)))
.repeatWhen(completed -> completed.takeWhile(
____ -> !getReadPostsPersistence().isPostsEmpty())))
.toCompletable();
}
public SyncScheduler getAlarmSyncScheduler() {
if (alarmSyncScheduler == null) {
}
return alarmSyncScheduler;
}
public IdsRepository getIdsRepository() {
return idsRepository;
} |
<<<<<<<
import net.rrm.ehour.activity.service.ActivityService;
import net.rrm.ehour.domain.Activity;
import net.rrm.ehour.domain.ActivityMother;
=======
import com.google.common.collect.Lists;
>>>>>>>
import com.google.common.collect.Lists;
import net.rrm.ehour.activity.service.ActivityService;
<<<<<<<
=======
import net.rrm.ehour.domain.ProjectObjectMother;
import net.rrm.ehour.domain.User;
import net.rrm.ehour.domain.UserObjectMother;
>>>>>>>
import net.rrm.ehour.domain.ProjectObjectMother;
import net.rrm.ehour.domain.User;
import net.rrm.ehour.domain.UserObjectMother;
<<<<<<<
=======
@Mock
private UserService userService;
@Mock
private AggregateReportService aggregateReportService;
@Mock
private ProjectAssignmentManagementService projectAssignmentManagementService;
>>>>>>>
@Mock
private UserService userService;
@Mock
private ActivityService activityService;
<<<<<<<
projectDao = createMock(ProjectDao.class);
UserService userService = createMock(UserService.class);
ActivityService activityService = createMock(ActivityService.class);
projectService = new ProjectServiceImpl(projectDao, activityService, userService);
=======
projectService = new ProjectServiceImpl(projectDao, projectAssignmentManagementService, aggregateReportService, userService);
>>>>>>>
projectService = new ProjectServiceImpl(projectDao, activityService, userService);
<<<<<<<
public void should_create_project() {
Project project = new Project(1);
expect(projectDao.persist(project)).andReturn(project);
replay(projectDao);
=======
public void should_create_or_update_project() {
Project project = ProjectObjectMother.createProject(1);
User pm = UserObjectMother.createUser();
project.setProjectManager(pm);
>>>>>>>
public void should_create_or_update_project() {
Project project = ProjectObjectMother.createProject(1);
User pm = UserObjectMother.createUser();
project.setProjectManager(pm);
<<<<<<<
verify(projectDao);
=======
verify(projectDao).persist(project);
verify(projectAssignmentManagementService).assignAllUsersToProject(project);
>>>>>>>
verify(projectDao).persist(project); |
<<<<<<<
if (!installAppSizeValidator.hasEnoughSpaceToInstallApp(savedDownload.getSize())) {
download.setOverallDownloadStatus(RoomDownload.ERROR);
download.setDownloadError(RoomDownload.NOT_ENOUGH_SPACE_ERROR);
=======
if (!installAppSizeValidator.hasEnoughSpaceToInstallApp(savedDownload)) {
download.setOverallDownloadStatus(Download.ERROR);
download.setDownloadError(Download.NOT_ENOUGH_SPACE_ERROR);
>>>>>>>
if (!installAppSizeValidator.hasEnoughSpaceToInstallApp(savedDownload)) {
download.setOverallDownloadStatus(RoomDownload.ERROR);
download.setDownloadError(RoomDownload.NOT_ENOUGH_SPACE_ERROR);
<<<<<<<
case RoomDownload.IN_QUEUE:
case RoomDownload.WAITING_TO_MOVE_FILES:
=======
case Download.IN_QUEUE:
case Download.VERIFYING_FILE_INTEGRITY:
case Download.WAITING_TO_MOVE_FILES:
>>>>>>>
case RoomDownload.IN_QUEUE:
case RoomDownload.VERIFYING_FILE_INTEGRITY:
case RoomDownload.WAITING_TO_MOVE_FILES: |
<<<<<<<
import cm.aptoide.pt.view.settings.NewAccountFragment;
=======
import cm.aptoide.pt.store.view.my.MyStoresFragment;
>>>>>>>
import cm.aptoide.pt.view.settings.NewAccountFragment;
import cm.aptoide.pt.store.view.my.MyStoresFragment;
<<<<<<<
selectedFragment = new NewAccountFragment();
=======
selectedFragment =
MyStoresFragment.newInstance(getStoreEvent(), "default", "stores", StoreContext.home);
>>>>>>>
selectedFragment =
MyStoresFragment.newInstance(getStoreEvent(), "default", "stores", StoreContext.home); |
<<<<<<<
import cm.aptoide.pt.imageloader.ImageLoader;
=======
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.InstalledAccessor;
import cm.aptoide.pt.database.realm.Download;
import cm.aptoide.pt.database.realm.Installed;
>>>>>>>
<<<<<<<
import cm.aptoide.pt.v8engine.install.InstalledRepository;
=======
import cm.aptoide.pt.v8engine.networking.image.ImageLoader;
>>>>>>>
import cm.aptoide.pt.v8engine.install.InstalledRepository;
import cm.aptoide.pt.v8engine.networking.image.ImageLoader;
<<<<<<<
.flatMapCompletable(
click -> displayable.downloadAndInstall(context, (PermissionService) context))
=======
.flatMap(click -> displayable.downloadAndInstall(context, (PermissionService) context,
getContext().getResources()))
>>>>>>>
.flatMapCompletable(
click -> displayable.downloadAndInstall(context, (PermissionService) context,
getContext().getResources())) |
<<<<<<<
import android.view.Window;
=======
import android.widget.Button;
import android.widget.ImageView;
>>>>>>>
import android.widget.Button;
import android.widget.ImageView;
import android.view.Window;
<<<<<<<
import cm.aptoide.pt.store.StoreTheme;
import cm.aptoide.pt.util.AppBarStateChangeListener;
=======
import cm.aptoide.pt.app.DownloadModel;
import cm.aptoide.pt.networking.image.ImageLoader;
import cm.aptoide.pt.utils.AptoideUtils;
>>>>>>>
import cm.aptoide.pt.app.DownloadModel;
import cm.aptoide.pt.networking.image.ImageLoader;
import cm.aptoide.pt.utils.AptoideUtils;
import cm.aptoide.pt.store.StoreTheme;
import cm.aptoide.pt.util.AppBarStateChangeListener;
<<<<<<<
private Window window;
private Toolbar toolbar;
private Drawable backArrow;
private AppBarLayout appBarLayout;
private CollapsingToolbarLayout collapsingToolbarLayout;
private TextView toolbarTitle;
=======
private View walletActiveView;
private View walletInactiveView;
>>>>>>>
private View walletActiveView;
private View walletInactiveView;
private Window window;
private Toolbar toolbar;
private Drawable backArrow;
private AppBarLayout appBarLayout;
private CollapsingToolbarLayout collapsingToolbarLayout;
private TextView toolbarTitle;
<<<<<<<
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.setStatusBarColor(getResources().getColor(R.color.black_87_alpha));
}
toolbarTitle = view.findViewById(R.id.toolbar_title);
toolbar = (Toolbar) view.findViewById(R.id.toolbar);
toolbar.setTitle("");
AppCompatActivity appCompatActivity = ((AppCompatActivity) getActivity());
appCompatActivity.setSupportActionBar(toolbar);
ActionBar actionBar = appCompatActivity.getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
backArrow = toolbar.getNavigationIcon();
appBarLayout = (AppBarLayout) view.findViewById(R.id.app_bar_layout);
collapsingToolbarLayout =
((CollapsingToolbarLayout) view.findViewById(R.id.collapsing_toolbar_layout));
collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(R.color.tw__transparent));
collapsingToolbarLayout.setCollapsedTitleTextColor(
getResources().getColor(R.color.tw__transparent));
appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
private void configureAppBarLayout(Drawable drawable, int toolbarColor, boolean isCollapsed) {
toolbar.setBackgroundDrawable(drawable);
toolbarTitle.setTextColor(toolbarColor);
toolbarTitle.setText(getString(R.string.holidayspromotion_title_holidays));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
handleStatusBar(isCollapsed);
}
if (backArrow != null) {
backArrow.setColorFilter(toolbarColor, PorterDuff.Mode.SRC_IN);
}
}
@Override public void onStateChanged(AppBarLayout appBarLayout, State state) {
Resources resources = getResources();
switch (state) {
case EXPANDED:
break;
default:
case IDLE:
case MOVING:
toolbarTitle.setVisibility(View.GONE);
configureAppBarLayout(
resources.getDrawable(R.drawable.editorial_up_bottom_black_gradient),
resources.getColor(R.color.tw__solid_white), false);
break;
case COLLAPSED:
toolbarTitle.setVisibility(View.VISIBLE);
configureAppBarLayout(resources.getDrawable(R.drawable.tw__transparent),
resources.getColor(R.color.black), true);
break;
}
}
});
=======
walletActiveView = view.findViewById(R.id.promotion_wallet_active);
walletInactiveView = view.findViewById(R.id.promotion_wallet_inactive);
>>>>>>>
walletActiveView = view.findViewById(R.id.promotion_wallet_active);
walletInactiveView = view.findViewById(R.id.promotion_wallet_inactive);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.setStatusBarColor(getResources().getColor(R.color.black_87_alpha));
}
toolbarTitle = view.findViewById(R.id.toolbar_title);
toolbar = (Toolbar) view.findViewById(R.id.toolbar);
toolbar.setTitle("");
AppCompatActivity appCompatActivity = ((AppCompatActivity) getActivity());
appCompatActivity.setSupportActionBar(toolbar);
ActionBar actionBar = appCompatActivity.getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
backArrow = toolbar.getNavigationIcon();
appBarLayout = (AppBarLayout) view.findViewById(R.id.app_bar_layout);
collapsingToolbarLayout =
((CollapsingToolbarLayout) view.findViewById(R.id.collapsing_toolbar_layout));
collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(R.color.tw__transparent));
collapsingToolbarLayout.setCollapsedTitleTextColor(
getResources().getColor(R.color.tw__transparent));
appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
private void configureAppBarLayout(Drawable drawable, int toolbarColor, boolean isCollapsed) {
toolbar.setBackgroundDrawable(drawable);
toolbarTitle.setTextColor(toolbarColor);
toolbarTitle.setText(getString(R.string.holidayspromotion_title_holidays));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
handleStatusBar(isCollapsed);
}
if (backArrow != null) {
backArrow.setColorFilter(toolbarColor, PorterDuff.Mode.SRC_IN);
}
}
@Override public void onStateChanged(AppBarLayout appBarLayout, State state) {
Resources resources = getResources();
switch (state) {
case EXPANDED:
break;
default:
case IDLE:
case MOVING:
toolbarTitle.setVisibility(View.GONE);
configureAppBarLayout(
resources.getDrawable(R.drawable.editorial_up_bottom_black_gradient),
resources.getColor(R.color.tw__solid_white), false);
break;
case COLLAPSED:
toolbarTitle.setVisibility(View.VISIBLE);
configureAppBarLayout(resources.getDrawable(R.drawable.tw__transparent),
resources.getColor(R.color.black), true);
break;
}
}
});
<<<<<<<
collapsingToolbarLayout = null;
appBarLayout = null;
backArrow = null;
=======
walletActiveView = null;
walletInactiveView = null;
>>>>>>>
collapsingToolbarLayout = null;
appBarLayout = null;
backArrow = null;
walletActiveView = null;
walletInactiveView = null; |
<<<<<<<
// private static final String MLOG_EXTRACT_FORMAT =
// "select rowid,{0} from {1}.{2} where rownum <= ?";
private static final String MLOG_EXTRACT_FORMAT = "select * from (select rowid,{0} from {1}.{2} order by sequence$$ asc) where rownum <= ?";
// private static final String MASTER_FORMAT =
// "select /*+index(t {0})*/ {1} from {2}.{3} t where {4}=?";
private static final String MASTER_MULTI_PK_FORMAT = "select {0} from {1}.{2} t where {3}";
private static final String MLOG_CLEAN_FORMAT = "delete from {0}.{1} where rowid=?";
private String mlogExtractSql;
private String mlogCleanSql;
private YuGongContext context;
private Table mlogMeta;
private ColumnMeta rowidColumn = new ColumnMeta("rowid", Types.ROWID);
private ColumnMeta rowidColumnString = new ColumnMeta("rowid", Types.VARCHAR);
private long sleepTime = 1000L;
private Map<List<String>, TableSqlUnit> masterSqlCache;
private boolean concurrent = true;
private int threadSize = 5;
private int splitSize = 1;
private ThreadPoolExecutor executor;
private String executorName;
public OracleMaterializedIncRecordExtractor(YuGongContext context){
this.context = context;
=======
// private static final String MLOG_EXTRACT_FORMAT =
// "select rowid,{0} from {1}.{2} where rownum <= ?";
private static final String MLOG_EXTRACT_FORMAT = "select * from (select rowid,{0} from {1}.{2} order by sequence$$ asc) where rownum <= ?";
// private static final String MASTER_FORMAT =
// "select /*+index(t {0})*/ {1} from {2}.{3} t where {4}=?";
private static final String MASTER_MULTI_PK_FORMAT = "select {0} from {1}.{2} t where {3}";
private static final String MLOG_CLEAN_FORMAT = "delete from {0}.{1} where rowid=?";
private String mlogExtractSql;
private String mlogCleanSql;
private YuGongContext context;
private Table mlogMeta;
private ColumnMeta rowidColumn = new ColumnMeta("rowid", Types.ROWID);
private long sleepTime = 1000L;
private Map<List<String>, TableSqlUnit> masterSqlCache;
private boolean concurrent = true;
private int threadSize = 5;
private int splitSize = 1;
private ThreadPoolExecutor executor;
private String executorName;
public OracleMaterializedIncRecordExtractor(YuGongContext context) {
this.context = context;
}
public void start() {
super.start();
masterSqlCache = MigrateMap.makeMap();
String schemaName = context.getTableMeta().getSchema();
String tableName = context.getTableMeta().getName();
// 后去mlog表名
String mlogTableName = TableMetaGenerator.getMLogTableName(context.getSourceDs(), schemaName, tableName);
if (StringUtils.isEmpty(mlogTableName)) {
throw new YuGongException("not found mlog table for [" + schemaName + "." + tableName + "]");
>>>>>>>
// private static final String MLOG_EXTRACT_FORMAT =
// "select rowid,{0} from {1}.{2} where rownum <= ?";
private static final String MLOG_EXTRACT_FORMAT = "select * from (select rowid,{0} from {1}.{2} order by sequence$$ asc) where rownum <= ?";
// private static final String MASTER_FORMAT =
// "select /*+index(t {0})*/ {1} from {2}.{3} t where {4}=?";
private static final String MASTER_MULTI_PK_FORMAT = "select {0} from {1}.{2} t where {3}";
private static final String MLOG_CLEAN_FORMAT = "delete from {0}.{1} where rowid=?";
private String mlogExtractSql;
private String mlogCleanSql;
private YuGongContext context;
private Table mlogMeta;
private ColumnMeta rowidColumn = new ColumnMeta("rowid", Types.ROWID);
private ColumnMeta rowidColumnString = new ColumnMeta("rowid", Types.VARCHAR);
private long sleepTime = 1000L;
private Map<List<String>, TableSqlUnit> masterSqlCache;
private boolean concurrent = true;
private int threadSize = 5;
private int splitSize = 1;
private ThreadPoolExecutor executor;
private String executorName;
public OracleMaterializedIncRecordExtractor(YuGongContext context) {
this.context = context;
}
public void start() {
super.start();
masterSqlCache = MigrateMap.makeMap();
String schemaName = context.getTableMeta().getSchema();
String tableName = context.getTableMeta().getName();
// 后去mlog表名
String mlogTableName = TableMetaGenerator.getMLogTableName(context.getSourceDs(), schemaName, tableName);
if (StringUtils.isEmpty(mlogTableName)) {
throw new YuGongException("not found mlog table for [" + schemaName + "." + tableName + "]");
<<<<<<<
private List<OracleIncrementRecord> getMlogRecord(JdbcTemplate jdbcTemplate) {
return (List<OracleIncrementRecord>) jdbcTemplate.execute(mlogExtractSql, new PreparedStatementCallback() {
public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException {
ps.setInt(1, context.getOnceCrawNum());
List<OracleIncrementRecord> result = Lists.newArrayList();
ResultSet rs = ps.executeQuery();
while (rs.next()) {
IncrementOpType opType = getDmlType(rs);
List<ColumnValue> primaryKeys = new ArrayList<ColumnValue>();
List<ColumnValue> columns = new ArrayList<ColumnValue>();
for (ColumnMeta column : context.getTableMeta().getPrimaryKeys()) {
if (pkListHave(mlogMeta.getColumns(), column.getName())) {
ColumnValue pk = getColumnValue(rs, context.getSourceEncoding(), column);
primaryKeys.add(pk);
}
}
for (ColumnMeta column : context.getTableMeta().getColumns()) {
if (pkListHave(mlogMeta.getColumns(), column.getName())) {
ColumnValue col = getColumnValue(rs, context.getSourceEncoding(), column);
// 针对非主键的列,比如拆分字段,一起当做数据主键
// 扩展列可能会发生变化,反查时不能带这个字段
primaryKeys.add(col);
}
}
if (primaryKeys.size() == 0) {
// 如果是删除操作，直接将判断字段作为主键
if (opType.toString().equals("D")) {
}
ColumnValue col = new ColumnValue(rowidColumnString, rs.getObject("M_ROW$$"));
primaryKeys.add(col);
}
ColumnValue rowId = new ColumnValue(rowidColumn, rs.getObject("rowid"));
OracleIncrementRecord record = new OracleIncrementRecord(context.getTableMeta().getSchema(),
context.getTableMeta().getName(),
primaryKeys,
columns);
record.setRowId(rowId);
record.setOpType(opType);
result.add(record);
}
rs.close();
return result;
=======
for (ColumnMeta column : context.getTableMeta().getPrimaryKeys()) {
if (pkListHave(mlogMeta.getColumns(), column.getName())) {
ColumnValue pk = getColumnValue(rs, context.getSourceEncoding(), column);
primaryKeys.add(pk);
>>>>>>>
for (ColumnMeta column : context.getTableMeta().getPrimaryKeys()) {
if (pkListHave(mlogMeta.getColumns(), column.getName())) {
ColumnValue pk = getColumnValue(rs, context.getSourceEncoding(), column);
primaryKeys.add(pk); |
<<<<<<<
appViewViewModel -> appViewManager.loadDownloadAppViewModel(appViewViewModel.getMd5(),
appViewViewModel.getPackageName(), appViewViewModel.getVersionCode())
=======
appViewViewModel -> appViewManager.getDownloadAppViewModel(appViewViewModel.getMd5(),
appViewViewModel.getPackageName(), appViewViewModel.getVersionCode(),
appViewViewModel.isPaid(), appViewViewModel.getPay())
>>>>>>>
appViewViewModel -> appViewManager.loadDownloadAppViewModel(appViewViewModel.getMd5(),
appViewViewModel.getPackageName(), appViewViewModel.getVersionCode(),
appViewViewModel.isPaid(), appViewViewModel.getPay())
<<<<<<<
.flatMap(app -> appViewManager.loadDownloadAppViewModel(app.getMd5(), app.getPackageName(),
app.getVersionCode()))
=======
.flatMap(app -> appViewManager.getDownloadAppViewModel(app.getMd5(), app.getPackageName(),
app.getVersionCode(), app.isPaid(), app.getPay()))
>>>>>>>
.flatMap(app -> appViewManager.loadDownloadAppViewModel(app.getMd5(), app.getPackageName(),
app.getVersionCode(), app.isPaid(), app.getPay())) |
<<<<<<<
private static boolean autoUpdateWasCalled = false;
@Inject AptoideDatabase aptoideDatabase;
@Inject RoomNotificationPersistence notificationPersistence;
=======
>>>>>>>
@Inject AptoideDatabase aptoideDatabase;
@Inject RoomNotificationPersistence notificationPersistence; |
<<<<<<<
private FloatingActionButton floatingActionButton;
=======
private InstallManager installManager;
>>>>>>>
private FloatingActionButton floatingActionButton;
private InstallManager installManager;
<<<<<<<
coordinatorLayout = view.findViewById(R.id.coordinator_layout);
floatingActionButton = (FloatingActionButton) view.findViewById(R.id.floating_action_button);
attachPresenter(new TimelinePresenter(this, new SocialManager(
new SocialService(getArguments().getString(ACTION_KEY),
=======
attachPresenter(new TimelinePresenter(this, new Timeline(
new TimelineService(getArguments().getString(ACTION_KEY), userId,
>>>>>>>
coordinatorLayout = view.findViewById(R.id.coordinator_layout);
floatingActionButton = (FloatingActionButton) view.findViewById(R.id.floating_action_button);
attachPresenter(new TimelinePresenter(this,
new Timeline(new TimelineService(getArguments().getString(ACTION_KEY), userId,
<<<<<<<
@Override public Observable<Void> floatingActionButtonClicked() {
return RxView.clicks(floatingActionButton);
}
@Override public Completable showFloatingActionButton() {
return Completable.fromAction(() -> {
// todo up transition
//floatingActionButton.animate().yBy(-100f);
floatingActionButton.setVisibility(View.VISIBLE);
});
}
@Override public Completable hideFloatingActionButton() {
return Completable.fromAction(() -> {
// todo down transition
//floatingActionButton.animate().yBy(100f);
floatingActionButton.setVisibility(View.GONE);
});
}
@Override public Observable<Direction> scrolled() {
return RxRecyclerView.scrollEvents(list)
.map(event -> new Direction(event.dx(), event.dy()));
}
=======
@Override public void showRootAccessDialog() {
GenericDialogs.createGenericYesNoCancelMessage(getContext(), null,
AptoideUtils.StringU.getFormattedString(R.string.root_access_dialog,
getContext().getResources()))
.subscribe(eResponse -> {
switch (eResponse) {
case YES:
installManager.rootInstallAllowed(true);
break;
case NO:
installManager.rootInstallAllowed(false);
break;
}
});
}
@Override public void updateInstallProgress(Post card, int cardPosition) {
adapter.updateCard(card, cardPosition);
}
@Override public void showStoreSubscribedMessage(String storeName) {
ShowMessage.asSnack(getView(), AptoideUtils.StringU.getFormattedString(R.string.store_followed,
getContext().getResources(), storeName));
}
@Override public void showStoreUnsubscribedMessage(String storeName) {
ShowMessage.asSnack(getView(),
AptoideUtils.StringU.getFormattedString(R.string.unfollowing_store_message,
getContext().getResources(), storeName));
}
@Override public void showSharePreview(Post post) {
shareDialog = new AlertDialog.Builder(getContext()).setTitle("Shared Card Preview")
.setMessage(R.string.social_timeline_you_will_share)
.setView(sharePreviewFactory.getSharePreviewView(post, getContext()))
.setPositiveButton(R.string.share,
(dialogInterface, i) -> sharePreviewPublishSubject.onNext(post))
.setNegativeButton(android.R.string.cancel, null)
.create();
shareDialog.show();
}
@Override public void showShareSuccessMessage() {
ShowMessage.asSnack(getView(), R.string.social_timeline_share_dialog_title);
}
>>>>>>>
@Override public Observable<Void> floatingActionButtonClicked() {
return RxView.clicks(floatingActionButton);
}
@Override public Completable showFloatingActionButton() {
return Completable.fromAction(() -> {
// todo up transition
//floatingActionButton.animate().yBy(-100f);
floatingActionButton.setVisibility(View.VISIBLE);
});
}
@Override public Completable hideFloatingActionButton() {
return Completable.fromAction(() -> {
// todo down transition
//floatingActionButton.animate().yBy(100f);
floatingActionButton.setVisibility(View.GONE);
});
}
@Override public Observable<Direction> scrolled() {
return RxRecyclerView.scrollEvents(list)
.map(event -> new Direction(event.dx(), event.dy()));
}
@Override public void showRootAccessDialog() {
GenericDialogs.createGenericYesNoCancelMessage(getContext(), null,
AptoideUtils.StringU.getFormattedString(R.string.root_access_dialog,
getContext().getResources()))
.subscribe(eResponse -> {
switch (eResponse) {
case YES:
installManager.rootInstallAllowed(true);
break;
case NO:
installManager.rootInstallAllowed(false);
break;
}
});
}
@Override public void updateInstallProgress(Post card, int cardPosition) {
adapter.updateCard(card, cardPosition);
}
@Override public void showStoreSubscribedMessage(String storeName) {
ShowMessage.asSnack(getView(), AptoideUtils.StringU.getFormattedString(R.string.store_followed,
getContext().getResources(), storeName));
}
@Override public void showStoreUnsubscribedMessage(String storeName) {
ShowMessage.asSnack(getView(),
AptoideUtils.StringU.getFormattedString(R.string.unfollowing_store_message,
getContext().getResources(), storeName));
}
@Override public void showSharePreview(Post post) {
shareDialog = new AlertDialog.Builder(getContext()).setTitle("Shared Card Preview")
.setMessage(R.string.social_timeline_you_will_share)
.setView(sharePreviewFactory.getSharePreviewView(post, getContext()))
.setPositiveButton(R.string.share,
(dialogInterface, i) -> sharePreviewPublishSubject.onNext(post))
.setNegativeButton(android.R.string.cancel, null)
.create();
shareDialog.show();
}
@Override public void showShareSuccessMessage() {
ShowMessage.asSnack(getView(), R.string.social_timeline_share_dialog_title);
} |
<<<<<<<
import cm.aptoide.pt.view.fragment.DescriptionFragment;
=======
import cm.aptoide.pt.view.fragment.FragmentView;
import cm.aptoide.pt.view.fragment.GridRecyclerSwipeWithToolbarFragment;
>>>>>>>
import cm.aptoide.pt.view.fragment.GridRecyclerSwipeWithToolbarFragment;
import cm.aptoide.pt.view.fragment.DescriptionFragment;
<<<<<<<
void inject(DescriptionFragment descriptionFragment);
void inject(TimeLineFollowingFragment timeLineFollowingFragment);
void inject(TimeLineFollowersFragment timeLineFollowersFragment);
=======
void inject(FragmentView fragmentView);
void inject(GridRecyclerSwipeWithToolbarFragment gridRecyclerSwipeWithToolbarFragment);
void inject(SettingsFragment settingsFragment);
>>>>>>>
void inject(DescriptionFragment descriptionFragment);
void inject(TimeLineFollowingFragment timeLineFollowingFragment);
void inject(TimeLineFollowersFragment timeLineFollowersFragment);
void inject(GridRecyclerSwipeWithToolbarFragment gridRecyclerSwipeWithToolbarFragment);
void inject(SettingsFragment settingsFragment); |
<<<<<<<
=======
import cm.aptoide.accountmanager.Account;
>>>>>>>
import cm.aptoide.accountmanager.Account;
<<<<<<<
=======
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
import cm.aptoide.pt.interfaces.AptoideClientUUID;
import cm.aptoide.pt.preferences.secure.SecurePreferencesImplementation;
import cm.aptoide.pt.v8engine.BaseBodyInterceptor;
import cm.aptoide.pt.v8engine.activity.CreateStoreActivity;
>>>>>>>
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
import cm.aptoide.pt.interfaces.AptoideClientUUID;
import cm.aptoide.pt.preferences.secure.SecurePreferencesImplementation;
import cm.aptoide.pt.v8engine.BaseBodyInterceptor;
import cm.aptoide.pt.v8engine.activity.CreateStoreActivity;
<<<<<<<
import cm.aptoide.pt.v8engine.activity.CreateStoreActivity;
=======
import cm.aptoide.pt.v8engine.util.StoreCredentialsProviderImpl;
>>>>>>>
import cm.aptoide.pt.v8engine.util.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.activity.CreateStoreActivity;
<<<<<<<
storeUtilsProxy = new StoreUtilsProxy(
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(), getContext()),
accountManager);
final GetHomeMeta getHomeMeta = displayable.getPojo();
final cm.aptoide.pt.model.v7.store.Store store = getHomeMeta.getData().getStore();
HomeUser user = getHomeMeta.getData().getUser();
=======
final AptoideClientUUID aptoideClientUUID = new IdsRepositoryImpl
(SecurePreferencesImplementation.getInstance(), getContext());
storeUtilsProxy = new StoreUtilsProxy(accountManager,
new BaseBodyInterceptor(aptoideClientUUID.getUniqueIdentifier(), accountManager),
new StoreCredentialsProviderImpl());
final GetStoreMeta getStoreMeta = displayable.getPojo();
final cm.aptoide.pt.model.v7.store.Store store = getStoreMeta.getData();
final StoreThemeEnum theme = StoreThemeEnum.get(store.getAppearance().getTheme());
final Context context = itemView.getContext();
>>>>>>>
final AptoideClientUUID aptoideClientUUID = new IdsRepositoryImpl
(SecurePreferencesImplementation.getInstance(), getContext());
storeUtilsProxy = new StoreUtilsProxy(accountManager,
new BaseBodyInterceptor(aptoideClientUUID.getUniqueIdentifier(), accountManager),
new StoreCredentialsProviderImpl());
final GetHomeMeta getHomeMeta = displayable.getPojo();
final cm.aptoide.pt.model.v7.store.Store store = getHomeMeta.getData().getStore();
HomeUser user = getHomeMeta.getData().getUser(); |
<<<<<<<
.andThen(checkApkfyUserProperty())
.andThen(sendAptoideApplicationStartAnalytics())
=======
.andThen(sendAptoideApplicationStartAnalytics(
uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION))
>>>>>>>
.andThen(sendAptoideApplicationStartAnalytics(
uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION))
.andThen(checkApkfyUserProperty()) |
<<<<<<<
import cm.aptoide.pt.abtesting.ABTestManager;
import cm.aptoide.pt.abtesting.Experiment;
import cm.aptoide.pt.account.view.store.StoreManager;
=======
import cm.aptoide.pt.account.view.store.StoreManager;
>>>>>>>
import cm.aptoide.pt.abtesting.ABTestManager;
import cm.aptoide.pt.abtesting.Experiment;
import cm.aptoide.pt.account.view.store.StoreManager;
import cm.aptoide.pt.account.view.store.StoreManager; |
<<<<<<<
public Home(BundlesRepository bundlesRepository, ImpressionManager impressionManager,
PromotionsManager promotionsManager, BannerRepository bannerRepository,
MoPubAdsManager moPubAdsManager, PromotionsPreferencesManager promotionsPreferencesManager,
BlacklistManager blacklistManager, String promotionId, ReactionsManager reactionsManager) {
=======
public Home(BundlesRepository bundlesRepository, PromotionsManager promotionsManager,
BannerRepository bannerRepository, MoPubAdsManager moPubAdsManager,
PromotionsPreferencesManager promotionsPreferencesManager, BlacklistManager blacklistManager,
String promotionId) {
>>>>>>>
public Home(BundlesRepository bundlesRepository, PromotionsManager promotionsManager,
BannerRepository bannerRepository, MoPubAdsManager moPubAdsManager,
PromotionsPreferencesManager promotionsPreferencesManager, BlacklistManager blacklistManager,
String promotionId, ReactionsManager reactionsManager) {
<<<<<<<
public Single<List<HomeBundle>> loadReactionModel(String cardId, String groupId) {
return reactionsManager.loadReactionModel(cardId, groupId)
.flatMap(loadReactionModel -> bundlesRepository.loadHomeBundles()
.flatMap(
homeBundlesModel -> getUpdatedCards(homeBundlesModel, loadReactionModel, cardId)));
}
private Single<List<HomeBundle>> getUpdatedCards(HomeBundlesModel homeBundlesModel,
LoadReactionModel loadReactionModel, String cardId) {
List<HomeBundle> homeBundles = homeBundlesModel.getList();
for (HomeBundle homeBundle : homeBundles) {
if (homeBundle.getType() == HomeBundle.BundleType.EDITORIAL
&& homeBundle instanceof ActionBundle) {
ActionItem actionBundle = ((ActionBundle) homeBundle).getActionItem();
if (actionBundle.getCardId()
.equals(cardId)) {
actionBundle.setReactions(loadReactionModel.getTopReactionList());
actionBundle.setNumberOfReactions(loadReactionModel.getTotal());
actionBundle.setUserReaction(loadReactionModel.getMyReaction());
}
}
}
bundlesRepository.updateCache(homeBundles);
return Single.just(homeBundles);
}
public Single<ReactionsResponse> setReaction(String cardId, String groupId, String reaction) {
return reactionsManager.setReaction(cardId, groupId, reaction);
}
public Single<ReactionsResponse> deleteReaction(String cardId, String groupId) {
return reactionsManager.deleteReaction(cardId, groupId);
}
public Boolean isFirstReaction(String cardId, String groupId) {
return reactionsManager.isFirstReaction(cardId, groupId);
}
=======
public Single<Boolean> shouldShowConsentDialog() {
return moPubAdsManager.shouldShowConsentDialog();
}
>>>>>>>
public Single<Boolean> shouldShowConsentDialog() {
return moPubAdsManager.shouldShowConsentDialog();
}
public Single<List<HomeBundle>> loadReactionModel(String cardId, String groupId) {
return reactionsManager.loadReactionModel(cardId, groupId)
.flatMap(loadReactionModel -> bundlesRepository.loadHomeBundles()
.flatMap(
homeBundlesModel -> getUpdatedCards(homeBundlesModel, loadReactionModel, cardId)));
}
private Single<List<HomeBundle>> getUpdatedCards(HomeBundlesModel homeBundlesModel,
LoadReactionModel loadReactionModel, String cardId) {
List<HomeBundle> homeBundles = homeBundlesModel.getList();
for (HomeBundle homeBundle : homeBundles) {
if (homeBundle.getType() == HomeBundle.BundleType.EDITORIAL
&& homeBundle instanceof ActionBundle) {
ActionItem actionBundle = ((ActionBundle) homeBundle).getActionItem();
if (actionBundle.getCardId()
.equals(cardId)) {
actionBundle.setReactions(loadReactionModel.getTopReactionList());
actionBundle.setNumberOfReactions(loadReactionModel.getTotal());
actionBundle.setUserReaction(loadReactionModel.getMyReaction());
}
}
}
bundlesRepository.updateCache(homeBundles);
return Single.just(homeBundles);
}
public Single<ReactionsResponse> setReaction(String cardId, String groupId, String reaction) {
return reactionsManager.setReaction(cardId, groupId, reaction);
}
public Single<ReactionsResponse> deleteReaction(String cardId, String groupId) {
return reactionsManager.deleteReaction(cardId, groupId);
}
public Boolean isFirstReaction(String cardId, String groupId) {
return reactionsManager.isFirstReaction(cardId, groupId);
} |
<<<<<<<
=======
>>>>>>>
<<<<<<<
//storeSubscribers = (TextView) itemView.findViewById(R.id.store_subscribers);
//storeDownloads = (TextView) itemView.findViewById(R.id.store_downloads);
//infoLayout = (LinearLayout) itemView.findViewById(R.id.store_layout_subscribers);
}
=======
}
>>>>>>>
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
protected boolean canEqual(Object other) {
return other instanceof App;
}
public boolean hasBilling() {
return appcoins != null && appcoins.hasBilling();
}
public void setAppcoins(AppCoinsInfo appcoins) {
this.appcoins = appcoins;
}
public boolean hasAdvertising() {
return appcoins != null && appcoins.hasAdvertising();
}
public List<String> getBdsFlags() {
return appcoins.getFlags();
}
public Aab getAab() {
return aab;
}
public void setAab(Aab aab) {
this.aab = aab;
}
public boolean hasSplits() {
return aab != null && !aab.getRequiredSplits()
.isEmpty();
}
=======
protected boolean canEqual(Object other) {
return other instanceof App;
}
public boolean hasBilling() {
return appcoins != null && appcoins.hasBilling();
}
public void setAppcoins(AppCoinsInfo appcoins) {
this.appcoins = appcoins;
}
public boolean hasAdvertising() {
return appcoins != null && appcoins.hasAdvertising();
}
public List<String> getBdsFlags() {
return appcoins.getFlags();
}
>>>>>>>
protected boolean canEqual(Object other) {
return other instanceof App;
}
public boolean hasBilling() {
return appcoins != null && appcoins.hasBilling();
}
public void setAppcoins(AppCoinsInfo appcoins) {
this.appcoins = appcoins;
}
public boolean hasAdvertising() {
return appcoins != null && appcoins.hasAdvertising();
}
public List<String> getBdsFlags() {
return appcoins.getFlags();
}
public Aab getAab() {
return aab;
}
public void setAab(Aab aab) {
this.aab = aab;
}
public boolean hasSplits() {
return aab != null && !aab.getRequiredSplits()
.isEmpty();
}
<<<<<<<
public static class Pay {
private double price;
private String symbol;
private String currency;
private String status;
public Pay() {
}
public boolean isPaid() {
return "OK".equalsIgnoreCase(status);
}
public void setPaid() {
status = "OK";
}
public double getPrice() {
return this.price;
}
public void setPrice(double price) {
this.price = price;
}
public String getSymbol() {
return this.symbol;
}
public void setSymbol(String symbol) {
this.symbol = symbol;
}
public String getCurrency() {
return this.currency;
}
public void setCurrency(String currency) {
this.currency = currency;
}
public String getStatus() {
return this.status;
}
public void setStatus(String status) {
this.status = status;
}
protected boolean canEqual(Object other) {
return other instanceof Pay;
}
public int hashCode() {
final int PRIME = 59;
int result = 1;
final long $price = Double.doubleToLongBits(this.getPrice());
result = result * PRIME + (int) ($price >>> 32 ^ $price);
final Object $symbol = this.getSymbol();
result = result * PRIME + ($symbol == null ? 43 : $symbol.hashCode());
final Object $currency = this.getCurrency();
result = result * PRIME + ($currency == null ? 43 : $currency.hashCode());
final Object $status = this.getStatus();
result = result * PRIME + ($status == null ? 43 : $status.hashCode());
return result;
}
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof Pay)) return false;
final Pay other = (Pay) o;
if (!other.canEqual((Object) this)) return false;
if (Double.compare(this.getPrice(), other.getPrice()) != 0) return false;
final Object this$symbol = this.getSymbol();
final Object other$symbol = other.getSymbol();
if (this$symbol == null ? other$symbol != null : !this$symbol.equals(other$symbol)) {
return false;
}
final Object this$currency = this.getCurrency();
final Object other$currency = other.getCurrency();
if (this$currency == null ? other$currency != null : !this$currency.equals(other$currency)) {
return false;
}
final Object this$status = this.getStatus();
final Object other$status = other.getStatus();
if (this$status == null ? other$status != null : !this$status.equals(other$status)) {
return false;
}
return true;
}
public String toString() {
return "GetAppMeta.Pay(price="
+ this.getPrice()
+ ", symbol="
+ this.getSymbol()
+ ", currency="
+ this.getCurrency()
+ ", status="
+ this.getStatus()
+ ")";
}
}
=======
>>>>>>>
<<<<<<<
}
}
}
public static class Media {
=======
}
}
}
public static class Media {
>>>>>>>
}
}
}
public static class Media {
<<<<<<<
public int hashCode() {
final int PRIME = 59;
int result = 1;
final Object $keywords = this.getKeywords();
result = result * PRIME + ($keywords == null ? 43 : $keywords.hashCode());
final Object $description = this.getDescription();
result = result * PRIME + ($description == null ? 43 : $description.hashCode());
final Object $news = this.getNews();
result = result * PRIME + ($news == null ? 43 : $news.hashCode());
final Object $screenshots = this.getScreenshots();
result = result * PRIME + ($screenshots == null ? 43 : $screenshots.hashCode());
final Object $videos = this.getVideos();
result = result * PRIME + ($videos == null ? 43 : $videos.hashCode());
return result;
}
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof Media)) return false;
final Media other = (Media) o;
if (!other.canEqual((Object) this)) return false;
final Object this$keywords = this.getKeywords();
final Object other$keywords = other.getKeywords();
if (this$keywords == null ? other$keywords != null : !this$keywords.equals(other$keywords)) {
return false;
}
final Object this$description = this.getDescription();
final Object other$description = other.getDescription();
if (this$description == null ? other$description != null
: !this$description.equals(other$description)) {
return false;
}
final Object this$news = this.getNews();
final Object other$news = other.getNews();
if (this$news == null ? other$news != null : !this$news.equals(other$news)) return false;
final Object this$screenshots = this.getScreenshots();
final Object other$screenshots = other.getScreenshots();
if (this$screenshots == null ? other$screenshots != null
: !this$screenshots.equals(other$screenshots)) {
return false;
}
final Object this$videos = this.getVideos();
final Object other$videos = other.getVideos();
if (this$videos == null ? other$videos != null : !this$videos.equals(other$videos)) {
return false;
}
return true;
}
public String toString() {
return "GetAppMeta.Media(keywords="
+ this.getKeywords()
+ ", description="
+ this.getDescription()
+ ", news="
+ this.getNews()
+ ", screenshots="
+ this.getScreenshots()
+ ", videos="
+ this.getVideos()
+ ")";
}
public static class Video {
=======
public int hashCode() {
final int PRIME = 59;
int result = 1;
final Object $keywords = this.getKeywords();
result = result * PRIME + ($keywords == null ? 43 : $keywords.hashCode());
final Object $description = this.getDescription();
result = result * PRIME + ($description == null ? 43 : $description.hashCode());
final Object $news = this.getNews();
result = result * PRIME + ($news == null ? 43 : $news.hashCode());
final Object $screenshots = this.getScreenshots();
result = result * PRIME + ($screenshots == null ? 43 : $screenshots.hashCode());
final Object $videos = this.getVideos();
result = result * PRIME + ($videos == null ? 43 : $videos.hashCode());
return result;
}
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof Media)) return false;
final Media other = (Media) o;
if (!other.canEqual((Object) this)) return false;
final Object this$keywords = this.getKeywords();
final Object other$keywords = other.getKeywords();
if (this$keywords == null ? other$keywords != null : !this$keywords.equals(other$keywords)) {
return false;
}
final Object this$description = this.getDescription();
final Object other$description = other.getDescription();
if (this$description == null ? other$description != null
: !this$description.equals(other$description)) {
return false;
}
final Object this$news = this.getNews();
final Object other$news = other.getNews();
if (this$news == null ? other$news != null : !this$news.equals(other$news)) return false;
final Object this$screenshots = this.getScreenshots();
final Object other$screenshots = other.getScreenshots();
if (this$screenshots == null ? other$screenshots != null
: !this$screenshots.equals(other$screenshots)) {
return false;
}
final Object this$videos = this.getVideos();
final Object other$videos = other.getVideos();
if (this$videos == null ? other$videos != null : !this$videos.equals(other$videos)) {
return false;
}
return true;
}
public String toString() {
return "GetAppMeta.Media(keywords="
+ this.getKeywords()
+ ", description="
+ this.getDescription()
+ ", news="
+ this.getNews()
+ ", screenshots="
+ this.getScreenshots()
+ ", videos="
+ this.getVideos()
+ ")";
}
public static class Video {
>>>>>>>
public int hashCode() {
final int PRIME = 59;
int result = 1;
final Object $keywords = this.getKeywords();
result = result * PRIME + ($keywords == null ? 43 : $keywords.hashCode());
final Object $description = this.getDescription();
result = result * PRIME + ($description == null ? 43 : $description.hashCode());
final Object $news = this.getNews();
result = result * PRIME + ($news == null ? 43 : $news.hashCode());
final Object $screenshots = this.getScreenshots();
result = result * PRIME + ($screenshots == null ? 43 : $screenshots.hashCode());
final Object $videos = this.getVideos();
result = result * PRIME + ($videos == null ? 43 : $videos.hashCode());
return result;
}
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof Media)) return false;
final Media other = (Media) o;
if (!other.canEqual((Object) this)) return false;
final Object this$keywords = this.getKeywords();
final Object other$keywords = other.getKeywords();
if (this$keywords == null ? other$keywords != null : !this$keywords.equals(other$keywords)) {
return false;
}
final Object this$description = this.getDescription();
final Object other$description = other.getDescription();
if (this$description == null ? other$description != null
: !this$description.equals(other$description)) {
return false;
}
final Object this$news = this.getNews();
final Object other$news = other.getNews();
if (this$news == null ? other$news != null : !this$news.equals(other$news)) return false;
final Object this$screenshots = this.getScreenshots();
final Object other$screenshots = other.getScreenshots();
if (this$screenshots == null ? other$screenshots != null
: !this$screenshots.equals(other$screenshots)) {
return false;
}
final Object this$videos = this.getVideos();
final Object other$videos = other.getVideos();
if (this$videos == null ? other$videos != null : !this$videos.equals(other$videos)) {
return false;
}
return true;
}
public String toString() {
return "GetAppMeta.Media(keywords="
+ this.getKeywords()
+ ", description="
+ this.getDescription()
+ ", news="
+ this.getNews()
+ ", screenshots="
+ this.getScreenshots()
+ ", videos="
+ this.getVideos()
+ ")";
}
public static class Video { |
<<<<<<<
import android.graphics.BitmapFactory;
=======
import android.net.ConnectivityManager;
>>>>>>>
import android.graphics.BitmapFactory;
import android.net.ConnectivityManager;
<<<<<<<
import rx.Single;
import rx.functions.Action1;
=======
>>>>>>>
import rx.Single;
import rx.functions.Action1;
<<<<<<<
private RootAvailabilityManager rootAvailabilityManager;
private RootInstallationRetryHandler rootInstallationRetryHandler;
=======
private RefreshTokenInvalidator tokenInvalidator;
private FileManager fileManager;
private CacheHelper cacheHelper;
private StoreManager storeManager;
private PackageRepository packageRepository;
private AdsApplicationVersionCodeProvider applicationVersionCodeProvider;
private AdsRepository adsRepository;
>>>>>>>
private RootAvailabilityManager rootAvailabilityManager;
private RootInstallationRetryHandler rootInstallationRetryHandler;
private RefreshTokenInvalidator tokenInvalidator;
private FileManager fileManager;
private CacheHelper cacheHelper;
private StoreManager storeManager;
private PackageRepository packageRepository;
private AdsApplicationVersionCodeProvider applicationVersionCodeProvider;
private AdsRepository adsRepository;
<<<<<<<
@Override protected TokenInvalidator getTokenInvalidator() {
return new TokenInvalidator() {
@Override public Single<String> invalidateAccessToken() {
final AptoideAccountManager accountManager = getAccountManager();
return accountManager.refreshToken()
.andThen(accountManager.accountStatus()
.first()
.toSingle())
.map(account -> account.getAccessToken());
}
};
}
public RootInstallationRetryHandler getRootInstallationRetryHandler() {
if (rootInstallationRetryHandler == null) {
Intent retryActionIntent = new Intent(this, RootInstallNotificationEventReceiver.class);
retryActionIntent.setAction(RootInstallNotificationEventReceiver.ROOT_INSTALL_RETRY_ACTION);
PendingIntent retryPendingIntent =
PendingIntent.getBroadcast(this, 2, retryActionIntent, PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Action action =
new NotificationCompat.Action(R.drawable.ic_refresh_black_24dp,
getString(R.string.generalscreen_short_root_install_timeout_error_action),
retryPendingIntent);
PendingIntent deleteAction = PendingIntent.getBroadcast(this, 3, retryActionIntent.setAction(
RootInstallNotificationEventReceiver.ROOT_INSTALL_DISMISS_ACTION),
PendingIntent.FLAG_UPDATE_CURRENT);
final SystemNotificationShower systemNotificationShower = new SystemNotificationShower(this,
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE),
new NotificationIdsMapper());
int notificationId = 230498;
rootInstallationRetryHandler =
new RootInstallationRetryHandler(notificationId, systemNotificationShower,
getInstallManager(InstallerFactory.ROLLBACK), PublishRelay.create(), 0, this,
new RootInstallErrorNotificationFactory(notificationId,
BitmapFactory.decodeResource(getResources(), getConfiguration().getIcon()),
action, deleteAction));
}
return rootInstallationRetryHandler;
}
private void startNotificationCenter() {
getPreferences().getBoolean(CAMPAIGN_SOCIAL_NOTIFICATIONS_PREFERENCE_VIEW_KEY, true)
.first()
.subscribe(enabled -> getNotificationSyncScheduler().setEnabled(enabled),
throwable -> CrashReport.getInstance()
.log(throwable));
getNotificationCenter().setup();
}
=======
public TokenInvalidator getTokenInvalidator() {
if (tokenInvalidator == null) {
tokenInvalidator = new RefreshTokenInvalidator(getAccountManager());
}
return tokenInvalidator;
}
private void startNotificationCenter() {
getPreferences().getBoolean(CAMPAIGN_SOCIAL_NOTIFICATIONS_PREFERENCE_VIEW_KEY, true)
.first()
.subscribe(enabled -> getNotificationSyncScheduler().setEnabled(enabled),
throwable -> CrashReport.getInstance()
.log(throwable));
getNotificationCenter().setup();
}
>>>>>>>
public TokenInvalidator getTokenInvalidator() {
if (tokenInvalidator == null) {
tokenInvalidator = new RefreshTokenInvalidator(getAccountManager());
}
return tokenInvalidator;
}
private void startNotificationCenter() {
getPreferences().getBoolean(CAMPAIGN_SOCIAL_NOTIFICATIONS_PREFERENCE_VIEW_KEY, true)
.first()
.subscribe(enabled -> getNotificationSyncScheduler().setEnabled(enabled),
throwable -> CrashReport.getInstance()
.log(throwable));
getNotificationCenter().setup();
}
public RootInstallationRetryHandler getRootInstallationRetryHandler() {
if (rootInstallationRetryHandler == null) {
Intent retryActionIntent = new Intent(this, RootInstallNotificationEventReceiver.class);
retryActionIntent.setAction(RootInstallNotificationEventReceiver.ROOT_INSTALL_RETRY_ACTION);
PendingIntent retryPendingIntent =
PendingIntent.getBroadcast(this, 2, retryActionIntent, PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Action action =
new NotificationCompat.Action(R.drawable.ic_refresh_black_24dp,
getString(R.string.generalscreen_short_root_install_timeout_error_action),
retryPendingIntent);
PendingIntent deleteAction = PendingIntent.getBroadcast(this, 3, retryActionIntent.setAction(
RootInstallNotificationEventReceiver.ROOT_INSTALL_DISMISS_ACTION),
PendingIntent.FLAG_UPDATE_CURRENT);
final SystemNotificationShower systemNotificationShower = new SystemNotificationShower(this,
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE),
new NotificationIdsMapper());
int notificationId = 230498;
rootInstallationRetryHandler =
new RootInstallationRetryHandler(notificationId, systemNotificationShower,
getInstallManager(InstallerFactory.ROLLBACK), PublishRelay.create(), 0, this,
new RootInstallErrorNotificationFactory(notificationId,
BitmapFactory.decodeResource(getResources(), getConfiguration().getIcon()),
action, deleteAction));
}
return rootInstallationRetryHandler;
}
<<<<<<<
installManager = new InstallManager(getDownloadManager(),
new InstallerFactory().create(this, installerType), getRootAvailabilityManager());
=======
installManager = new InstallManager(getApplicationContext(), getDownloadManager(),
new InstallerFactory(new MinimalAdMapper()).create(this, installerType),
getDefaultSharedPreferences(),
SecurePreferencesImplementation.getInstance(getApplicationContext(),
getDefaultSharedPreferences()));
>>>>>>>
installManager = new InstallManager(getApplicationContext(), getDownloadManager(),
new InstallerFactory(new MinimalAdMapper()).create(this, installerType),
getRootAvailabilityManager(), getDefaultSharedPreferences(),
SecurePreferencesImplementation.getInstance(getApplicationContext(),
getDefaultSharedPreferences()));
<<<<<<<
getDefaultClient(), WebService.getDefaultConverter(), productFactory),
new InAppBillingProductRepository(purchaseFactory, paymentFactory,
authorizationRepository, paymentRepositoryFactory.getInAppConfirmationRepository(),
getAccountPayer(), getAuthorizationFactory(), productFactory,
getBaseBodyInterceptorV3(), getDefaultClient(), WebService.getDefaultConverter(),
getNetworkOperatorManager()));
=======
getDefaultClient(), WebService.getDefaultConverter(), productFactory,
getTokenInvalidator(), getDefaultSharedPreferences(), getResources()),
new InAppBillingProductRepository(purchaseFactory, paymentFactory,
authorizationRepository, paymentRepositoryFactory.getInAppConfirmationRepository(),
getAccountPayer(), getAuthorizationFactory(), productFactory,
getBaseBodyInterceptorV3(), getDefaultClient(), WebService.getDefaultConverter(),
getNetworkOperatorManager(), getTokenInvalidator(), getDefaultSharedPreferences(),
getPackageName(), getPackageRepository()));
>>>>>>>
getDefaultClient(), WebService.getDefaultConverter(), productFactory,
getTokenInvalidator(), getDefaultSharedPreferences(), getResources()),
new InAppBillingProductRepository(purchaseFactory, paymentFactory,
authorizationRepository, paymentRepositoryFactory.getInAppConfirmationRepository(),
getAccountPayer(), getAuthorizationFactory(), productFactory,
getBaseBodyInterceptorV3(), getDefaultClient(), WebService.getDefaultConverter(),
getNetworkOperatorManager(), getTokenInvalidator(), getDefaultSharedPreferences(),
getPackageName(), getPackageRepository()));
<<<<<<<
if (SecurePreferences.isFirstRun()) {
PreferenceManager.setDefaultValues(this, R.xml.settings, false);
return setupFirstRun(accountManager).andThen(
getRootAvailabilityManager().updateRootAvailability())
.andThen(Completable.merge(accountManager.syncCurrentAccount(), createShortcut()));
} else {
return Completable.complete();
}
=======
return accountManager.accountStatus()
.first()
.toSingle()
.flatMapCompletable(account -> {
if (SecurePreferences.isFirstRun(
SecurePreferencesImplementation.getInstance(getApplicationContext(),
getDefaultSharedPreferences()))) {
PreferenceManager.setDefaultValues(this, R.xml.settings, false);
return setupFirstRun(accountManager).andThen(
Completable.merge(accountManager.syncCurrentAccount(), createShortcut()));
}
return Completable.complete();
});
>>>>>>>
return accountManager.accountStatus()
.first()
.toSingle()
.flatMapCompletable(account -> {
if (SecurePreferences.isFirstRun(
SecurePreferencesImplementation.getInstance(getApplicationContext(),
getDefaultSharedPreferences()))) {
PreferenceManager.setDefaultValues(this, R.xml.settings, false);
return setupFirstRun(accountManager).andThen(
getRootAvailabilityManager().updateRootAvailability())
.andThen(Completable.merge(accountManager.syncCurrentAccount(), createShortcut()));
}
return Completable.complete();
});
<<<<<<<
public RootAvailabilityManager getRootAvailabilityManager() {
if (rootAvailabilityManager == null) {
rootAvailabilityManager = new RootAvailabilityManager(new RootValueSaver() {
@Override public Single<Boolean> isPhoneRoot() {
return getSecurePreferences().getBoolean(IS_PHONE_ROOTED, false)
.first()
.toSingle();
}
@Override public Completable save(boolean rootAvailable) {
return getSecurePreferences().save(IS_PHONE_ROOTED, rootAvailable);
}
});
}
return rootAvailabilityManager;
}
=======
public AdsApplicationVersionCodeProvider getVersionCodeProvider() {
if (applicationVersionCodeProvider == null) {
applicationVersionCodeProvider =
new PackageRepositoryVersionCodeProvider(getPackageRepository(), getPackageName());
}
return applicationVersionCodeProvider;
}
public AdsRepository getAdsRepository() {
if (adsRepository == null) {
adsRepository = new AdsRepository(getIdsRepository(), accountManager, getDefaultClient(),
WebService.getDefaultConverter(), qManager, getDefaultSharedPreferences(),
getApplicationContext(),
(ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE), getResources(),
getVersionCodeProvider(),
(context) -> AdNetworkUtils.isGooglePlayServicesAvailable(context),
() -> V8Engine.getConfiguration()
.getPartnerId(), new MinimalAdMapper());
}
return adsRepository;
}
>>>>>>>
public RootAvailabilityManager getRootAvailabilityManager() {
if (rootAvailabilityManager == null) {
rootAvailabilityManager = new RootAvailabilityManager(new RootValueSaver() {
@Override public Single<Boolean> isPhoneRoot() {
return getSecurePreferences().getBoolean(IS_PHONE_ROOTED, false)
.first()
.toSingle();
}
@Override public Completable save(boolean rootAvailable) {
return getSecurePreferences().save(IS_PHONE_ROOTED, rootAvailable);
}
});
}
return rootAvailabilityManager;
}
public AdsApplicationVersionCodeProvider getVersionCodeProvider() {
if (applicationVersionCodeProvider == null) {
applicationVersionCodeProvider =
new PackageRepositoryVersionCodeProvider(getPackageRepository(), getPackageName());
}
return applicationVersionCodeProvider;
}
public AdsRepository getAdsRepository() {
if (adsRepository == null) {
adsRepository = new AdsRepository(getIdsRepository(), accountManager, getDefaultClient(),
WebService.getDefaultConverter(), qManager, getDefaultSharedPreferences(),
getApplicationContext(),
(ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE), getResources(),
getVersionCodeProvider(),
(context) -> AdNetworkUtils.isGooglePlayServicesAvailable(context),
() -> V8Engine.getConfiguration()
.getPartnerId(), new MinimalAdMapper());
}
return adsRepository;
} |
<<<<<<<
=======
spannableFactory = new SpannableFactory();
shareDialogFactory = new ShareDialogFactory(getContext(), new SharePostViewSetup(dateCalculator));
adapter = new PostAdapter(Collections.emptyList(),
new CardViewHolderFactory(postTouchEventPublishSubject, dateCalculator, spannableFactory,
new MinimalCardViewFactory(dateCalculator, spannableFactory,
postTouchEventPublishSubject)), new ProgressCard());
>>>>>>>
spannableFactory = new SpannableFactory();
shareDialogFactory =
new ShareDialogFactory(getContext(), new SharePostViewSetup(dateCalculator));
adapter = new PostAdapter(Collections.emptyList(),
new CardViewHolderFactory(postTouchEventPublishSubject, dateCalculator, spannableFactory,
new MinimalCardViewFactory(dateCalculator, spannableFactory,
postTouchEventPublishSubject)), new ProgressCard()); |
<<<<<<<
import android.util.Log;
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cm.aptoide.accountmanager.AptoideAccountManager;
=======
>>>>>>>
import android.util.Log;
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cm.aptoide.accountmanager.AptoideAccountManager;
<<<<<<<
private ListSearchAppsRequest(OkHttpClient httpClient, Converter.Factory converterFactory, Body body, String baseHost) {
super(body, httpClient, converterFactory, baseHost);
}
public static ListSearchAppsRequest of(String query, String storeName) {
BaseBodyDecorator decorator = new BaseBodyDecorator(new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()),SecurePreferencesImplementation.getInstance());
IdsRepository idsRepository = new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
List<String> stores = Collections.singletonList(storeName);
HashMapNotNull<String, List<String>> subscribedStoresAuthMap = StoreUtils.getSubscribedStoresAuthMap();
if (subscribedStoresAuthMap != null && subscribedStoresAuthMap.containsKey(storeName)) {
HashMapNotNull<String, List<String>> storesAuthMap = new HashMapNotNull<>();
storesAuthMap.put(storeName, subscribedStoresAuthMap.get(storeName));
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate(new Body(Endless
.DEFAULT_LIMIT,
query, storesAuthMap,
stores, false)), BASE_HOST);
}
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate( new Body(Endless
.DEFAULT_LIMIT, query,
stores, false)), BASE_HOST);
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores) {
BaseBodyDecorator decorator = new BaseBodyDecorator(new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()),SecurePreferencesImplementation.getInstance());
IdsRepository idsRepository = new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate(new Body(
Endless.DEFAULT_LIMIT, query, StoreUtils
.getSubscribedStoresIds(), StoreUtils
.getSubscribedStoresAuthMap(), false)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate( new Body(Endless
.DEFAULT_LIMIT,
query, false)), BASE_HOST);
}
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores, boolean trustedOnly) {
BaseBodyDecorator decorator = new BaseBodyDecorator(new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()),SecurePreferencesImplementation.getInstance());
IdsRepository idsRepository = new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate(new Body(Endless
.DEFAULT_LIMIT,
query, StoreUtils
.getSubscribedStoresIds(), StoreUtils
.getSubscribedStoresAuthMap(), trustedOnly)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate( new Body(Endless
.DEFAULT_LIMIT,
query, trustedOnly)),
BASE_HOST);
}
}
@Override
protected Observable<ListSearchApps> loadDataFromNetwork(Interfaces interfaces, boolean bypassCache) {
return interfaces.listSearchApps(body, bypassCache);
}
@EqualsAndHashCode(callSuper = true)
public static class Body extends BaseBody implements Endless {
@Getter private Integer limit;
@Getter @Setter private int offset;
@Getter private String query;
@Getter private List<Long> storeIds;
@Getter private List<String> storeNames;
@Getter private HashMapNotNull<String, List<String>> storesAuthMap;
@Getter private Boolean trusted;
public Body(Integer limit, String query, List<Long> storeIds, HashMapNotNull<String,List<String>> storesAuthMap, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeIds = storeIds;
this.storesAuthMap = storesAuthMap;
this.trusted = trusted;
}
public Body(Integer limit, String query, List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, HashMapNotNull<String,List<String>> storesAuthMap, List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storesAuthMap = storesAuthMap;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, Boolean trusted) {
this.limit = limit;
this.query = query;
this.trusted = trusted;
}
}
=======
private ListSearchAppsRequest(OkHttpClient httpClient, Converter.Factory converterFactory,
Body body, String baseHost) {
super(body, httpClient, converterFactory, baseHost);
}
public static ListSearchAppsRequest of(String query, String storeName) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
IdsRepository idsRepository =
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
List<String> stores = Collections.singletonList(storeName);
Map<String, List<String>> subscribedStoresAuthMap = StoreUtils.getSubscribedStoresAuthMap();
if (subscribedStoresAuthMap != null && subscribedStoresAuthMap.containsKey(storeName)) {
Map<String, List<String>> storesAuthMap = new HashMap<>();
storesAuthMap.put(storeName, subscribedStoresAuthMap.get(storeName));
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(), (Body) decorator.decorate(
new Body(Endless.DEFAULT_LIMIT, query, storesAuthMap, stores, false)), BASE_HOST);
}
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(),
(Body) decorator.decorate(new Body(Endless.DEFAULT_LIMIT, query, stores, false)),
BASE_HOST);
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
IdsRepository idsRepository =
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(), (Body) decorator.decorate(
new Body(Endless.DEFAULT_LIMIT, query, StoreUtils.getSubscribedStoresIds(),
StoreUtils.getSubscribedStoresAuthMap(), false)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(),
(Body) decorator.decorate(new Body(Endless.DEFAULT_LIMIT, query, false)), BASE_HOST);
}
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores,
boolean trustedOnly) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(), (Body) decorator.decorate(
new Body(Endless.DEFAULT_LIMIT, query, StoreUtils.getSubscribedStoresIds(),
StoreUtils.getSubscribedStoresAuthMap(), trustedOnly)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(),
(Body) decorator.decorate(new Body(Endless.DEFAULT_LIMIT, query, trustedOnly)),
BASE_HOST);
}
}
@Override protected Observable<ListSearchApps> loadDataFromNetwork(Interfaces interfaces,
boolean bypassCache) {
return interfaces.listSearchApps(body, bypassCache);
}
@EqualsAndHashCode(callSuper = true) public static class Body extends BaseBody
implements Endless {
@Getter private Integer limit;
@Getter @Setter private int offset;
@Getter private String query;
@Getter private List<Long> storeIds;
@Getter private List<String> storeNames;
@Getter private Map<String, List<String>> storesAuthMap;
@Getter private Boolean trusted;
public Body(Integer limit, String query, List<Long> storeIds,
Map<String, List<String>> storesAuthMap, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeIds = storeIds;
this.storesAuthMap = storesAuthMap;
this.trusted = trusted;
}
public Body(Integer limit, String query, List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, Map<String, List<String>> storesAuthMap,
List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storesAuthMap = storesAuthMap;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, Boolean trusted) {
this.limit = limit;
this.query = query;
this.trusted = trusted;
}
}
>>>>>>>
private ListSearchAppsRequest(OkHttpClient httpClient, Converter.Factory converterFactory,
Body body, String baseHost) {
super(body, httpClient, converterFactory, baseHost);
}
public static ListSearchAppsRequest of(String query, String storeName) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
IdsRepository idsRepository =
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
List<String> stores = Collections.singletonList(storeName);
HashMapNotNull<String, List<String>> subscribedStoresAuthMap = StoreUtils.getSubscribedStoresAuthMap();
if (subscribedStoresAuthMap != null && subscribedStoresAuthMap.containsKey(storeName)) {
HashMapNotNull<String, List<String>> storesAuthMap = new HashMapNotNull<>();
storesAuthMap.put(storeName, subscribedStoresAuthMap.get(storeName));
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate(new Body(Endless
.DEFAULT_LIMIT,
query, storesAuthMap,
stores, false)), BASE_HOST);
}
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(), WebService.getDefaultConverter(), (Body) decorator.decorate( new Body(Endless
.DEFAULT_LIMIT, query,
stores, false)), BASE_HOST);
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
IdsRepository idsRepository =
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext());
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(), (Body) decorator.decorate(
new Body(Endless.DEFAULT_LIMIT, query, StoreUtils.getSubscribedStoresIds(),
StoreUtils.getSubscribedStoresAuthMap(), false)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(),
(Body) decorator.decorate(new Body(Endless.DEFAULT_LIMIT, query, false)), BASE_HOST);
}
}
public static ListSearchAppsRequest of(String query, boolean addSubscribedStores,
boolean trustedOnly) {
BaseBodyDecorator decorator = new BaseBodyDecorator(
new IdsRepository(SecurePreferencesImplementation.getInstance(), DataProvider.getContext()));
if (addSubscribedStores) {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(), (Body) decorator.decorate(
new Body(Endless.DEFAULT_LIMIT, query, StoreUtils.getSubscribedStoresIds(),
StoreUtils.getSubscribedStoresAuthMap(), trustedOnly)), BASE_HOST);
} else {
return new ListSearchAppsRequest(OkHttpClientFactory.getSingletonClient(),
WebService.getDefaultConverter(),
(Body) decorator.decorate(new Body(Endless.DEFAULT_LIMIT, query, trustedOnly)),
BASE_HOST);
}
}
@Override protected Observable<ListSearchApps> loadDataFromNetwork(Interfaces interfaces,
boolean bypassCache) {
return interfaces.listSearchApps(body, bypassCache);
}
@EqualsAndHashCode(callSuper = true) public static class Body extends BaseBody
implements Endless {
@Getter private Integer limit;
@Getter @Setter private int offset;
@Getter private String query;
@Getter private List<Long> storeIds;
@Getter private List<String> storeNames;
@Getter private HashMapNotNull<String, List<String>> storesAuthMap;
@Getter private Boolean trusted;
public Body(Integer limit, String query, List<Long> storeIds, HashMapNotNull<String,List<String>> storesAuthMap, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeIds = storeIds;
this.storesAuthMap = storesAuthMap;
this.trusted = trusted;
}
public Body(Integer limit, String query, List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, HashMapNotNull<String,List<String>> storesAuthMap, List<String> storeNames, Boolean trusted) {
this.limit = limit;
this.query = query;
this.storesAuthMap = storesAuthMap;
this.storeNames = storeNames;
this.trusted = trusted;
}
public Body(Integer limit, String query, Boolean trusted) {
this.limit = limit;
this.query = query;
this.trusted = trusted;
}
} |
<<<<<<<
import cm.aptoide.analytics.implementation.navigation.ScreenTagHistory;
=======
import cm.aptoide.pt.analytics.ScreenTagHistory;
import cm.aptoide.pt.app.AppBoughtReceiver;
>>>>>>>
import cm.aptoide.analytics.implementation.navigation.ScreenTagHistory;
import cm.aptoide.pt.app.AppBoughtReceiver; |
<<<<<<<
Analytics analytics, String storeTheme) {
=======
Analytics analytics, AptoideAccountManager accountManager,
AptoideClientUUID aptoideClientUUID) {
>>>>>>>
Analytics analytics, AptoideAccountManager accountManager,
AptoideClientUUID aptoideClientUUID, String storeTheme) {
<<<<<<<
this.storeTheme = storeTheme;
=======
this.accountManager = accountManager;
this.aptoideClientUUID = aptoideClientUUID;
>>>>>>>
this.accountManager = accountManager;
this.aptoideClientUUID = aptoideClientUUID;
this.storeTheme = storeTheme;
<<<<<<<
new InstallEventConverter(idsRepository, accountManager), Analytics.getInstance(),
appUpdate.getStore().getAppearance().getTheme());
=======
new InstallEventConverter(idsRepository, accountManager), Analytics.getInstance(),
accountManager, idsRepository);
>>>>>>>
new InstallEventConverter(idsRepository, accountManager), Analytics.getInstance(),
accountManager, idsRepository, appUpdate.getStore().getAppearance().getTheme()); |
<<<<<<<
import cm.aptoide.pt.model.v3.InAppBillingSkuDetailsResponse;
=======
>>>>>>>
import cm.aptoide.pt.preferences.toolbox.ToolboxManager; |
<<<<<<<
=======
@Override public void onResume() {
super.onResume();
setUserDataOnHeader();
}
private void setUserDataOnHeader() {
if(navigationView==null || navigationView.getVisibility()!=View.VISIBLE){
// if the navigation view is not visible do nothing
return;
}
View baseHeaderView = navigationView.getHeaderView(0);
TextView userEmail = (TextView) baseHeaderView.findViewById(R.id.profile_email_text);
TextView userUsername = (TextView) baseHeaderView.findViewById(R.id.profile_name_text);
ImageView userAvatarImage = (ImageView) baseHeaderView.findViewById(R.id.profile_image);
if (accountManager.isLoggedIn()) {
userEmail.setVisibility(View.VISIBLE);
userUsername.setVisibility(View.VISIBLE);
Account account = accountManager.getAccount();
userEmail.setText(account.getEmail());
userUsername.setText(account.getNickname());
ImageLoader.with(getContext())
.loadWithCircleTransformAndPlaceHolder(account.getAvatar(), userAvatarImage,
R.drawable.user_account_white);
return;
}
userEmail.setText("");
userUsername.setText("");
userEmail.setVisibility(View.GONE);
userUsername.setVisibility(View.GONE);
ImageLoader.with(getContext()).load(R.drawable.user_account_white, userAvatarImage);
}
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
=======
import cm.aptoide.pt.dataprovider.ws.v3.BaseBody;
>>>>>>>
import cm.aptoide.pt.dataprovider.ws.v3.BaseBody;
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
<<<<<<<
PackageInfo pInfo = null;
try {
pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
PushNotificationsRequest.of(
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(), this),
pInfo == null ? "" : pInfo.versionName, BuildConfig.APPLICATION_ID)
=======
PushNotificationsRequest.of(baseBodyInterceptorV3)
>>>>>>>
PackageInfo pInfo = null;
try {
pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
PushNotificationsRequest.of(
new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(), this),
pInfo == null ? "" : pInfo.versionName, BuildConfig.APPLICATION_ID) |
<<<<<<<
=======
import cm.aptoide.pt.preferences.managed.ManagerPreferences;
import cm.aptoide.pt.utils.q.QManager;
import cm.aptoide.pt.v8engine.V8Engine;
>>>>>>>
import cm.aptoide.pt.preferences.managed.ManagerPreferences;
import cm.aptoide.pt.utils.q.QManager;
<<<<<<<
body.setAptoideUid(idsRepository.getUniqueIdentifier());
if (account.isLoggedIn()) {
body.setAccessToken(account.getAccessToken());
}
return body;
=======
body.setAptoideUID(idsRepository.getUniqueIdentifier());
body.setQ(V8Engine.getQManager()
.getFilters(ManagerPreferences.getHWSpecsFilter()));
>>>>>>>
body.setAptoideUid(idsRepository.getUniqueIdentifier());
body.setQ(qManager
.getFilters(ManagerPreferences.getHWSpecsFilter()));
if (account.isLoggedIn()) {
body.setAccessToken(account.getAccessToken());
}
return body; |
<<<<<<<
=======
//private static final int SPOT_SHARE_PERMISSION_REQUEST_CODE = 6531;
private static final String TAG = HomeFragment.class.getName();
>>>>>>>
//private static final int SPOT_SHARE_PERMISSION_REQUEST_CODE = 6531;
private static final String TAG = HomeFragment.class.getName();
<<<<<<<
private ApplicationPreferences appPreferences;
=======
private IssuesAnalytics issuesAnalytics;
>>>>>>>
private ApplicationPreferences appPreferences;
private IssuesAnalytics issuesAnalytics;
<<<<<<<
Analytics.getInstance(), aptoideNavigationTracker);
=======
analytics, aptoideNavigationTracker);
>>>>>>>
analytics, aptoideNavigationTracker);
<<<<<<<
setHasOptionsMenu(true);
}
private enum BundleKeys {
STORE_NAME, STORE_CONTEXT, STORE_THEME
=======
Analytics.AppViewViewedFrom.addStepToList("HOME");
>>>>>>>
setHasOptionsMenu(true);
}
private enum BundleKeys {
STORE_NAME, STORE_CONTEXT, STORE_THEME |
<<<<<<<
PackageInfo packageInfo = AptoideUtils.SystemU.getPackageInfo(packageName);
if (checkAndLogNullPackageInfo(packageInfo)) {
return;
}
=======
if (checkAndLogNullPackageInfo(packageInfo, packageName)) {
return;
}
>>>>>>>
PackageInfo packageInfo = AptoideUtils.SystemU.getPackageInfo(packageName);
if (checkAndLogNullPackageInfo(packageInfo, packageName)) {
return;
} |
<<<<<<<
import cm.aptoide.pt.abtesting.Experiment;
import cm.aptoide.pt.abtesting.experiments.IronSourceInterstitialAdExperiment;
import cm.aptoide.pt.abtesting.experiments.SimilarAdExperiment;
=======
>>>>>>>
import cm.aptoide.pt.abtesting.experiments.IronSourceInterstitialAdExperiment;
<<<<<<<
String marketName, AppCoinsManager appCoinsManager, SimilarAdExperiment similarAdExperiment,
IronSourceInterstitialAdExperiment ironSourceInterstitialAdExperiment,
IronSourceAdRepository ironSourceAdRepository) {
=======
String marketName, AppCoinsManager appCoinsManager) {
>>>>>>>
String marketName, AppCoinsManager appCoinsManager,
IronSourceInterstitialAdExperiment ironSourceInterstitialAdExperiment,
IronSourceAdRepository ironSourceAdRepository) {
<<<<<<<
this.similarAdExperiment = similarAdExperiment;
this.ironSourceInterstitialAdExperiment = ironSourceInterstitialAdExperiment;
this.ironSourceAdRepository = ironSourceAdRepository;
=======
>>>>>>>
this.ironSourceInterstitialAdExperiment = ironSourceInterstitialAdExperiment;
this.ironSourceAdRepository = ironSourceAdRepository; |
<<<<<<<
private TimelineAnalytics timelineAnalytics;
=======
@Inject SearchSuggestionManager searchSuggestionManager;
>>>>>>>
private TimelineAnalytics timelineAnalytics;
@Inject SearchSuggestionManager searchSuggestionManager;
<<<<<<<
public IdsRepository getIdsRepository() {
return idsRepository;
}
=======
public TrendingManager getTrendingManager() {
return trendingManager;
}
>>>>>>>
public TrendingManager getTrendingManager() {
return trendingManager;
}
<<<<<<<
=======
public ObjectMapper getNonNullObjectMapper() {
return nonNullObjectMapper;
}
public OkHttpClient getDefaultWebSocketClient() {
return webSocketClient;
}
public IdsRepository getIdsRepository() {
return idsRepository;
}
public SearchSuggestionManager getSearchSuggestionManager() {
return searchSuggestionManager;
}
>>>>>>>
public ObjectMapper getNonNullObjectMapper() {
return nonNullObjectMapper;
}
public OkHttpClient getDefaultWebSocketClient() {
return webSocketClient;
}
public IdsRepository getIdsRepository() {
return idsRepository;
}
public SearchSuggestionManager getSearchSuggestionManager() {
return searchSuggestionManager;
} |
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "marketName",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "marketName", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "marketName", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager);
<<<<<<<
notificationAnalytics, installAnalytics, limit, socialRepository, "anyString",
appCoinsManager, promotionsManager, "", installedRepository, migrationManager);
=======
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, migrationManager);
>>>>>>>
notificationAnalytics, installAnalytics, limit, Schedulers.immediate(),
socialRepository, "anyString", appCoinsManager, promotionsManager, "",
installedRepository, migrationManager); |
<<<<<<<
installManager = new InstallManager(getDownloadManager(),
new InstallerFactory(new MinimalAdMapper()).create(this, installerType),
getDefaultSharedPreferences(),
=======
installManager = new InstallManager(getApplicationContext(), getDownloadManager(),
new InstallerFactory().create(this, installerType), getDefaultSharedPreferences(),
>>>>>>>
installManager = new InstallManager(getApplicationContext(), getDownloadManager(),
new InstallerFactory(new MinimalAdMapper()).create(this, installerType), getDefaultSharedPreferences(), |
<<<<<<<
long likes, long comments, DateCalculator dateCalculator,
TimelineMetricsManager timelineMetricsManager, SocialRepository socialRepository,
SpannableFactory spannableFactory, StoreCredentialsProvider storeCredentialsProvider) {
=======
long likes, long comments, DateCalculator dateCalculator, TimelineAnalytics timelineAnalytics,
SocialRepository socialRepository, SpannableFactory spannableFactory) {
>>>>>>>
long likes, long comments, DateCalculator dateCalculator, TimelineAnalytics timelineAnalytics,
SocialRepository socialRepository, SpannableFactory spannableFactory,
StoreCredentialsProvider storeCredentialsProvider) {
<<<<<<<
DateCalculator dateCalculator, TimelineMetricsManager timelineMetricsManager,
SocialRepository socialRepository, SpannableFactory spannableFactory,
StoreCredentialsProvider storeCredentialsProvider) {
=======
DateCalculator dateCalculator, TimelineAnalytics timelineAnalytics,
SocialRepository socialRepository, SpannableFactory spannableFactory) {
>>>>>>>
DateCalculator dateCalculator, TimelineAnalytics timelineAnalytics,
SocialRepository socialRepository, SpannableFactory spannableFactory,
StoreCredentialsProvider storeCredentialsProvider) {
<<<<<<<
socialStoreLatestApps.getStats().getComments(), dateCalculator, timelineMetricsManager,
socialRepository, spannableFactory, storeCredentialsProvider);
=======
socialStoreLatestApps.getStats().getComments(), dateCalculator, timelineAnalytics,
socialRepository, spannableFactory);
>>>>>>>
socialStoreLatestApps.getStats().getComments(), dateCalculator, timelineAnalytics,
socialRepository, spannableFactory, storeCredentialsProvider); |
<<<<<<<
=======
Object createNull();
Object createMap();
>>>>>>>
Object createNull(); |
<<<<<<<
=======
/*
@Test
public void no_hit_returns_null() throws Exception {
with(JSON).assertThat("$.store.book[1000].title", Matchers.<Object>nullValue());
}
*/
>>>>>>>
<<<<<<<
@Test(expected = InvalidPathException.class)
public void assert_that_invalid_path_is_thrown() {
JsonAsserter asserter = JsonAssert.with("{\"foo\":\"bar\"}");
asserter.assertEquals("$foo", "bar");
}
=======
@Test(expected = AssertionError.class)
public void testAssertEqualsIntegerInvalidField() throws Exception {
with(getResourceAsStream("lotto.json")).assertEquals("lotto.winners[0].winnerId1", 24);
}
>>>>>>>
@Test(expected = AssertionError.class)
public void testAssertEqualsIntegerInvalidField() throws Exception {
with(getResourceAsStream("lotto.json")).assertEquals("lotto.winners[0].winnerId1", 24);
} |
<<<<<<<
Class<? extends Importer> importerClass;
String id;
Provider provider;
String name;
String description;
String url; // Url of the datasource for that series
String remoteDatafile; // Remote datafile
List<Attribute> timedValueAttributes = new ArrayList<>();
List<Attribute> fixedValueAttributes = new ArrayList<>();
=======
private Class<? extends Importer> importerClass;
private String id;
private Provider provider;
private String name;
private String description;
private String url; // Url of the datasource for that series
private String remoteDatafile; // Remote datafile
private String localDatafile; // Location of the local version of the datafile
private List<Attribute> timedValueAttributes = new ArrayList<>();
private List<Attribute> fixedValueAttributes = new ArrayList<>();
>>>>>>>
private Class<? extends Importer> importerClass;
private String id;
private Provider provider;
private String name;
private String description;
private String url; // Url of the datasource for that series
private String remoteDatafile; // Remote datafile
private List<Attribute> timedValueAttributes = new ArrayList<>();
private List<Attribute> fixedValueAttributes = new ArrayList<>(); |
<<<<<<<
=======
import uk.org.tombolo.core.utils.AttributeUtils;
import uk.org.tombolo.core.utils.SubjectTypeUtils;
>>>>>>>
import uk.org.tombolo.core.utils.SubjectTypeUtils; |
<<<<<<<
public static FieldSpecificationBuilder percentilesField(
String label,
String name,
FieldSpecificationBuilder valueFieldBulder,
List<SubjectSpecificationBuilder> normalizationSubjects,
Integer percentileCount,
Boolean inverse){
FieldSpecificationBuilder spec = new FieldSpecificationBuilder();
spec .setFieldClass("uk.org.tombolo.field.PercentilesField")
.setLabel(label)
.set("name", name)
.set("valueField", valueFieldBulder)
.set("normalizationSubjects", normalizationSubjects)
.set("percentileCount", percentileCount)
.set("inverse", inverse);
return spec;
}
=======
public static FieldSpecificationBuilder percentilesField(String label, Integer percentileCount, Boolean inverse) {
FieldSpecificationBuilder spec = new FieldSpecificationBuilder();
spec .setFieldClass("uk.org.tombolo.field.PercentilesField")
.setLabel(label)
.set("percentileCount", percentileCount)
.set("inverse", inverse);
return spec;
}
>>>>>>>
public static FieldSpecificationBuilder percentilesField(
String label,
Integer percentileCount,
Boolean inverse){
FieldSpecificationBuilder spec = new FieldSpecificationBuilder();
spec .setFieldClass("uk.org.tombolo.field.PercentilesField")
.setLabel(label)
.set("percentileCount", percentileCount)
.set("inverse", inverse);
return spec;
} |
<<<<<<<
DatasourceId datasourceIdObject = DatasourceId.valueOf(datasourceId);
Datasource datasource = new Datasource(
getClass(),
datasourceIdObject.name(),
getProvider(),
subjectTypeNames.get(datasourceIdObject.ordinal()),
subjectTYpeDesc.get(datasourceIdObject.ordinal()));
datasource.addSubjectType(new SubjectType(datasource.getId(), datasource.getDescription()));
return datasource;
=======
SubjectTypeLabel datasourceIdObject = SubjectTypeLabel.valueOf(datasourceId);
Datasource datasource;
switch (datasourceIdObject) {
case lsoa:
datasource = new Datasource(getClass(),datasourceIdObject.name(), getProvider(), "LSOA", "Lower Layer Super Output Areas");
datasource.setRemoteDatafile("http://geoportal.statistics.gov.uk/datasets/da831f80764346889837c72508f046fa_2.geojson");
datasource.setLocalDatafile("lsoa/Lower_layer_Super_Output_Areas_December_2011_Generalised_Clipped__Boundaries_in_England_and_Wales.geojson");
datasource.addSubjectType(new SubjectType(getProvider(), datasource.getId(), datasource.getDescription()));
return datasource;
case msoa:
datasource = new Datasource(getClass(),datasourceIdObject.name(), getProvider(), "MSOA", "Middle Layer Super Output Areas");
datasource.setRemoteDatafile("http://geoportal.statistics.gov.uk/datasets/826dc85fb600440889480f4d9dbb1a24_2.geojson");
datasource.setLocalDatafile("msoa/Middle_Layer_Super_Output_Areas_December_2011_Generalised_Clipped_Boundaries_in_England_and_Wales.geojson");
datasource.addSubjectType(new SubjectType(getProvider(), datasource.getId(), datasource.getDescription()));
return datasource;
case localAuthority:
datasource = new Datasource(getClass(),datasourceIdObject.name(), getProvider(), "Local Authority", "Local Authority");
datasource.setUrl("http://geoportal.statistics.gov.uk/datasets/3943c2114d764294a7c0079c4020d558_4");
datasource.setRemoteDatafile("http://geoportal.statistics.gov.uk/datasets/3943c2114d764294a7c0079c4020d558_4.geojson");
datasource.setLocalDatafile("localAuthority/Local_Authority_Districts_December_2011_Generalised_Clipped_Boundaries_in_Great_Britain.geojson");
datasource.addSubjectType(new SubjectType(getProvider(), datasource.getId(), datasource.getDescription()));
return datasource;
default:
throw new IllegalArgumentException(String.format("Datasource is not valid: %s", datasourceId));
}
>>>>>>>
DatasourceId datasourceIdObject = DatasourceId.valueOf(datasourceId);
Datasource datasource = new Datasource(
getClass(),
datasourceIdObject.name(),
getProvider(),
subjectTypeNames.get(datasourceIdObject.ordinal()),
subjectTYpeDesc.get(datasourceIdObject.ordinal()));
datasource.addSubjectType(new SubjectType(getProvider(), datasource.getId(), datasource.getDescription()));
return datasource; |
<<<<<<<
import net.minecraft.command.CommandException;
=======
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
>>>>>>>
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import net.minecraft.command.CommandException;
<<<<<<<
public String doCmd(ICommandSender sender, World world, String[] args) throws CommandException
=======
@Override
public void parse(CommandParserArgs arguments)
>>>>>>>
@Override
public void parse(CommandParserArgs arguments) throws CommandException
<<<<<<<
WeatherTimeData wt = CommandDataManager.WTmap.get(world.provider.getDimensionId());
wt.weatherSpecified = true;
=======
>>>>>>> |
<<<<<<<
import com.xebia.incubator.xebium.fastseleniumemulation.FastWebDriverCommandProcessor;
=======
import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor;
>>>>>>>
import com.xebia.incubator.xebium.fastseleniumemulation.FastWebDriverCommandProcessor;
import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor; |
<<<<<<<
import org.apache.commons.math3.util.FastMath;
=======
import org.esa.beam.util.logging.BeamLogManager;
>>>>>>>
import org.esa.beam.util.logging.BeamLogManager;
import org.apache.commons.math3.util.FastMath; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.