conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
AppViewAnalytics appViewAnalytics, StoreAnalytics storeAnalytics,
AppViewNavigator appViewNavigator,
AppViewManager appViewManager, AptoideAccountManager accountManager, Scheduler scheduler,
CrashReport crashReport, long appId, String packageName) {
=======
AppViewAnalytics appViewAnalytics, AppViewNavigator appViewNavigator,
AppViewManager appViewManager, AptoideAccountManager accountManager, Scheduler viewScheduler,
CrashReport crashReport, PermissionManager permissionManager,
PermissionService permissionService) {
>>>>>>>
AppViewAnalytics appViewAnalytics, StoreAnalytics storeAnalytics, AppViewNavigator appViewNavigator,
AppViewManager appViewManager, AptoideAccountManager accountManager, Scheduler viewScheduler,
CrashReport crashReport, PermissionManager permissionManager,
PermissionService permissionService) {
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.filter(app -> !TextUtils.isEmpty(app
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.filter(app -> !TextUtils.isEmpty(app
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.filter(app -> !TextUtils.isEmpty(app
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.filter(app -> !TextUtils.isEmpty(app.getDetailedApp()
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.doOnNext(app -> view.navigateToDeveloperPermissions(app))
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(app -> view.navigateToDeveloperPermissions(app.getDetailedApp()))
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(app -> view.navigateToDeveloperPermissions(app))
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.doOnNext(app -> {
storeAnalytics.sendStoreOpenEvent("App View", app.getStore()
.getName(), true);
appViewAnalytics.sendOpenStoreEvent();
appViewNavigator.navigateToStore(app.getStore());
})
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(app -> appViewNavigator.navigateToStore(app.getDetailedApp()
.getStore()))
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(app -> {
storeAnalytics.sendStoreOpenEvent("App View", app.getStore()
.getName(), true);
appViewAnalytics.sendOpenStoreEvent();
appViewNavigator.navigateToStore(app.getStore());
})
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.doOnNext(model -> {
appViewAnalytics.sendBadgeClickEvent();
view.showTrustedDialog(model);
})
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(model -> view.showTrustedDialog(model.getDetailedApp()))
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(model -> {
appViewAnalytics.sendBadgeClickEvent();
view.showTrustedDialog(model);
})
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.observeOn(scheduler)
.doOnNext(model -> appViewAnalytics.sendRateThisAppEvent())
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.observeOn(viewScheduler)
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.observeOn(viewScheduler)
.doOnNext(model -> appViewAnalytics.sendRateThisAppEvent())
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.doOnNext(model -> appViewAnalytics.sendFlagAppEvent(type.name()))
.flatMapSingle(model -> appViewManager.addApkFlagRequestAction(model.getStore()
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.flatMapSingle(model -> appViewManager.flagApp(model.getStore()
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.doOnNext(model -> appViewAnalytics.sendFlagAppEvent(type.name()))
.flatMapSingle(model -> appViewManager.flagApp(model.getStore()
<<<<<<<
.flatMapSingle(__ -> appViewManager.getDetailedAppViewModel(appId, packageName))
.observeOn(scheduler)
.doOnNext(app -> {
view.defaultShare(app.getAppName(), app.getwUrls());
appViewAnalytics.sendAppShareEvent();
})
=======
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.observeOn(viewScheduler)
.doOnNext(app -> view.defaultShare(app.getAppName(), app.getwUrls()))
>>>>>>>
.flatMapSingle(__ -> appViewManager.loadAppViewViewModel())
.observeOn(viewScheduler)
.doOnNext(app -> {
view.defaultShare(app.getAppName(), app.getwUrls());
appViewAnalytics.sendAppShareEvent();
})
<<<<<<<
private Completable updateSuggestedApps(DetailedAppViewModel appViewModel) {
return appViewManager.loadSimilarApps(view.getPackageName(), appViewModel
.getMedia()
.getKeywords(), 2)
.observeOn(scheduler)
=======
private Completable updateSuggestedApps(AppViewViewModel appViewModel) {
return appViewManager.loadSimilarApps(appViewModel.getPackageName(),
appViewModel.getDetailedApp()
.getMedia()
.getKeywords())
.observeOn(viewScheduler)
>>>>>>>
private Completable updateSuggestedApps(AppViewViewModel appViewModel) {
return appViewManager.loadSimilarApps(appViewModel.getPackageName(),
appViewModel.getDetailedApp()
.getMedia()
.getKeywords())
.observeOn(viewScheduler)
<<<<<<<
private Completable updateReviews(DetailedAppViewModel appViewModel) {
return appViewManager.getReviewsViewModel(appViewModel
=======
private Completable updateReviews(AppViewViewModel appViewModel) {
return appViewManager.loadReviewsViewModel(appViewModel.getDetailedApp()
>>>>>>>
private Completable updateReviews(AppViewViewModel appViewModel) {
return appViewManager.loadReviewsViewModel(appViewModel.getDetailedApp() |
<<<<<<<
private GetAppMeta.App boughtApp;
private PermissionManager permissionManager;
=======
>>>>>>>
private PermissionManager permissionManager;
<<<<<<<
appRepository = new AppRepository(new NetworkOperatorManager((TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE)));
=======
installManager = new InstallManager(permissionManager, getContext().getPackageManager(),
new DownloadInstallationProvider(downloadManager));
productFactory = new ProductFactory();
appRepository = new AppRepository(new NetworkOperatorManager((TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE)),
productFactory);
>>>>>>>
installManager = new InstallManager(permissionManager, getContext().getPackageManager(),
new DownloadInstallationProvider(downloadManager));
productFactory = new ProductFactory();
appRepository = new AppRepository(new NetworkOperatorManager((TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE)),
productFactory); |
<<<<<<<
private Completable payApp(DownloadAppViewModel.Action action) {
return appViewManager.loadAppViewViewModel()
.doOnSuccess(appViewViewModel -> {
billingAnalytics.sendPaymentViewShowEvent();
appViewNavigator.buyApp(appViewViewModel.getAppId());
})
.toCompletable();
}
=======
private void showRecommendsDialog(boolean isLoggedIn, AppViewViewModel appViewViewModel) {
if (isLoggedIn && appViewManager.shouldShowRecommendsPreviewDialog()) {
view.showRecommendsDialog();
appViewAnalytics.sendLoggedInRecommendAppDialogShowEvent(appViewViewModel.getPackageName());
} else if (!isLoggedIn && appViewManager.canShowNotLoggedInDialog()) {
appViewNavigator.navigateToNotLoggedInShareFragmentForResult(
appViewViewModel.getPackageName());
appViewAnalytics.sendNotLoggedInRecommendAppDialogShowEvent(
appViewViewModel.getPackageName());
}
}
>>>>>>>
private void showRecommendsDialog(boolean isLoggedIn, AppViewViewModel appViewViewModel) {
if (isLoggedIn && appViewManager.shouldShowRecommendsPreviewDialog()) {
view.showRecommendsDialog();
appViewAnalytics.sendLoggedInRecommendAppDialogShowEvent(appViewViewModel.getPackageName());
} else if (!isLoggedIn && appViewManager.canShowNotLoggedInDialog()) {
appViewNavigator.navigateToNotLoggedInShareFragmentForResult(
appViewViewModel.getPackageName());
appViewAnalytics.sendNotLoggedInRecommendAppDialogShowEvent(
appViewViewModel.getPackageName());
}
}
private Completable payApp(DownloadAppViewModel.Action action) {
return appViewManager.loadAppViewViewModel()
.doOnSuccess(appViewViewModel -> {
billingAnalytics.sendPaymentViewShowEvent();
appViewNavigator.buyApp(appViewViewModel.getAppId());
})
.toCompletable();
} |
<<<<<<<
listComments,
=======
listStoreComments,
getMyStoresSubscribed,
getStoresRecommended,
>>>>>>>
listComments,
getMyStoresSubscribed,
getStoresRecommended, |
<<<<<<<
=======
import com.jakewharton.rxbinding.view.RxView;
>>>>>>> |
<<<<<<<
=======
private LinearLayout share;
>>>>>>>
<<<<<<<
=======
share = (LinearLayout) itemView.findViewById(R.id.social_share);
>>>>>>>
<<<<<<<
=======
compositeSubscription.add(RxView.clicks(share).subscribe(click -> {
shareCard(displayable);
}, throwable -> throwable.printStackTrace()));
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.view.app.AppCenter;
import cm.aptoide.pt.view.app.DetailedApp;
import cm.aptoide.pt.view.app.DetailedAppRequestResult;
import java.util.ArrayList;
=======
import cm.aptoide.pt.wallet.WalletAppProvider;
>>>>>>>
import cm.aptoide.pt.wallet.WalletAppProvider;
import java.util.ArrayList; |
<<<<<<<
final String userAccess = privacy ? BaseActivity.UserAccessState.UNLISTED.toString()
: BaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken, null)
=======
final String userAccess = privacy ? AccountBaseActivity.UserAccessState.UNLISTED.toString()
: AccountBaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken)
>>>>>>>
final String userAccess = privacy ? AccountBaseActivity.UserAccessState.UNLISTED.toString()
: AccountBaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken, null)
<<<<<<<
final String userAccess = privacy ? BaseActivity.UserAccessState.UNLISTED.toString()
: BaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken, null)
=======
final String userAccess = privacy ? AccountBaseActivity.UserAccessState.UNLISTED.toString()
: AccountBaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken)
>>>>>>>
final String userAccess = privacy ? AccountBaseActivity.UserAccessState.UNLISTED.toString()
: AccountBaseActivity.UserAccessState.PUBLIC.toString();
SetUserRequest.of(aptoideClientUUID, userAccess, accessToken, null) |
<<<<<<<
=======
import java.util.Collections;
import java.util.List;
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.accountmanager.ws.responses.GetUserRepoSubscription;
import cm.aptoide.pt.database.Database;
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.database.realm.Store;
>>>>>>>
import java.util.Collections;
import java.util.List;
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.accountmanager.ws.responses.GetUserRepoSubscription;
import cm.aptoide.pt.database.Database;
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.database.realm.Store;
<<<<<<<
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.utils.SystemUtils;
=======
import cm.aptoide.pt.dataprovider.util.DataproviderUtils;
import cm.aptoide.pt.dataprovider.ws.v7.listapps.StoreUtils;
import cm.aptoide.pt.preferences.secure.SecurePreferences;
import cm.aptoide.pt.utils.AptoideUtils;
import io.realm.Realm;
import lombok.Cleanup;
>>>>>>>
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.utils.SystemUtils;
import cm.aptoide.pt.dataprovider.util.DataproviderUtils;
import cm.aptoide.pt.dataprovider.ws.v7.listapps.StoreUtils;
import cm.aptoide.pt.preferences.secure.SecurePreferences;
import cm.aptoide.pt.utils.AptoideUtils;
import io.realm.Realm;
import lombok.Cleanup;
<<<<<<<
AptoideDownloadManager.getInstance().init(this);
=======
if (SecurePreferences.isFirstRun()) {
loadInstalledApps();
DataproviderUtils.checkUpdates();
if (AptoideAccountManager.isLoggedIn()) {
if (!SecurePreferences.isUserDataLoaded()) {
loadUserData();
SecurePreferences.setUserDataLoaded();
}
}
}
Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - l) + " millis.");
}
private void loadInstalledApps() {
@Cleanup Realm realm = Database.get(this);
Database.dropTable(Installed.class, realm);
List<PackageInfo> installedApps = AptoideUtils.SystemU.getUserInstalledApps();
Log.d(TAG, "Found " + installedApps.size() + " user installed apps.");
// Installed apps are inserted in database based on their firstInstallTime. Older comes first.
Collections.sort(installedApps, (lhs, rhs) -> (int) ((lhs.firstInstallTime - rhs.firstInstallTime) / 1000));
for (PackageInfo packageInfo : installedApps) {
Installed installed = new Installed(packageInfo, getPackageManager());
Database.save(installed, realm);
}
>>>>>>>
if (SecurePreferences.isFirstRun()) {
loadInstalledApps();
DataproviderUtils.checkUpdates();
if (AptoideAccountManager.isLoggedIn()) {
if (!SecurePreferences.isUserDataLoaded()) {
loadUserData();
SecurePreferences.setUserDataLoaded();
}
}
}
Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - l) + " millis.");
AptoideDownloadManager.getInstance().init(this);
}
private void loadInstalledApps() {
@Cleanup Realm realm = Database.get(this);
Database.dropTable(Installed.class, realm);
List<PackageInfo> installedApps = AptoideUtils.SystemU.getUserInstalledApps();
Log.d(TAG, "Found " + installedApps.size() + " user installed apps.");
// Installed apps are inserted in database based on their firstInstallTime. Older comes first.
Collections.sort(installedApps, (lhs, rhs) -> (int) ((lhs.firstInstallTime - rhs.firstInstallTime) / 1000));
for (PackageInfo packageInfo : installedApps) {
Installed installed = new Installed(packageInfo, getPackageManager());
Database.save(installed, realm);
} |
<<<<<<<
/**
* CacheLoader which will look up the internal table ID for a given table name.
*/
private class TableNameToIdLoader extends CacheLoader<String,Table.ID> {
@Override
public Table.ID load(String tableName) throws Exception {
Instance instance = context.getInstance();
Table.ID tableId = Tables.getTableId(instance, tableName);
if (Tables.getTableState(instance, tableId) == TableState.OFFLINE)
throw new TableOfflineException(instance, tableId.canonicalID());
return tableId;
}
}
=======
>>>>>>>
<<<<<<<
private final LoadingCache<String,Table.ID> nameToIdCache;
=======
>>>>>>>
<<<<<<<
} catch (ExecutionException e) {
Throwable cause = e.getCause();
log.error("Unexpected exception when fetching table id for {}", tableName);
if (null == cause) {
throw new RuntimeException(e);
} else if (cause instanceof TableNotFoundException) {
throw (TableNotFoundException) cause;
} else if (cause instanceof TableOfflineException) {
throw (TableOfflineException) cause;
}
throw new RuntimeException(e);
=======
>>>>>>>
<<<<<<<
while (true) {
long cacheResetCount = Tables.getCacheResetCount();
// cacheResetCount could change after this point in time, but I think thats ok because just want to ensure this methods sees changes
// made before it was called.
long internalResetCount = cacheLastState.get();
if (cacheResetCount > internalResetCount) {
if (!cacheLastState.compareAndSet(internalResetCount, cacheResetCount)) {
continue; // concurrent operation, lets not possibly move cacheLastState backwards in the case where a thread pauses for along time
}
nameToIdCache.invalidateAll();
break;
}
break;
}
Table.ID tableId = getId(tableName);
=======
String tableId = getId(tableName);
>>>>>>>
Table.ID tableId = getId(tableName); |
<<<<<<<
import cm.aptoide.pt.v8engine.store.StoreAnalytics;
=======
import cm.aptoide.pt.v8engine.database.AccessorFactory;
>>>>>>>
import cm.aptoide.pt.v8engine.store.StoreAnalytics;
import cm.aptoide.pt.v8engine.database.AccessorFactory; |
<<<<<<<
import cm.aptoide.pt.database.accessors.RealmToRealmDatabaseMigration;
import cm.aptoide.pt.database.accessors.StoreAccessor;
import cm.aptoide.pt.database.realm.Download;
=======
>>>>>>>
<<<<<<<
import cm.aptoide.pt.root.RootValueSaver;
import cm.aptoide.pt.search.suggestions.TrendingService;
import cm.aptoide.pt.search.TrendingManager;
=======
>>>>>>>
import cm.aptoide.pt.search.TrendingManager;
<<<<<<<
import okhttp3.RequestBody;
import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Converter;
=======
>>>>>>>
<<<<<<<
private SyncScheduler alarmSyncScheduler;
private TrendingManager trendingManager;
=======
>>>>>>>
<<<<<<<
public OkHttpClient getLongTimeoutClient() {
if (longTimeoutClient == null) {
final OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder();
okHttpClientBuilder.addInterceptor(getUserAgentInterceptor());
okHttpClientBuilder.addInterceptor(getToolboxRetrofitLogsInterceptor());
okHttpClientBuilder.connectTimeout(2, TimeUnit.MINUTES);
okHttpClientBuilder.readTimeout(2, TimeUnit.MINUTES);
okHttpClientBuilder.writeTimeout(2, TimeUnit.MINUTES);
if (ToolboxManager.isToolboxEnableRetrofitLogs(getDefaultSharedPreferences())) {
okHttpClientBuilder.addInterceptor(getToolboxRetrofitLogsInterceptor());
}
longTimeoutClient = okHttpClientBuilder.build();
}
return longTimeoutClient;
}
public OkHttpClient getDefaultWebSocketClient() {
return getDefaultClient().newBuilder()
.readTimeout(0, TimeUnit.SECONDS)
.writeTimeout(0, TimeUnit.SECONDS)
.connectTimeout(1, TimeUnit.MINUTES)
.pingInterval(3, TimeUnit.SECONDS)
.build();
}
=======
>>>>>>> |
<<<<<<<
=======
import cm.aptoide.pt.database.accessors.DeprecatedDatabase;
>>>>>>>
import cm.aptoide.pt.database.accessors.DeprecatedDatabase;
<<<<<<<
Download download = downloadManager.getDownloadPojo(appid);
=======
@Cleanup Realm realm = DeprecatedDatabase.get();
Download download = downloadManager.getStoredDownload(appid, realm);
>>>>>>>
Download download = downloadManager.getDownloadPojo(appid); |
<<<<<<<
import rx.android.schedulers.AndroidSchedulers;
import rx.subscriptions.CompositeSubscription;
=======
import android.text.TextUtils;
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import cm.aptoide.pt.actions.PermissionManager;
import cm.aptoide.pt.database.realm.Download;
import cm.aptoide.pt.database.realm.Scheduled;
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.downloadmanager.DownloadServiceHelper;
import cm.aptoide.pt.imageloader.ImageLoader;
import cm.aptoide.pt.v8engine.R;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.ScheduledDownloadDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.widget.Displayables;
import cm.aptoide.pt.v8engine.view.recycler.widget.Widget;
import rx.android.schedulers.AndroidSchedulers;
import rx.subscriptions.CompositeSubscription;
>>>>>>>
import android.text.TextUtils;
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import cm.aptoide.pt.actions.PermissionManager;
import cm.aptoide.pt.database.realm.Download;
import cm.aptoide.pt.database.realm.Scheduled;
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.downloadmanager.DownloadServiceHelper;
import cm.aptoide.pt.imageloader.ImageLoader;
import cm.aptoide.pt.v8engine.R;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.ScheduledDownloadDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.widget.Displayables;
import cm.aptoide.pt.v8engine.view.recycler.widget.Widget;
import rx.android.schedulers.AndroidSchedulers;
import rx.subscriptions.CompositeSubscription;
<<<<<<<
private boolean isCurrentScheduled(ScheduledDownloadDisplayable displayable, Download download) {
return download.getAppId() == displayable.getPojo().getAppId();
}
=======
private void handleLoaderLogic(ScheduledDownloadDisplayable displayable) {
PermissionManager permissionManager = new PermissionManager();
DownloadServiceHelper downloadServiceHelper =
new DownloadServiceHelper(AptoideDownloadManager.getInstance(), permissionManager);
//DownloadAccessor scheduledAccessor = AccessorFactory.getAccessorFor(Download.class);
subscriptions.add(downloadServiceHelper.getAllDownloads()
.flatMapIterable(downloads -> downloads)
.filter(download -> isCurrentScheduled(displayable, download))
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::changeLoaderStatus));
}
private boolean isCurrentScheduled(ScheduledDownloadDisplayable displayable, Download download) {
return TextUtils.equals(download.getMd5(), displayable.getPojo().getMd5());
}
private void changeLoaderStatus(Download download) {
if (download.getOverallDownloadStatus() == Download.PROGRESS
|| download.getOverallDownloadStatus() == Download.IN_QUEUE) {
if (progressBarIsInstalling.getVisibility() != View.VISIBLE) {
progressBarIsInstalling.setVisibility(View.VISIBLE);
}
} else {
if (progressBarIsInstalling.getVisibility() == View.VISIBLE
|| download.getOverallDownloadStatus() == Download.PAUSED) {
progressBarIsInstalling.setVisibility(View.GONE);
}
}
}
@Override public void onViewAttached() {
>>>>>>>
private boolean isCurrentScheduled(ScheduledDownloadDisplayable displayable, Download download) {
return TextUtils.equals(download.getMd5(), displayable.getPojo().getMd5());
} |
<<<<<<<
import cm.aptoide.pt.logger.Logger;
=======
import android.util.Pair;
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.pt.dataprovider.ws.v7.BaseRequestWithStore;
>>>>>>>
import android.util.Pair;
import cm.aptoide.pt.dataprovider.ws.v7.BaseRequestWithStore;
import cm.aptoide.pt.logger.Logger;
<<<<<<<
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.RecommendedStoreDisplayable;
=======
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.OfficialAppDisplayable;
>>>>>>>
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.OfficialAppDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.RecommendedStoreDisplayable; |
<<<<<<<
import cm.aptoide.pt.dataprovider.ws.Api;
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor;
=======
>>>>>>>
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor; |
<<<<<<<
void removePost(int postPosition);
=======
Observable<Post> getVisibleItems();
>>>>>>>
void removePost(int postPosition);
Observable<Post> getVisibleItems(); |
<<<<<<<
private static final String PACKAGE_NAME = "package_name";
=======
private static final String WHERE = "where";
>>>>>>>
private static final String WHERE = "where";
private static final String PACKAGE_NAME = "package_name"; |
<<<<<<<
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.View;
=======
>>>>>>>
import android.support.design.widget.Snackbar;
import android.view.View;
<<<<<<<
import cm.aptoide.pt.v8engine.view.store.StoreTabFragmentChooser;
import cm.aptoide.pt.v8engine.view.store.home.HomeFragment;
import cm.aptoide.pt.v8engine.view.wizard.WizardFragment;
import com.jakewharton.rxrelay.PublishRelay;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
=======
>>>>>>>
import com.jakewharton.rxrelay.PublishRelay;
<<<<<<<
public final static String FRAGMENT = "FRAGMENT";
private static final String TAG = MainActivity.class.getSimpleName();
private StoreUtilsProxy storeUtilsProxy;
private StoreRepository storeRepository;
private FragmentNavigator fragmentNavigator;
private InstallManager installManager;
private View snackBarLayout;
private PublishRelay<Void> installErrorsDismissEvent;
private Snackbar snackbar;
=======
private static final int LAYOUT = R.layout.frame_layout;
>>>>>>>
private static final int LAYOUT = R.layout.frame_layout;
private static final String TAG = MainActivity.class.getSimpleName();
private InstallManager installManager;
private View snackBarLayout;
private PublishRelay<Void> installErrorsDismissEvent;
private Snackbar snackbar;
<<<<<<<
setContentView(R.layout.frame_layout);
installManager =
((V8Engine) getApplicationContext()).getInstallManager(InstallerFactory.DEFAULT);
=======
setContentView(LAYOUT);
>>>>>>>
setContentView(LAYOUT);
installManager =
((V8Engine) getApplicationContext()).getInstallManager(InstallerFactory.DEFAULT);
<<<<<<<
=======
final InstallManager installManager =
((V8Engine) getApplicationContext()).getInstallManager(InstallerFactory.DEFAULT);
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.download.OemidProvider;
=======
import cm.aptoide.pt.download.FileDownloadManagerProvider;
import cm.aptoide.pt.download.Md5Comparator;
>>>>>>>
import cm.aptoide.pt.download.FileDownloadManagerProvider;
import cm.aptoide.pt.download.Md5Comparator;
import cm.aptoide.pt.download.OemidProvider;
<<<<<<<
@Named("marketName") String marketName, DownloadApkPathsProvider downloadApkPathsProvider) {
return new DownloadFactory(marketName, downloadApkPathsProvider);
=======
@Named("marketName") String marketName, @Named("cachePath") String cachePath) {
return new DownloadFactory(marketName, cachePath);
>>>>>>>
@Named("marketName") String marketName, DownloadApkPathsProvider downloadApkPathsProvider,
@Named("cachePath") String cachePath) {
return new DownloadFactory(marketName, downloadApkPathsProvider, cachePath);
<<<<<<<
@Singleton @Provides @Named("aptoide-theme") String providesAptoideTheme() {
return BuildConfig.APTOIDE_THEME;
}
@Singleton @Provides RootInstallationRetryHandler provideRootInstallationRetryHandler() {
=======
@Singleton @Provides RootInstallationRetryHandler provideRootInstallationRetryHandler(
InstallManager installManager) {
>>>>>>>
@Singleton @Provides @Named("aptoide-theme") String providesAptoideTheme() {
return BuildConfig.APTOIDE_THEME;
}
@Singleton @Provides RootInstallationRetryHandler provideRootInstallationRetryHandler(
InstallManager installManager) { |
<<<<<<<
InstallManager installManager, PreferencesManager preferencesManager,
DownloadFactory downloadFactory, DownloadStateParser downloadStateParser,
NotificationAnalytics notificationAnalytics, InstallAnalytics installAnalytics,
EditorialAnalytics editorialAnalytics, ReactionsManager reactionsManager) {
=======
InstallManager installManager, DownloadFactory downloadFactory,
DownloadStateParser downloadStateParser, NotificationAnalytics notificationAnalytics,
InstallAnalytics installAnalytics, EditorialAnalytics editorialAnalytics) {
>>>>>>>
InstallManager installManager, DownloadFactory downloadFactory,
DownloadStateParser downloadStateParser, NotificationAnalytics notificationAnalytics,
InstallAnalytics installAnalytics, EditorialAnalytics editorialAnalytics,
ReactionsManager reactionsManager) { |
<<<<<<<
import android.view.Window;
=======
>>>>>>>
import android.view.Window;
<<<<<<<
import cm.aptoide.pt.utils.AptoideUtils;
import cm.aptoide.pt.utils.GenericDialogs;
=======
import cm.aptoide.pt.store.StoreTheme;
>>>>>>>
import cm.aptoide.pt.utils.AptoideUtils;
import cm.aptoide.pt.utils.GenericDialogs;
import cm.aptoide.pt.store.StoreTheme;
<<<<<<<
private LinearLayout downloadInfoLayout;
private ProgressBar downloadProgressBar;
private TextView downloadProgressValue;
private ImageView cancelDownload;
private ImageView pauseDownload;
private ImageView resumeDownload;
private View downloadControlsLayout;
private RelativeLayout cardInfoLayout;
private DownloadModel.Action action;
private Subscription errorMessageSubscription;
private PublishSubject<Void> ready;
=======
private View editorialItemsCard;
private View actionItemCard;
>>>>>>>
private View editorialItemsCard;
private View actionItemCard;
private LinearLayout downloadInfoLayout;
private ProgressBar downloadProgressBar;
private TextView downloadProgressValue;
private ImageView cancelDownload;
private ImageView pauseDownload;
private ImageView resumeDownload;
private View downloadControlsLayout;
private RelativeLayout cardInfoLayout;
private DownloadModel.Action action;
private Subscription errorMessageSubscription;
private PublishSubject<Void> ready;
<<<<<<<
window = getActivity().getWindow();
ready = PublishSubject.create();
//window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
// WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
=======
>>>>>>>
ready = PublishSubject.create();
<<<<<<<
cardInfoLayout = (RelativeLayout) view.findViewById(R.id.card_info_install_layout);
downloadControlsLayout = view.findViewById(R.id.install_controls_layout);
downloadInfoLayout = ((LinearLayout) view.findViewById(R.id.appview_transfer_info));
downloadProgressBar = ((ProgressBar) view.findViewById(R.id.appview_download_progress_bar));
downloadProgressValue = (TextView) view.findViewById(R.id.appview_download_progress_number);
cancelDownload = ((ImageView) view.findViewById(R.id.appview_download_cancel_button));
resumeDownload = ((ImageView) view.findViewById(R.id.appview_download_resume_download));
pauseDownload = ((ImageView) view.findViewById(R.id.appview_download_pause_download));
=======
editorialItems.setNestedScrollingEnabled(false);
>>>>>>>
cardInfoLayout = (RelativeLayout) view.findViewById(R.id.card_info_install_layout);
downloadControlsLayout = view.findViewById(R.id.install_controls_layout);
downloadInfoLayout = ((LinearLayout) view.findViewById(R.id.appview_transfer_info));
downloadProgressBar = ((ProgressBar) view.findViewById(R.id.appview_download_progress_bar));
downloadProgressValue = (TextView) view.findViewById(R.id.appview_download_progress_number);
cancelDownload = ((ImageView) view.findViewById(R.id.appview_download_cancel_button));
resumeDownload = ((ImageView) view.findViewById(R.id.appview_download_resume_download));
pauseDownload = ((ImageView) view.findViewById(R.id.appview_download_pause_download));
editorialItems.setNestedScrollingEnabled(false);
<<<<<<<
//window.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
=======
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(getDefaultTheme()));
>>>>>>>
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(getDefaultTheme())); |
<<<<<<<
import cm.aptoide.pt.database.realm.Installed;
=======
import cm.aptoide.pt.database.realm.Notification;
>>>>>>>
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.database.realm.Notification; |
<<<<<<<
import cm.aptoide.pt.crashreports.CrashlyticsCrashLogger;
import cm.aptoide.pt.database.RealmStoreMigrator;
import cm.aptoide.pt.database.RoomInstalledPersistence;
import cm.aptoide.pt.database.RoomNotificationPersistence;
=======
import cm.aptoide.pt.database.AccessorFactory;
>>>>>>>
import cm.aptoide.pt.database.RealmStoreMigrator;
import cm.aptoide.pt.database.RoomInstalledPersistence;
import cm.aptoide.pt.database.RoomNotificationPersistence; |
<<<<<<<
private final InstalledRepository installedRepository;
=======
private final MoPubAdsManager moPubAdsManager;
>>>>>>>
private final InstalledRepository installedRepository;
private final MoPubAdsManager moPubAdsManager;
<<<<<<<
private MoPubInterstitialAdExperiment moPubInterstitialAdExperiment;
private MoPubBannerAdExperiment moPubBannerAdExperiment;
private MoPubNativeAdExperiment moPubNativeAdExperiment;
private String promotionId;
=======
>>>>>>>
private String promotionId;
<<<<<<<
PreferencesManager preferencesManager, DownloadStateParser downloadStateParser,
AppViewAnalytics appViewAnalytics, NotificationAnalytics notificationAnalytics,
InstallAnalytics installAnalytics, int limit, SocialRepository socialRepository,
String marketName, AppCoinsManager appCoinsManager,
MoPubInterstitialAdExperiment moPubInterstitialAdExperiment,
MoPubBannerAdExperiment moPubBannerAdExperiment,
MoPubNativeAdExperiment moPubNativeAdExperiment, PromotionsManager promotionsManager,
String promotionId, InstalledRepository installedRepository) {
=======
MoPubAdsManager moPubAdsManager, PreferencesManager preferencesManager,
DownloadStateParser downloadStateParser, AppViewAnalytics appViewAnalytics,
NotificationAnalytics notificationAnalytics, InstallAnalytics installAnalytics, int limit,
SocialRepository socialRepository, String marketName, AppCoinsManager appCoinsManager) {
>>>>>>>
MoPubAdsManager moPubAdsManager, PreferencesManager preferencesManager,
DownloadStateParser downloadStateParser, AppViewAnalytics appViewAnalytics,
NotificationAnalytics notificationAnalytics, InstallAnalytics installAnalytics, int limit,
SocialRepository socialRepository, String marketName, AppCoinsManager appCoinsManager,
PromotionsManager promotionsManager, String promotionId,
InstalledRepository installedRepository) {
<<<<<<<
this.moPubInterstitialAdExperiment = moPubInterstitialAdExperiment;
this.moPubBannerAdExperiment = moPubBannerAdExperiment;
this.moPubNativeAdExperiment = moPubNativeAdExperiment;
this.promotionsManager = promotionsManager;
this.promotionId = promotionId;
this.installedRepository = installedRepository;
=======
>>>>>>>
this.promotionsManager = promotionsManager;
this.promotionId = promotionId;
this.installedRepository = installedRepository;
<<<<<<<
public Completable downloadApp(WalletPromotionViewModel promotionViewApp) {
return Observable.just(downloadFactory.create(downloadStateParser.parseDownloadAction(
promotionViewApp.getDownloadModel()
.getAction()), promotionViewApp.getAppName(), promotionViewApp.getPackageName(),
promotionViewApp.getMd5sum(), promotionViewApp.getIcon(), promotionViewApp.getVersionName(),
promotionViewApp.getVersionCode(), promotionViewApp.getPath(),
promotionViewApp.getPathAlt(), promotionViewApp.getObb()))
.flatMapCompletable(download -> installManager.install(download)
.doOnSubscribe(__ -> setupDownloadEvents(download, promotionViewApp.getId())))
.toCompletable();
}
private void setupDownloadEvents(Download download, long appId) {
setupDownloadEvents(download, null, appId, null, null);
=======
private void setupDownloadEvents(Download download, long appId,
WalletAdsOfferManager.OfferResponseStatus offerResponseStatus) {
setupDownloadEvents(download, null, appId, null, null, offerResponseStatus);
>>>>>>>
public Completable downloadApp(WalletPromotionViewModel promotionViewApp) {
return Observable.just(downloadFactory.create(downloadStateParser.parseDownloadAction(
promotionViewApp.getDownloadModel()
.getAction()), promotionViewApp.getAppName(), promotionViewApp.getPackageName(),
promotionViewApp.getMd5sum(), promotionViewApp.getIcon(), promotionViewApp.getVersionName(),
promotionViewApp.getVersionCode(), promotionViewApp.getPath(),
promotionViewApp.getPathAlt(), promotionViewApp.getObb()))
.flatMapCompletable(download -> installManager.install(download)
.doOnSubscribe(__ -> setupDownloadEvents(download, promotionViewApp.getId(),
WalletAdsOfferManager.OfferResponseStatus.NO_ADS)))
.toCompletable();
}
private void setupDownloadEvents(Download download, long appId,
WalletAdsOfferManager.OfferResponseStatus offerResponseStatus) {
setupDownloadEvents(download, null, appId, null, null, offerResponseStatus); |
<<<<<<<
import java.util.HashMap;
=======
import java.util.HashMap;
import java.util.HashSet;
>>>>>>>
import java.util.HashMap;
import java.util.HashSet;
<<<<<<<
private AuthorizationService v3AuthorizationService;
private AuthorizationPersistence realmAuthorizationPersistence;
private TimelineRepositoryFactory timelineRepositoryFactory;
=======
private TransactionService transactionService;
private Payer payer;
private AuthorizationFactory authorizationFactory;
private AuthorizationService authorizationService;
private TransactionPersistence transactionPersistence;
private AuthorizationPersistence authorizationPersistence;
private BillingSyncManager billingSyncManager;
>>>>>>>
private TransactionService transactionService;
private Payer payer;
private AuthorizationFactory authorizationFactory;
private AuthorizationService authorizationService;
private TransactionPersistence transactionPersistence;
private AuthorizationPersistence authorizationPersistence;
private BillingSyncManager billingSyncManager;
private TimelineRepositoryFactory timelineRepositoryFactory;
<<<<<<<
public TimelinePostsRepository getTimelineRepository(String action) {
if (timelineRepositoryFactory == null) {
timelineRepositoryFactory =
new TimelineRepositoryFactory(new HashMap<>(), getBaseBodyInterceptorV7(),
getDefaultClient(), getDefaultSharedPreferences(), getTokenInvalidator(),
new LinksHandlerFactory(this), getPackageRepository(),
WebService.getDefaultConverter(), new TimelineResponseCardMapper());
}
return timelineRepositoryFactory.create(action);
}
}
=======
public SyncStorage getSyncStorage() {
if (syncStorage == null) {
syncStorage = new SyncStorage(new HashMap());
}
return syncStorage;
}
}
>>>>>>>
public SyncStorage getSyncStorage() {
if (syncStorage == null) {
syncStorage = new SyncStorage(new HashMap());
}
return syncStorage;
}
public TimelinePostsRepository getTimelineRepository(String action) {
if (timelineRepositoryFactory == null) {
timelineRepositoryFactory =
new TimelineRepositoryFactory(new HashMap<>(), getBaseBodyInterceptorV7(),
getDefaultClient(), getDefaultSharedPreferences(), getTokenInvalidator(),
new LinksHandlerFactory(this), getPackageRepository(),
WebService.getDefaultConverter(), new TimelineResponseCardMapper());
}
return timelineRepositoryFactory.create(action);
}
} |
<<<<<<<
import android.support.v7.graphics.Palette;
import cm.aptoide.pt.app.DownloadAppViewModel;
=======
>>>>>>>
import android.support.v7.graphics.Palette;
import cm.aptoide.pt.app.DownloadAppViewModel;
<<<<<<<
Observable<String> mediaContentClicked();
Observable<Palette.Swatch> paletteSwatchExtracted();
void applyPaletteSwatch(Palette.Swatch swatch);
=======
Observable<ScrollEvent> placeHolderVisibilityChange();
void removeBottomCardAnimation();
void addBottomCardAnimation();
Observable<EditorialEvent> mediaContentClicked();
void managePlaceHolderVisibity();
>>>>>>>
Observable<ScrollEvent> placeHolderVisibilityChange();
void removeBottomCardAnimation();
void addBottomCardAnimation();
Observable<EditorialEvent> mediaContentClicked();
void managePlaceHolderVisibity();
Observable<Palette.Swatch> paletteSwatchExtracted();
void applyPaletteSwatch(Palette.Swatch swatch); |
<<<<<<<
private StoreAnalytics storeAnalytics;
=======
private AppViewSimilarAppAnalytics appViewSimilarAppAnalytics;
>>>>>>>
private StoreAnalytics storeAnalytics;
private AppViewSimilarAppAnalytics appViewSimilarAppAnalytics;
<<<<<<<
=======
appViewSimilarAppAnalytics = new AppViewSimilarAppAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext()));
>>>>>>>
appViewSimilarAppAnalytics = new AppViewSimilarAppAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext())); |
<<<<<<<
=======
import cm.aptoide.pt.R;
import cm.aptoide.pt.abtesting.experiments.MoPubBannerAdExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubInterstitialAdExperiment;
import cm.aptoide.pt.abtesting.experiments.MoPubNativeAdExperiment;
>>>>>>>
import cm.aptoide.pt.R;
<<<<<<<
import cm.aptoide.pt.blacklist.BlacklistManager;
=======
import cm.aptoide.pt.bottomNavigation.BottomNavigationMapper;
>>>>>>>
import cm.aptoide.pt.blacklist.BlacklistManager;
import cm.aptoide.pt.bottomNavigation.BottomNavigationMapper;
<<<<<<<
@FragmentScope @Provides AppMapper providesAppMapper() {
return new AppMapper();
}
@FragmentScope @Provides AppsManager providesAppsManager(UpdatesManager updatesManager,
InstallManager installManager, AppMapper appMapper, DownloadAnalytics downloadAnalytics,
InstallAnalytics installAnalytics, UpdatesAnalytics updatesAnalytics,
DownloadFactory downloadFactory, MoPubAdsManager moPubAdsManager) {
return new AppsManager(updatesManager, installManager, appMapper, downloadAnalytics,
installAnalytics, updatesAnalytics, fragment.getContext()
.getPackageManager(), fragment.getContext(), downloadFactory, moPubAdsManager);
}
@FragmentScope @Provides AppsPresenter providesAppsPresenter(AppsManager appsManager,
AptoideAccountManager aptoideAccountManager, AppsNavigator appsNavigator) {
return new AppsPresenter(((AppsFragmentView) fragment), appsManager,
AndroidSchedulers.mainThread(), Schedulers.io(), CrashReport.getInstance(),
new PermissionManager(), ((PermissionService) fragment.getContext()), aptoideAccountManager,
appsNavigator);
}
=======
@FragmentScope @Provides EditorialListPresenter providesEditorialListPresenter(
EditorialListManager editorialListManager, AptoideAccountManager aptoideAccountManager,
EditorialListNavigator editorialListNavigator,
EditorialListAnalytics editorialListAnalytics) {
return new EditorialListPresenter((EditorialListView) fragment, editorialListManager,
aptoideAccountManager, editorialListNavigator, editorialListAnalytics,
CrashReport.getInstance(), AndroidSchedulers.mainThread());
}
@FragmentScope @Provides EditorialListManager providesEditorialListManager(
EditorialListRepository editorialListRepository) {
return new EditorialListManager(editorialListRepository);
}
@FragmentScope @Provides EditorialListRepository providesEditorialListRepository(
EditorialListService editorialListService) {
return new EditorialListRepository(editorialListService);
}
@FragmentScope @Provides EditorialListService providesEditorialService(
@Named("pool-v7") BodyInterceptor<BaseBody> bodyInterceptorPoolV7,
@Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
@Named("default") SharedPreferences sharedPreferences) {
return new EditorialListService(bodyInterceptorPoolV7, okHttpClient, tokenInvalidator,
WebService.getDefaultConverter(), sharedPreferences, 10);
}
@FragmentScope @Provides EditorialListNavigator providesEditorialListNavigator(
@Named("main-fragment-navigator") FragmentNavigator fragmentNavigator) {
return new EditorialListNavigator(fragmentNavigator);
}
@FragmentScope @Provides EditorialListAnalytics editorialListAnalytics(
NavigationTracker navigationTracker, AnalyticsManager analyticsManager) {
return new EditorialListAnalytics(navigationTracker, analyticsManager);
}
@FragmentScope @Provides EditorialAnalytics providesEditorialAnalytics(
DownloadAnalytics downloadAnalytics, AnalyticsManager analyticsManager,
NavigationTracker navigationTracker) {
return new EditorialAnalytics(downloadAnalytics, analyticsManager, navigationTracker,
arguments.getBoolean("fromHome"));
}
@FragmentScope @Provides HomeContainerPresenter providesHomeContainerPresenter(
CrashReport crashReport, AptoideAccountManager accountManager,
HomeContainerNavigator homeContainerNavigator, HomeNavigator homeNavigator,
HomeAnalytics homeAnalytics, Home home) {
return new HomeContainerPresenter((HomeContainerView) fragment, AndroidSchedulers.mainThread(),
crashReport, accountManager, homeContainerNavigator, homeNavigator, homeAnalytics, home);
}
>>>>>>>
@FragmentScope @Provides EditorialListPresenter providesEditorialListPresenter(
EditorialListManager editorialListManager, AptoideAccountManager aptoideAccountManager,
EditorialListNavigator editorialListNavigator,
EditorialListAnalytics editorialListAnalytics) {
return new EditorialListPresenter((EditorialListView) fragment, editorialListManager,
aptoideAccountManager, editorialListNavigator, editorialListAnalytics,
CrashReport.getInstance(), AndroidSchedulers.mainThread());
}
@FragmentScope @Provides EditorialListManager providesEditorialListManager(
EditorialListRepository editorialListRepository) {
return new EditorialListManager(editorialListRepository);
}
@FragmentScope @Provides EditorialListRepository providesEditorialListRepository(
EditorialListService editorialListService) {
return new EditorialListRepository(editorialListService);
}
@FragmentScope @Provides EditorialListService providesEditorialService(
@Named("pool-v7") BodyInterceptor<BaseBody> bodyInterceptorPoolV7,
@Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
@Named("default") SharedPreferences sharedPreferences) {
return new EditorialListService(bodyInterceptorPoolV7, okHttpClient, tokenInvalidator,
WebService.getDefaultConverter(), sharedPreferences, 10);
}
@FragmentScope @Provides EditorialListNavigator providesEditorialListNavigator(
@Named("main-fragment-navigator") FragmentNavigator fragmentNavigator) {
return new EditorialListNavigator(fragmentNavigator);
}
@FragmentScope @Provides EditorialListAnalytics editorialListAnalytics(
NavigationTracker navigationTracker, AnalyticsManager analyticsManager) {
return new EditorialListAnalytics(navigationTracker, analyticsManager);
}
@FragmentScope @Provides EditorialAnalytics providesEditorialAnalytics(
DownloadAnalytics downloadAnalytics, AnalyticsManager analyticsManager,
NavigationTracker navigationTracker) {
return new EditorialAnalytics(downloadAnalytics, analyticsManager, navigationTracker,
arguments.getBoolean("fromHome"));
}
@FragmentScope @Provides HomeContainerPresenter providesHomeContainerPresenter(
CrashReport crashReport, AptoideAccountManager accountManager,
HomeContainerNavigator homeContainerNavigator, HomeNavigator homeNavigator,
HomeAnalytics homeAnalytics, Home home) {
return new HomeContainerPresenter((HomeContainerView) fragment, AndroidSchedulers.mainThread(),
crashReport, accountManager, homeContainerNavigator, homeNavigator, homeAnalytics, home);
}
@FragmentScope @Provides AppMapper providesAppMapper() {
return new AppMapper();
}
@FragmentScope @Provides AppsManager providesAppsManager(UpdatesManager updatesManager,
InstallManager installManager, AppMapper appMapper, DownloadAnalytics downloadAnalytics,
InstallAnalytics installAnalytics, UpdatesAnalytics updatesAnalytics,
DownloadFactory downloadFactory, MoPubAdsManager moPubAdsManager) {
return new AppsManager(updatesManager, installManager, appMapper, downloadAnalytics,
installAnalytics, updatesAnalytics, fragment.getContext()
.getPackageManager(), fragment.getContext(), downloadFactory, moPubAdsManager);
}
@FragmentScope @Provides AppsPresenter providesAppsPresenter(AppsManager appsManager,
AptoideAccountManager aptoideAccountManager, AppsNavigator appsNavigator) {
return new AppsPresenter(((AppsFragmentView) fragment), appsManager,
AndroidSchedulers.mainThread(), Schedulers.io(), CrashReport.getInstance(),
new PermissionManager(), ((PermissionService) fragment.getContext()), aptoideAccountManager,
appsNavigator);
} |
<<<<<<<
public static StoreFragment newInstance(String storeName, String storeTheme) {
return newInstance(storeName, StoreContext.store, storeTheme);
}
public static StoreFragment newInstance(String storeName, StoreContext storeContext,
String storeTheme) {
=======
public StoreFragment() {
aptoideClientUUID = new IdsRepositoryImpl(SecurePreferencesImplementation.getInstance(),
DataProvider.getContext());
}
public static StoreFragment newInstance(long userId, String storeTheme, Event.Name defaultTab) {
>>>>>>>
public static StoreFragment newInstance(long userId, String storeTheme, Event.Name defaultTab) {
<<<<<<<
if (create || getStore == null) {
GetStoreRequest.of(StoreUtils.getStoreCredentials(storeName), storeContext,
accountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier())
=======
if (create || getHome == null) {
GetHomeRequest.of(StoreUtils.getStoreCredentials(storeName), userId, storeContext,
AptoideAccountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier())
>>>>>>>
if (create || getHome == null) {
GetHomeRequest.of(StoreUtils.getStoreCredentials(storeName), userId, storeContext,
accountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier()) |
<<<<<<<
.flatMap(updatesManager::filterAppcUpgrade)
.flatMapSingle(
=======
.flatMapSingle(updatesManager::filterAppcUpgrade)
.filter(upgrade -> upgrade != null)
.flatMap(
>>>>>>>
.flatMapSingle(updatesManager::filterAppcUpgrade)
.filter(upgrade -> upgrade != null)
.flatMapSingle( |
<<<<<<<
MORE, MORE_TOP, APP, AD, SOCIAL_CLICK, SCROLL_RIGHT, REWARD_APP, KNOW_MORE, DISMISS_BUNDLE, SOCIAL_INSTALL, EDITORIAL, INSTALL_WALLET, NO_OP, REACT_SINGLE_PRESS, REACT_LONG_PRESS, REACTION;
=======
MORE, MORE_TOP, APP, AD, SCROLL_RIGHT, REWARD_APP, KNOW_MORE, DISMISS_BUNDLE, EDITORIAL, INSTALL_WALLET, NO_OP
>>>>>>>
MORE, MORE_TOP, APP, AD, SCROLL_RIGHT, REWARD_APP, KNOW_MORE, DISMISS_BUNDLE, SOCIAL_INSTALL, EDITORIAL, INSTALL_WALLET, NO_OP, REACT_SINGLE_PRESS, REACT_LONG_PRESS, REACTION; |
<<<<<<<
.andThen(initializeSentry())
=======
.andThen(setUpAdsUserProperty())
>>>>>>>
.andThen(setUpAdsUserProperty())
.andThen(initializeSentry())
<<<<<<<
private Completable initializeSentry() {
return Completable.fromAction(
() -> Sentry.init("https://" + BuildConfig.SENTRY_API_KEY + "@sentry.aptoide.com/Vanilla",
new AndroidSentryClientFactory(this))
);
}
private void initializeRakam() {
=======
private void initializeRakam(String id) {
>>>>>>>
private Completable initializeSentry() {
return Completable.fromAction(
() -> Sentry.init("https://" + BuildConfig.SENTRY_API_KEY + "@sentry.aptoide.com/Vanilla",
new AndroidSentryClientFactory(this))
);
}
private void initializeRakam(String id) { |
<<<<<<<
handlePlaceHolderVisibility();
=======
handlePlaceHolderVisivibility();
handleMediaListDescriptionVisibility();
>>>>>>>
handlePlaceHolderVisibility();
handleMediaListDescriptionVisibility(); |
<<<<<<<
private AnalyticsManager analyticsManager;
private NavigationTracker navigationTracker;
=======
private ScreenOrientationManager orientationManager;
>>>>>>>
private AnalyticsManager analyticsManager;
private NavigationTracker navigationTracker;
private ScreenOrientationManager orientationManager; |
<<<<<<<
=======
import cm.aptoide.pt.database.accessors.RealmToRealmDatabaseMigration;
import cm.aptoide.pt.database.realm.Download;
>>>>>>>
<<<<<<<
=======
private SyncScheduler alarmSyncScheduler;
private NotificationAnalytics notificationAnalytics;
>>>>>>>
private NotificationAnalytics notificationAnalytics;
<<<<<<<
=======
>>>>>>>
<<<<<<<
public IdsRepository getIdsRepository() {
return idsRepository;
}
=======
public NotificationAnalytics getNotificationAnalytics() {
if (notificationAnalytics == null) {
notificationAnalytics =
new NotificationAnalytics(Analytics.getInstance(), AppEventsLogger.newLogger(this),
getBodyInterceptorPoolV7(), getDefaultClient(), WebService.getDefaultConverter(),
tokenInvalidator, cm.aptoide.pt.dataprovider.BuildConfig.APPLICATION_ID,
getDefaultSharedPreferences(), new AptoideInstallParser());
}
return notificationAnalytics;
}
>>>>>>>
public IdsRepository getIdsRepository() {
return idsRepository;
}
public NotificationAnalytics getNotificationAnalytics() {
if (notificationAnalytics == null) {
notificationAnalytics =
new NotificationAnalytics(Analytics.getInstance(), AppEventsLogger.newLogger(this),
getBodyInterceptorPoolV7(), getDefaultClient(), WebService.getDefaultConverter(),
tokenInvalidator, cm.aptoide.pt.dataprovider.BuildConfig.APPLICATION_ID,
getDefaultSharedPreferences(), new AptoideInstallParser());
}
return notificationAnalytics;
} |
<<<<<<<
import cm.aptoide.pt.v8engine.view.BackButton;
=======
import cm.aptoide.pt.v8engine.timeline.view.navigation.AppsTimelineTabNavigation;
>>>>>>>
import cm.aptoide.pt.v8engine.view.BackButton;
import cm.aptoide.pt.v8engine.timeline.view.navigation.AppsTimelineTabNavigation;
<<<<<<<
private PostAnalytics analytics;
=======
private final TabNavigator tabNavigator;
>>>>>>>
private final TabNavigator tabNavigator;
private PostAnalytics analytics;
<<<<<<<
AccountNavigator accountNavigator, PostFragment.PostUrlProvider postUrlProvider,
PostAnalytics analytics) {
=======
AccountNavigator accountNavigator, PostFragment.PostUrlProvider postUrlProvider,
TabNavigator tabNavigator) {
>>>>>>>
AccountNavigator accountNavigator, PostFragment.PostUrlProvider postUrlProvider,
PostAnalytics analytics) {
AccountNavigator accountNavigator, PostFragment.PostUrlProvider postUrlProvider,
TabNavigator tabNavigator) {
<<<<<<<
this.analytics = analytics;
=======
this.tabNavigator = tabNavigator;
>>>>>>>
this.tabNavigator = tabNavigator;
this.analytics = analytics;
<<<<<<<
.doOnCompleted(() -> {
view.showSuccessMessage();
analytics.sendPostCompleteEvent(postManager.remoteRelatedAppsAvailable(),
view.getCurrentSelected()
.getPackageName(), hasComment, hasUrl, url == null ? "" : url,
android.view.View.VISIBLE == view.getPreviewVisibility());
})
.doOnCompleted(() -> goBack());
=======
.doOnSuccess(postId -> view.showSuccessMessage())
.doOnSuccess(
postId -> tabNavigator.navigate(new AppsTimelineTabNavigation(postId)))
.doOnSuccess(postId -> goBack())
.toCompletable();
>>>>>>>
.doOnSuccess(postId -> {
view.showSuccessMessage();
analytics.sendPostCompleteEvent(postManager.remoteRelatedAppsAvailable(),
view.getCurrentSelected()
.getPackageName(), hasComment, hasUrl, url == null ? "" : url,
android.view.View.VISIBLE == view.getPreviewVisibility());
})
.doOnSuccess(
postId -> tabNavigator.navigate(new AppsTimelineTabNavigation(postId)))
.doOnSuccess(postId -> goBack())
.toCompletable(); |
<<<<<<<
String getCampaignUrl();
=======
void initInterstitialAd();
Observable<MoPubInterstitialAdClickType> InterstitialAdClicked();
Observable<MoPubInterstitialAdClickType> interstitialAdLoaded();
void showInterstitialAd();
void loadInterstitialAd();
void showBannerAd();
>>>>>>>
void initInterstitialAd();
Observable<MoPubInterstitialAdClickType> InterstitialAdClicked();
Observable<MoPubInterstitialAdClickType> interstitialAdLoaded();
void showInterstitialAd();
void loadInterstitialAd();
void showBannerAd();
String getCampaignUrl(); |
<<<<<<<
Fragment newAddressBookFragment();
Fragment newSyncSuccessFragment(List<Contact> contacts);
Fragment newPhoneInputFragment();
Fragment newInviteFriendsFragment(InviteFriendsFragment.InviteFriendsFragmentOpenMode openMode);
=======
Fragment newSpotShareFragment();
>>>>>>>
Fragment newAddressBookFragment();
Fragment newSyncSuccessFragment(List<Contact> contacts);
Fragment newPhoneInputFragment();
Fragment newInviteFriendsFragment(InviteFriendsFragment.InviteFriendsFragmentOpenMode openMode);
Fragment newSpotShareFragment(); |
<<<<<<<
import cm.aptoide.pt.app.DownloadStateParser;
=======
import cm.aptoide.pt.app.FlagManager;
import cm.aptoide.pt.app.FlagService;
>>>>>>>
import cm.aptoide.pt.app.DownloadStateParser;
import cm.aptoide.pt.app.FlagManager;
import cm.aptoide.pt.app.FlagService;
<<<<<<<
import cm.aptoide.pt.appview.PreferencesManager;
import cm.aptoide.pt.appview.UserPreferencesPersister;
=======
import cm.aptoide.pt.app.view.AppViewNavigator;
import cm.aptoide.pt.app.view.AppViewPresenter;
import cm.aptoide.pt.app.view.AppViewView;
import cm.aptoide.pt.app.view.NewAppViewFragment;
>>>>>>>
import cm.aptoide.pt.appview.PreferencesManager;
import cm.aptoide.pt.appview.UserPreferencesPersister;
import cm.aptoide.pt.app.view.AppViewNavigator;
import cm.aptoide.pt.app.view.AppViewPresenter;
import cm.aptoide.pt.app.view.AppViewView;
import cm.aptoide.pt.app.view.NewAppViewFragment;
<<<<<<<
@FragmentScope @Provides UserPreferencesPersister providesUserPreferencesPersister(
@Named("default") SharedPreferences sharedPreferences) {
return new UserPreferencesPersister(sharedPreferences);
}
@FragmentScope @Provides PreferencesManager providesPreferencesManager(
UserPreferencesPersister userPreferencesPersister) {
return new PreferencesManager(userPreferencesPersister);
}
@FragmentScope @Provides DownloadStateParser providesDownloadStateParser() {
return new DownloadStateParser();
}
@FragmentScope @Provides AppViewAnalytics providesAppViewAnalytics(
DownloadAnalytics downloadAnalytics, AnalyticsManager analyticsManager,
NavigationTracker navigationTracker) {
return new AppViewAnalytics(downloadAnalytics, analyticsManager, navigationTracker);
}
=======
@FragmentScope @Provides FlagManager providesFlagManager(FlagService flagService) {
return new FlagManager(flagService);
}
@FragmentScope @Provides FlagService providesFlagService(@Named("defaultInterceptorV3")
BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v3.BaseBody> bodyInterceptorV3,
@Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
@Named("default") SharedPreferences sharedPreferences) {
return new FlagService(bodyInterceptorV3, okHttpClient, tokenInvalidator, sharedPreferences);
}
>>>>>>>
@FragmentScope @Provides FlagManager providesFlagManager(FlagService flagService) {
return new FlagManager(flagService);
}
@FragmentScope @Provides FlagService providesFlagService(@Named("defaultInterceptorV3")
BodyInterceptor<cm.aptoide.pt.dataprovider.ws.v3.BaseBody> bodyInterceptorV3,
@Named("default") OkHttpClient okHttpClient, TokenInvalidator tokenInvalidator,
@Named("default") SharedPreferences sharedPreferences) {
return new FlagService(bodyInterceptorV3, okHttpClient, tokenInvalidator, sharedPreferences);
}
@FragmentScope @Provides UserPreferencesPersister providesUserPreferencesPersister(
@Named("default") SharedPreferences sharedPreferences) {
return new UserPreferencesPersister(sharedPreferences);
}
@FragmentScope @Provides PreferencesManager providesPreferencesManager(
UserPreferencesPersister userPreferencesPersister) {
return new PreferencesManager(userPreferencesPersister);
}
@FragmentScope @Provides DownloadStateParser providesDownloadStateParser() {
return new DownloadStateParser();
}
@FragmentScope @Provides AppViewAnalytics providesAppViewAnalytics(
DownloadAnalytics downloadAnalytics, AnalyticsManager analyticsManager,
NavigationTracker navigationTracker) {
return new AppViewAnalytics(downloadAnalytics, analyticsManager, navigationTracker);
}
<<<<<<<
ReviewsManager reviewsManager, AdsManager adsManager, PreferencesManager preferencesManager,
DownloadStateParser downloadStateParser, AppViewAnalytics appViewAnalytics,
NotificationAnalytics notificationAnalytics) {
=======
ReviewsManager reviewsManager, AdsManager adsManager, StoreManager storeManager,
FlagManager flagManager, StoreUtilsProxy storeUtilsProxy,
AptoideAccountManager aptoideAccountManager) {
>>>>>>>
ReviewsManager reviewsManager, AdsManager adsManager, StoreManager storeManager,
FlagManager flagManager, StoreUtilsProxy storeUtilsProxy,
AptoideAccountManager aptoideAccountManager, PreferencesManager preferencesManager,
DownloadStateParser downloadStateParser, AppViewAnalytics appViewAnalytics,
NotificationAnalytics notificationAnalytics) {
<<<<<<<
reviewsManager, adsManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics);
=======
reviewsManager, adsManager, storeManager, flagManager, storeUtilsProxy,
aptoideAccountManager);
}
@FragmentScope @Provides AppViewPresenter providesAppViewPresenter(
AccountNavigator accountNavigator, AppViewAnalytics analytics,
AppViewNavigator appViewNavigator, AppViewManager appViewManager,
AptoideAccountManager accountManager, CrashReport crashReport) {
return new AppViewPresenter((AppViewView) fragment, accountNavigator, analytics,
appViewNavigator, appViewManager, accountManager, AndroidSchedulers.mainThread(),
crashReport, arguments.getLong(NewAppViewFragment.BundleKeys.APP_ID.name()),
arguments.getString(NewAppViewFragment.BundleKeys.PACKAGE_NAME.name()));
>>>>>>>
reviewsManager, adsManager, storeManager, flagManager, storeUtilsProxy,
aptoideAccountManager, preferencesManager, downloadStateParser, appViewAnalytics,
notificationAnalytics);
}
@FragmentScope @Provides AppViewPresenter providesAppViewPresenter(
AccountNavigator accountNavigator, AppViewAnalytics analytics,
AppViewNavigator appViewNavigator, AppViewManager appViewManager,
AptoideAccountManager accountManager, CrashReport crashReport) {
return new AppViewPresenter((AppViewView) fragment, accountNavigator, analytics,
appViewNavigator, appViewManager, accountManager, AndroidSchedulers.mainThread(),
crashReport, arguments.getLong(NewAppViewFragment.BundleKeys.APP_ID.name()),
arguments.getString(NewAppViewFragment.BundleKeys.PACKAGE_NAME.name())); |
<<<<<<<
import android.support.v4.util.LongSparseArray;
=======
import android.text.TextUtils;
>>>>>>>
<<<<<<<
import cm.aptoide.pt.v8engine.repository.StoreRepository;
=======
import cm.aptoide.pt.v8engine.util.CommentOperations;
>>>>>>>
import cm.aptoide.pt.v8engine.repository.StoreRepository;
import cm.aptoide.pt.v8engine.util.CommentOperations; |
<<<<<<<
AppViewConfiguration appViewConfiguration, DownloadStateParser downloadStateParser,
AppViewAnalytics appViewAnalytics, NotificationAnalytics notificationAnalytics,
InstallAnalytics installAnalytics, Resources resources, WindowManager windowManager,
SocialRepository socialRepository, @Named("marketName") String marketName,
AppCoinsManager appCoinsManager, MoPubAdsManager moPubAdsManager,
PromotionsManager promotionsManager, @Named("wallet-offer-promotion-id") String promotionId,
=======
AppViewConfiguration appViewConfiguration, PreferencesManager preferencesManager,
DownloadStateParser downloadStateParser, AppViewAnalytics appViewAnalytics,
NotificationAnalytics notificationAnalytics, InstallAnalytics installAnalytics,
Resources resources, WindowManager windowManager, @Named("marketName") String marketName,
AppCoinsManager appCoinsManager, MoPubAdsManager moPubAdsManager,
PromotionsManager promotionsManager, @Named("wallet-offer-promotion-id") String promotionId,
>>>>>>>
AppViewConfiguration appViewConfiguration, DownloadStateParser downloadStateParser,
AppViewAnalytics appViewAnalytics, NotificationAnalytics notificationAnalytics,
InstallAnalytics installAnalytics, Resources resources, WindowManager windowManager,
@Named("marketName") String marketName, AppCoinsManager appCoinsManager,
MoPubAdsManager moPubAdsManager, PromotionsManager promotionsManager,
@Named("wallet-offer-promotion-id") String promotionId, |
<<<<<<<
import cm.aptoide.pt.downloadmanager.DownloadServiceHelper;
=======
import cm.aptoide.pt.model.v7.Type;
import cm.aptoide.pt.v8engine.InstallManager;
import cm.aptoide.pt.v8engine.Progress;
>>>>>>>
import cm.aptoide.pt.v8engine.InstallManager;
import cm.aptoide.pt.v8engine.Progress;
<<<<<<<
@Override public void onResume() {
super.onResume();
if (onResumeAction != null) {
onResumeAction.call();
}
}
@Override public void onPause() {
if (onPauseAction != null) {
onPauseAction.call();
}
super.onPause();
}
@Override protected Configs getConfig() {
return new Configs(1, false);
}
=======
public ActiveDownloadDisplayable(Progress<Download> pojo, boolean fixedPerLineCount) {
super(pojo, fixedPerLineCount);
}
@Override public Type getType() {
return Type.ACTIVE_DOWNLOAD;
}
>>>>>>>
@Override public void onResume() {
super.onResume();
if (onResumeAction != null) {
onResumeAction.call();
}
}
@Override public void onPause() {
if (onPauseAction != null) {
onPauseAction.call();
}
super.onPause();
}
@Override protected Configs getConfig() {
return new Configs(1, false);
} |
<<<<<<<
private final String defaultTheme;
=======
private final String defaultStoreName;
>>>>>>>
<<<<<<<
NotificationSyncScheduler notificationSyncScheduler, String marketName, String autoUpdateUrl,
View view, String defaultTheme, boolean firstCreated, String fileProviderAuthority) {
=======
NotificationSyncScheduler notificationSyncScheduler, String marketName, View view,
String defaultStoreName, boolean firstCreated, String fileProviderAuthority) {
>>>>>>>
NotificationSyncScheduler notificationSyncScheduler, String marketName, String autoUpdateUrl,
View view, boolean firstCreated, String fileProviderAuthority) {
<<<<<<<
this.defaultTheme = defaultTheme;
=======
this.defaultStoreName = defaultStoreName;
>>>>>>>
<<<<<<<
FragmentNavigator fragmentNavigator, BottomNavigationAnalytics bottomNavigationAnalytics,
SearchAnalytics searchAnalytics) {
return new BottomNavigationNavigator(fragmentNavigator, bottomNavigationAnalytics,
searchAnalytics);
=======
FragmentNavigator fragmentNavigator, @Named("defaultStoreName") String defaultStoreName,
BottomNavigationAnalytics bottomNavigationAnalytics, SearchAnalytics searchAnalytics,
@Named("aptoide-theme") String theme) {
return new BottomNavigationNavigator(fragmentNavigator, defaultStoreName,
bottomNavigationAnalytics, searchAnalytics, theme);
>>>>>>>
FragmentNavigator fragmentNavigator, BottomNavigationAnalytics bottomNavigationAnalytics,
SearchAnalytics searchAnalytics, @Named("aptoide-theme") String theme) {
return new BottomNavigationNavigator(fragmentNavigator, bottomNavigationAnalytics,
searchAnalytics, theme); |
<<<<<<<
import com.jakewharton.rxrelay.PublishRelay;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import lombok.AccessLevel;
=======
>>>>>>>
import com.jakewharton.rxrelay.PublishRelay;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import lombok.AccessLevel;
<<<<<<<
TimelineAnalytics timelineAnalytics, AppViewAnalytics appViewAnalytics,
PublishRelay installAppRelay) {
=======
DownloadFactory downloadFactory, TimelineAnalytics timelineAnalytics,
AppViewAnalytics appViewAnalytics) {
>>>>>>>
TimelineAnalytics timelineAnalytics, AppViewAnalytics appViewAnalytics,
PublishRelay installAppRelay, DownloadFactory downloadFactory) {
<<<<<<<
this.installAppRelay = installAppRelay;
this.rollbackRepository = RepositoryFactory.getRollbackRepository();
this.installedRepository = installedRepository;
=======
this.downloadFactory = downloadFactory;
>>>>>>>
this.downloadFactory = downloadFactory;
this.installAppRelay = installAppRelay;
this.installedRepository = installedRepository;
<<<<<<<
TimelineAnalytics timelineAnalytics, AppViewAnalytics appViewAnalytics,
PublishRelay installAppRelay) {
=======
DownloadFactory downloadFactory, TimelineAnalytics timelineAnalytics,
AppViewAnalytics appViewAnalytics) {
>>>>>>>
DownloadFactory downloadFactory, TimelineAnalytics timelineAnalytics, AppViewAnalytics appViewAnalytics,
PublishRelay installAppRelay) {
<<<<<<<
installedRepository, timelineAnalytics, appViewAnalytics, installAppRelay);
=======
installedRepository, downloadFactory, timelineAnalytics, appViewAnalytics);
>>>>>>>
installedRepository,downloadFactory, timelineAnalytics, appViewAnalytics, installAppRelay);
<<<<<<<
public Observable<Void> getInstallAppRelay() {
return installAppRelay;
}
@IntDef({
ACTION_INSTALL, ACTION_UPDATE, ACTION_DOWNGRADE, ACTION_OPEN, ACTION_INSTALLING,
ACTION_NO_STATE
})
@Retention(RetentionPolicy.SOURCE)
public @interface ButtonState {
}
public class WidgetState {
private @Setter(AccessLevel.PRIVATE) @ButtonState int buttonState;
private @Setter(AccessLevel.PRIVATE) @Getter @Nullable Progress<Download> progress;
public WidgetState(int buttonState) {
this.buttonState = buttonState;
}
public @ButtonState int getButtonState() {
return buttonState;
}
}
=======
>>>>>>>
public Observable<Void> getInstallAppRelay() {
return installAppRelay;
} |
<<<<<<<
import cm.aptoide.pt.dataprovider.ws.v7.store.RequestBodyFactory;
import cm.aptoide.pt.v8engine.BaseBodyInterceptor;
=======
import cm.aptoide.pt.dataprovider.ws.v3.CheckUserCredentialsRequest;
>>>>>>>
import cm.aptoide.pt.dataprovider.ws.v3.CheckUserCredentialsRequest;
<<<<<<<
bodyInterceptor =
new BaseBodyInterceptor(aptoideClientUUID.getUniqueIdentifier(), accountManager);
requestBodyFactory = new RequestBodyFactory();
serializer = new ObjectMapper();
serializer.setSerializationInclusion(JsonInclude.Include.NON_NULL);
=======
bodyDecorator = new BaseBodyInterceptor(aptoideClientUUID, accountManager);
>>>>>>>
bodyInterceptor =
new BaseBodyInterceptor(aptoideClientUUID, accountManager);
requestBodyFactory = new RequestBodyFactory();
serializer = new ObjectMapper();
serializer.setSerializationInclusion(JsonInclude.Include.NON_NULL); |
<<<<<<<
import org.json.JSONException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.util.concurrent.Callable;
=======
>>>>>>>
import org.json.JSONException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.util.concurrent.Callable; |
<<<<<<<
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.StoreLatestCommentsDisplayable;
=======
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.LatestStoreCommentsDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.MyStoreDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.MyStoreWidget;
>>>>>>>
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.MyStoreDisplayable;
import cm.aptoide.pt.v8engine.view.recycler.displayable.implementations.grid.MyStoreWidget; |
<<<<<<<
private void setupStoreInfo(GetApp getApp) {
GetAppMeta.App app = getApp.getNodes().getMeta().getData();
Store store = app.getStore();
if (TextUtils.isEmpty(store.getAvatar())) {
ImageLoader.loadWithCircleTransform(R.drawable.ic_avatar_apps, storeAvatarView);
} else {
ImageLoader.loadWithCircleTransform(store.getAvatar(), storeAvatarView);
}
StoreThemeEnum storeThemeEnum = StoreThemeEnum.get(store);
storeNameView.setText(store.getName());
storeNameView.setTextColor(storeThemeEnum.getStoreHeaderInt());
storeNumberUsersView.setText(String.valueOf(store.getStats().getSubscribers()));
subscribeButton.setBackgroundDrawable(storeThemeEnum.getButtonLayoutDrawable());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
subscribeButton.setElevation(0);
}
subscribeButton.setTextColor(storeThemeEnum.getStoreHeaderInt());
storeLayout.setOnClickListener(new Listeners().newOpenStoreListener(itemView, store.getName(), store
.getAppearance().getTheme()));
@Cleanup Realm realm = Database.get();
boolean subscribed = Database.StoreQ.get(store.getId(), realm) != null;
if (subscribed) {
int checkmarkDrawable = storeThemeEnum.getCheckmarkDrawable();
subscribeButton.setCompoundDrawablesWithIntrinsicBounds(checkmarkDrawable, 0, 0, 0);
subscribeButton.setText(R.string.appview_subscribed_store_button_text);
subscribeButton.setOnClickListener(new Listeners().newOpenStoreListener(itemView, store.getName(), store
.getAppearance().getTheme()));
} else {
int plusMarkDrawable = storeThemeEnum.getPlusmarkDrawable();
subscribeButton.setCompoundDrawablesWithIntrinsicBounds(plusMarkDrawable, 0, 0, 0);
subscribeButton.setText(R.string.appview_subscribe_store_button_text);
subscribeButton.setOnClickListener(new Listeners().newSubscribeStoreListener(itemView, store.getName()));
}
}
=======
>>>>>>>
private void setupStoreInfo(GetApp getApp) {
GetAppMeta.App app = getApp.getNodes().getMeta().getData();
Store store = app.getStore();
if (TextUtils.isEmpty(store.getAvatar())) {
ImageLoader.loadWithCircleTransform(R.drawable.ic_avatar_apps, storeAvatarView);
} else {
ImageLoader.loadWithCircleTransform(store.getAvatar(), storeAvatarView);
}
StoreThemeEnum storeThemeEnum = StoreThemeEnum.get(store);
storeNameView.setText(store.getName());
storeNameView.setTextColor(storeThemeEnum.getStoreHeaderInt());
storeNumberUsersView.setText(String.valueOf(store.getStats().getSubscribers()));
subscribeButton.setBackgroundDrawable(storeThemeEnum.getButtonLayoutDrawable());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
subscribeButton.setElevation(0);
}
subscribeButton.setTextColor(storeThemeEnum.getStoreHeaderInt());
storeLayout.setOnClickListener(new Listeners().newOpenStoreListener(itemView, store.getName(), store
.getAppearance().getTheme()));
@Cleanup Realm realm = Database.get();
boolean subscribed = Database.StoreQ.get(store.getId(), realm) != null;
if (subscribed) {
int checkmarkDrawable = storeThemeEnum.getCheckmarkDrawable();
subscribeButton.setCompoundDrawablesWithIntrinsicBounds(checkmarkDrawable, 0, 0, 0);
subscribeButton.setText(R.string.appview_subscribed_store_button_text);
subscribeButton.setOnClickListener(new Listeners().newOpenStoreListener(itemView, store.getName(), store
.getAppearance().getTheme()));
} else {
int plusMarkDrawable = storeThemeEnum.getPlusmarkDrawable();
subscribeButton.setCompoundDrawablesWithIntrinsicBounds(plusMarkDrawable, 0, 0, 0);
subscribeButton.setText(R.string.appview_subscribe_store_button_text);
subscribeButton.setOnClickListener(new Listeners().newSubscribeStoreListener(itemView, store.getName()));
}
} |
<<<<<<<
//try {
// new Updates().migrate(db, realm);
// // despite the migration, this data should be recreated upon app startup
//} catch (Exception ex) {
// logException(ex);
//}
=======
try {
new Updates().migrate(db, realm);
// despite the migration, this data should be recreated upon app startup
} catch (Exception ex) {
logException(ex);
}
try{
new Downloads().migrate(realm);
} catch (Exception ex) {
logException(ex);
}
>>>>>>>
//try {
// new Updates().migrate(db, realm);
// // despite the migration, this data should be recreated upon app startup
//} catch (Exception ex) {
// logException(ex);
//}
try{
new Downloads().migrate(realm);
} catch (Exception ex) {
logException(ex);
} |
<<<<<<<
private TimelineAnalytics timelineAnalytics;
private AppViewAnalytics appViewAnalytics;
=======
private ShareAppHelper shareAppHelper;
>>>>>>>
private ShareAppHelper shareAppHelper;
private TimelineAnalytics timelineAnalytics;
private AppViewAnalytics appViewAnalytics;
<<<<<<<
appViewAnalytics = new AppViewAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext()));
=======
paymentAnalytics = ((V8Engine) getContext().getApplicationContext()).getPaymentAnalytics();
shareAppHelper =
new ShareAppHelper(installedRepository, accountManager, accountNavigator, getActivity(),
spotAndShareAnalytics);
>>>>>>>
paymentAnalytics = ((V8Engine) getContext().getApplicationContext()).getPaymentAnalytics();
shareAppHelper =
new ShareAppHelper(installedRepository, accountManager, accountNavigator, getActivity(),
spotAndShareAnalytics);
appViewAnalytics = new AppViewAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext()));
<<<<<<<
if (getApp != null) {
appViewAnalytics.sendAppShareEvent();
shareApp(appName, packageName, getApp.getNodes()
.getMeta()
.getData()
.getFile()
.getVercode(), wUrl);
}
=======
shareAppHelper.shareApp(appName, packageName, wUrl, (app == null ? null : app.getIcon()),
SpotAndShareAnalytics.SPOT_AND_SHARE_START_CLICK_ORIGIN_APPVIEW);
>>>>>>>
shareAppHelper.shareApp(appName, packageName, wUrl, (app == null ? null : app.getIcon()),
SpotAndShareAnalytics.SPOT_AND_SHARE_START_CLICK_ORIGIN_APPVIEW);
appViewAnalytics.sendAppShareEvent();
<<<<<<<
//
// Scrollable interface
//
private void shareApp(String appName, String packageName, int vercode, String wUrl) {
GenericDialogs.createGenericShareDialog(getContext(), getString(R.string.share),
installedRepository.contains(packageName, vercode))
.subscribe(eResponse -> {
if (GenericDialogs.EResponse.SHARE_EXTERNAL == eResponse) {
shareDefault(appName, packageName, wUrl);
} else if (GenericDialogs.EResponse.SHARE_TIMELINE == eResponse) {
if (!accountManager.isLoggedIn()) {
ShowMessage.asSnack(getActivity(), R.string.you_need_to_be_logged_in, R.string.login,
snackView -> accountNavigator.navigateToAccountView(
Analytics.Account.AccountOrigins.APP_VIEW_SHARE));
return;
}
if (Application.getConfiguration()
.isCreateStoreAndSetUserPrivacyAvailable()) {
SharePreviewDialog sharePreviewDialog = new SharePreviewDialog(accountManager, false,
SharePreviewDialog.SharePreviewOpenMode.SHARE);
AlertDialog.Builder alertDialog =
sharePreviewDialog.getCustomRecommendationPreviewDialogBuilder(getContext(),
appName, app.getIcon());
SocialRepository socialRepository =
new SocialRepository(accountManager, bodyInterceptor, converterFactory,
httpClient, timelineAnalytics);
sharePreviewDialog.showShareCardPreviewDialog(packageName, "app", getContext(),
sharePreviewDialog, alertDialog, socialRepository);
}
} else if (GenericDialogs.EResponse.SHARE_SPOT_AND_SHARE == eResponse) {
spotAndShareAnalytics.clickShareApps(
SpotAndShareAnalytics.SPOT_AND_SHARE_START_CLICK_ORIGIN_APPVIEW);
String filepath = getFilepath(packageName);
String appNameToShare = filterAppName(appName);
Intent intent = new Intent(this.getActivity(), HighwayActivity.class);
intent.setAction("APPVIEW_SHARE");
intent.putExtra("APPVIEW_SHARE_FILEPATH", filepath);
intent.putExtra("APPVIEW_SHARE_APPNAME", appNameToShare);
startActivity(intent);
}
}, err -> err.printStackTrace());
}
@Partners protected void shareDefault(String appName, String packageName, String wUrl) {
if (wUrl != null) {
Intent sharingIntent = new Intent(Intent.ACTION_SEND);
sharingIntent.setType("text/plain");
sharingIntent.putExtra(Intent.EXTRA_SUBJECT,
getString(R.string.install) + " \"" + appName + "\"");
sharingIntent.putExtra(Intent.EXTRA_TEXT, wUrl);
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share)));
}
}
private String getFilepath(String packageName) {
PackageManager packageManager = getContext().getPackageManager();
PackageInfo packageInfo = null;
try {
packageInfo = packageManager.getPackageInfo(packageName, 0);
return packageInfo.applicationInfo.sourceDir;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
throw new IllegalArgumentException("Required packageName not installed! " + packageName);
}
}
private String filterAppName(String appName) {
if (!TextUtils.isEmpty(appName) && appName.length() > 17) {
appName = appName.substring(0, 17);
}
if (!TextUtils.isEmpty(appName) && appName.contains("_")) {
appName = appName.replace("_", " ");
}
return appName;
}
=======
>>>>>>> |
<<<<<<<
@Inject NotificationAnalytics notificationAnalytics;
=======
private TimelineAnalytics timelineAnalytics;
private NotificationAnalytics notificationAnalytics;
>>>>>>>
private TimelineAnalytics timelineAnalytics;
@Inject NotificationAnalytics notificationAnalytics;
<<<<<<<
public NotificationAnalytics getNotificationAnalytics() {
return notificationAnalytics;
}
=======
public TimelineAnalytics getTimelineAnalytics() {
if (timelineAnalytics == null) {
timelineAnalytics =
new TimelineAnalytics(Analytics.getInstance(), AppEventsLogger.newLogger(this),
getBodyInterceptorPoolV7(), getDefaultClient(), WebService.getDefaultConverter(),
getTokenInvalidator(), BuildConfig.APPLICATION_ID, getDefaultSharedPreferences(),
getNotificationAnalytics(), getNavigationTracker(), getReadPostsPersistence());
}
return timelineAnalytics;
}
>>>>>>>
public NotificationAnalytics getNotificationAnalytics() {
return notificationAnalytics;
}
public TimelineAnalytics getTimelineAnalytics() {
if (timelineAnalytics == null) {
timelineAnalytics =
new TimelineAnalytics(Analytics.getInstance(), AppEventsLogger.newLogger(this),
getBodyInterceptorPoolV7(), getDefaultClient(), WebService.getDefaultConverter(),
getTokenInvalidator(), BuildConfig.APPLICATION_ID, getDefaultSharedPreferences(),
getNotificationAnalytics(), getNavigationTracker(), getReadPostsPersistence());
}
return timelineAnalytics;
} |
<<<<<<<
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.dataprovider.ws.v7.analyticsbody.DownloadInstallAnalyticsBaseBody;
=======
import cm.aptoide.pt.dataprovider.ws.v7.analyticsbody.Result;
>>>>>>>
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.dataprovider.ws.v7.analyticsbody.Result;
<<<<<<<
private FileUtils fileUtils;
private Analytics analytics;
private RootAvailabilityManager rootAvailabilityManager;
private InstalledRepository installedRepository;
=======
private final FileUtils fileUtils;
private final Analytics analytics;
private final SharedPreferences sharedPreferences;
>>>>>>>
private final SharedPreferences sharedPreferences;
private FileUtils fileUtils;
private Analytics analytics;
private RootAvailabilityManager rootAvailabilityManager;
private InstalledRepository installedRepository;
<<<<<<<
FileUtils fileUtils, Analytics analytics, boolean debug,
InstalledRepository installedRepository, int rootTimeout,
RootAvailabilityManager rootAvailabilityManager) {
=======
FileUtils fileUtils, Analytics analytics, SharedPreferences sharedPreferences) {
>>>>>>>
FileUtils fileUtils, Analytics analytics, boolean debug,
InstalledRepository installedRepository, int rootTimeout,
RootAvailabilityManager rootAvailabilityManager, SharedPreferences sharedPreferences) {
<<<<<<<
this.installedRepository = installedRepository;
RootShell.debugMode = debug;
RootShell.defaultCommandTimeout = rootTimeout;
this.rootAvailabilityManager = rootAvailabilityManager;
=======
this.sharedPreferences = sharedPreferences;
>>>>>>>
this.installedRepository = installedRepository;
RootShell.debugMode = debug;
RootShell.defaultCommandTimeout = rootTimeout;
this.rootAvailabilityManager = rootAvailabilityManager;
this.sharedPreferences = sharedPreferences;
<<<<<<<
@Override public Completable install(Context context, String md5, boolean forceDefaultInstall) {
return rootAvailabilityManager.isRootAvailable()
.doOnSuccess(isRoot -> Analytics.RootInstall.installationType(
ManagerPreferences.allowRootInstallation(), isRoot))
.flatMapObservable(isRoot -> installationProvider.getInstallation(md5)
.first())
=======
@Override public Observable<Void> install(Context context, String md5) {
Analytics.RootInstall.installationType(
ManagerPreferences.allowRootInstallation(sharedPreferences), RootShell.isRootAvailable());
return installationProvider.getInstallation(md5)
>>>>>>>
@Override public Completable install(Context context, String md5, boolean forceDefaultInstall) {
return rootAvailabilityManager.isRootAvailable()
.doOnSuccess(isRoot -> Analytics.RootInstall.installationType(
ManagerPreferences.allowRootInstallation(sharedPreferences), isRoot))
.flatMapObservable(isRoot -> installationProvider.getInstallation(md5)
.first()) |
<<<<<<<
displayableWidgetMappings.add(new DisplayableWidgetMapping((RecommendedStoreWidget.class),
RecommendedStoreDisplayable.class));
=======
displayableWidgetMappings.add(
new DisplayableWidgetMapping((OfficialAppWidget.class), OfficialAppDisplayable.class));
>>>>>>>
displayableWidgetMappings.add(new DisplayableWidgetMapping((RecommendedStoreWidget.class),
RecommendedStoreDisplayable.class));
displayableWidgetMappings.add(
new DisplayableWidgetMapping((OfficialAppWidget.class), OfficialAppDisplayable.class)); |
<<<<<<<
void inject(MyAccountFragment myAccountFragment);
=======
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);
void inject(ProfileStepOneFragment profileStepOneFragment);
void inject(ProfileStepTwoFragment profileStepTwoFragment);
void inject(DownloadsFragment downloadsFragment);
void inject(UpdatesFragment updatesFragment);
void inject(ScheduledDownloadsFragment scheduledDownloadsFragment);
>>>>>>>
void inject(MyAccountFragment myAccountFragment);
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);
void inject(ProfileStepOneFragment profileStepOneFragment);
void inject(ProfileStepTwoFragment profileStepTwoFragment);
void inject(DownloadsFragment downloadsFragment);
void inject(UpdatesFragment updatesFragment);
void inject(ScheduledDownloadsFragment scheduledDownloadsFragment); |
<<<<<<<
String appName, float rating, String packageName, long size, String icon, String graphic,
Obb obb, long storeId, String storeName, String storeTheme, String vername, int vercode,
String path, String backgroundImage, String pathAlt, String md5) {
=======
String title, String appName, String packageName, long size, String icon, String graphic,
Obb obb, long storeId, String storeName, String storeTheme, String vername, int vercode,
String path, String backgroundImage, String pathAlt, String md5) {
>>>>>>>
String title, String appName, float rating, String packageName, long size, String icon, String graphic,
Obb obb, long storeId, String storeName, String storeTheme, String vername, int vercode,
String path, String backgroundImage, String pathAlt, String md5) {
<<<<<<<
public float getRating() {
return rating;
}
=======
public String getTitle() {
return title;
}
>>>>>>>
public float getRating() {
return rating;
}
public String getTitle() {
return title;
} |
<<<<<<<
GenericDialogs.createGenericOkCancelMessage(activity, null,
R.string.facebook_email_permission_regected_message,
R.string.facebook_garant_permission_button, android.R.string.cancel)
.subscribe(eResponse -> {
if (eResponse == GenericDialogs.EResponse.YES) {
LoginManager.getInstance()
.logInWithReadPermissions(activity, Collections.singletonList(EMAIL));
}
=======
final AndroidBasicDialog dialog = AndroidBasicDialog.build(activity);
dialog.setMessage(R.string.facebook_email_permission_regected_message)
.setPositiveButton(R.string.facebook_grant_permission_button, v -> {
LoginManager.getInstance()
.logInWithReadPermissions(activity, Collections.singletonList(EMAIL));
dialog.dismiss();
})
.setNegativeButton("exit", v -> {
dialog.dismiss();
>>>>>>>
GenericDialogs.createGenericOkCancelMessage(activity, null,
R.string.facebook_email_permission_regected_message,
R.string.facebook_grant_permission_button, android.R.string.cancel)
.subscribe(eResponse -> {
if (eResponse == GenericDialogs.EResponse.YES) {
LoginManager.getInstance()
.logInWithReadPermissions(activity, Collections.singletonList(EMAIL));
}
<<<<<<<
=======
dialog.show();
/*
AlertDialog dialog = new AlertDialog.Builder(activity).setMessage(R.string
.facebook_email_permission_regected_message)
.setPositiveButton(R.string.facebook_grant_permission_button, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Activity activity = mActivityWeakReference.get();
if (activity != null) {
LoginManager.getInstance()
.logInWithReadPermissions(activity, Collections
.singletonList(EMAIL));
}
dialog.dismiss();
}
})
.setNegativeButton("exit", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.create();
dialog.show();
*/
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.navigation.AccountNavigator;
import cm.aptoide.pt.navigation.NavigationManagerV4;
=======
>>>>>>>
import cm.aptoide.pt.navigation.AccountNavigator; |
<<<<<<<
__ -> dialogUtils.showRateDialog(context, appName, packageName, storeName);
=======
__ -> dialogUtils.showRateDialog(context, appName, packageName, storeName,
() -> loadReviews(displayable.getStoreCredentials()));
>>>>>>>
__ -> dialogUtils.showRateDialog(context, appName, packageName, storeName);
<<<<<<<
private void loadTopReviews(String storeName, String packageName) {
final FragmentActivity context = getContext();
ListReviewsRequest.ofTopReviews(storeName, packageName, MAX_COMMENTS,
accountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier())
.execute(listReviews -> {
=======
private void loadTopReviews(String storeName, String packageName,
BaseRequestWithStore.StoreCredentials storeCredentials) {
Subscription subscription =
ListReviewsRequest.ofTopReviews(storeName, packageName, MAX_COMMENTS,
AptoideAccountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier(),
storeCredentials)
.observe(true)
.observeOn(AndroidSchedulers.mainThread())
.map(listReviews -> {
>>>>>>>
private void loadTopReviews(String storeName, String packageName,
BaseRequestWithStore.StoreCredentials storeCredentials) {
Subscription subscription =
ListReviewsRequest.ofTopReviews(storeName, packageName, MAX_COMMENTS,
accountManager.getAccessToken(), aptoideClientUUID.getUniqueIdentifier(),
storeCredentials)
.observe(true)
.observeOn(AndroidSchedulers.mainThread())
.map(listReviews -> { |
<<<<<<<
PAUSE_DOWNLOAD, CANCEL_DOWNLOAD, RESUME_DOWNLOAD, INSTALL_APP, RETRY_DOWNLOAD, UPDATE_ALL_APPS, UPDATE_APP, PAUSE_UPDATE, CANCEL_UPDATE, RESUME_UPDATE, UPDATE_CARD_LONG_CLICK, UPDATE_CARD_CLICK, RETRY_UPDATE, APPC_UPGRADE_APP, APPC_UPGRADE_RESUME, APPC_UPGRADE_CANCEL, APPC_UPGRADE_PAUSE, APPC_UPGRADE_RETRY, APPC_DOWNLOAD_APPVIEW
=======
PAUSE_DOWNLOAD, CANCEL_DOWNLOAD, RESUME_DOWNLOAD, INSTALL_APP, RETRY_DOWNLOAD, UPDATE_ALL_APPS, UPDATE_APP, PAUSE_UPDATE, CANCEL_UPDATE, RESUME_UPDATE, UPDATE_CARD_LONG_CLICK, CARD_CLICK, RETRY_UPDATE, APPC_UPGRADE_APP, APPC_UPGRADE_RESUME, APPC_UPGRADE_CANCEL, APPC_UPGRADE_PAUSE, APPC_UPGRADE_RETRY
>>>>>>>
PAUSE_DOWNLOAD, CANCEL_DOWNLOAD, RESUME_DOWNLOAD, INSTALL_APP, RETRY_DOWNLOAD, UPDATE_ALL_APPS, UPDATE_APP, PAUSE_UPDATE, CANCEL_UPDATE, RESUME_UPDATE, UPDATE_CARD_LONG_CLICK, CARD_CLICK, RETRY_UPDATE, APPC_UPGRADE_APP, APPC_UPGRADE_RESUME, APPC_UPGRADE_CANCEL, APPC_UPGRADE_PAUSE, APPC_UPGRADE_RETRY, APPC_DOWNLOAD_APPVIEW |
<<<<<<<
import cm.aptoide.pt.home.AppClick;
=======
import cm.aptoide.pt.home.AppHomeEvent;
import cm.aptoide.pt.home.BottomHomeFragment;
>>>>>>>
import cm.aptoide.pt.home.AppHomeEvent;
<<<<<<<
import cm.aptoide.pt.home.HomeFragment;
import cm.aptoide.pt.home.HomeMoreClick;
=======
import cm.aptoide.pt.home.HomeEvent;
>>>>>>>
import cm.aptoide.pt.home.HomeEvent;
import cm.aptoide.pt.home.HomeFragment; |
<<<<<<<
import cm.aptoide.pt.navigation.NavigationManagerV4;
=======
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.pt.dataprovider.DataProvider;
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
import cm.aptoide.pt.interfaces.AptoideClientUUID;
>>>>>>>
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.pt.dataprovider.DataProvider;
import cm.aptoide.pt.dataprovider.repository.IdsRepositoryImpl;
import cm.aptoide.pt.interfaces.AptoideClientUUID;
import cm.aptoide.pt.navigation.NavigationManagerV4;
<<<<<<<
((V8Engine) getContext().getApplicationContext()).getAccountManager()),
new AddressBookAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext())),
new AddressBookNavigationManager(NavigationManagerV4.Builder.buildWith(getActivity()),
entranceTag, getString(R.string.addressbook_about),
getString(R.string.addressbook_data_about,
Application.getConfiguration().getMarketName())));
=======
new BaseBodyInterceptor(aptoideClientUUID.getUniqueIdentifier(), accountManager),
aptoideClientUUID), new AddressBookAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext())));
>>>>>>>
new BaseBodyInterceptor(aptoideClientUUID.getUniqueIdentifier(), accountManager),
aptoideClientUUID),
new AddressBookAnalytics(Analytics.getInstance(),
AppEventsLogger.newLogger(getContext().getApplicationContext())),
new AddressBookNavigationManager(NavigationManagerV4.Builder.buildWith(getActivity()),
entranceTag, getString(R.string.addressbook_about),
getString(R.string.addressbook_data_about,
Application.getConfiguration().getMarketName()))); |
<<<<<<<
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.StoreMinimalAdAccessor;
=======
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.database.accessors.DeprecatedDatabase;
import cm.aptoide.pt.database.realm.MinimalAd;
>>>>>>>
import cm.aptoide.accountmanager.AptoideAccountManager;
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.StoreMinimalAdAccessor;
import cm.aptoide.pt.database.realm.MinimalAd; |
<<<<<<<
public class UpdateRepository implements Repository<Update, String> {
=======
public class UpdateRepository implements Repository {
private static final String TAG = UpdateRepository.class.getName();
>>>>>>>
public class UpdateRepository implements Repository<Update, String> {
private static final String TAG = UpdateRepository.class.getName();
<<<<<<<
@Override public void save(Update entity) {
updateAccessor.insert(entity);
}
@NonNull private Observable<Void> saveUpdate(App app) {
return updateAccessor.get(app.getPackageName())
.first()
.filter(update -> update == null || !update.isExcluded())
.doOnNext(update -> updateAccessor.save(new Update(app)))
.map(update -> null);
}
/**
* Get all updates that should be shown to user, the excluded updates are not in the list
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code getUpdates} operate by default on {@link RealmSchedulers}.</dd>
* </dl>
*
* @return an observable with a list of updates
*/
//@Deprecated public Observable<List<Update>> getUpdates() {
// return updateAccessor.getAll(false);
//}
private Observable<List<Update>> getStoredUpdates() {
=======
private Completable saveNewUpdates(List<App> updates) {
return Completable.fromSingle(Observable.from(updates)
.map(app -> new Update(app))
.toList()
.toSingle()
.flatMap(updateList -> {
Logger.d(TAG, String.format("filter %d updates for non excluded and save the remainder",
updateList.size()));
return saveNonExcludedUpdates(updateList);
}));
}
public Observable<List<Update>> getAllNonExcluded() {
>>>>>>>
private Completable saveNewUpdates(List<App> updates) {
return Completable.fromSingle(Observable.from(updates)
.map(app -> new Update(app))
.toList()
.toSingle()
.flatMap(updateList -> {
Logger.d(TAG, String.format("filter %d updates for non excluded and save the remainder",
updateList.size()));
return saveNonExcludedUpdates(updateList);
}));
}
@Override public void save(Update entity) {
updateAccessor.insert(entity);
}
public Observable<List<Update>> getAllNonExcluded() { |
<<<<<<<
import cm.aptoide.pt.account.view.LoginSignUpFragment;
import cm.aptoide.pt.analytics.Analytics;
=======
>>>>>>>
import cm.aptoide.pt.account.view.LoginSignUpFragment;
<<<<<<<
private final AppShortcutsAnalytics appShortcutsAnalytics;
private final AptoideAccountManager accountManager;
=======
private final DeepLinkAnalytics deepLinkAnalytics;
>>>>>>>
private final AppShortcutsAnalytics appShortcutsAnalytics;
private final AptoideAccountManager accountManager;
private final DeepLinkAnalytics deepLinkAnalytics;
<<<<<<<
SearchNavigator searchNavigator, SearchAnalytics searchAnalytics,
AppShortcutsAnalytics appShortcutsAnalytics, AptoideAccountManager accountManager) {
=======
SearchNavigator searchNavigator, SearchAnalytics searchAnalytics,
DeepLinkAnalytics deepLinkAnalytics) {
>>>>>>>
SearchNavigator searchNavigator, SearchAnalytics searchAnalytics,
AppShortcutsAnalytics appShortcutsAnalytics, AptoideAccountManager accountManager,
DeepLinkAnalytics deepLinkAnalytics) {
<<<<<<<
this.appShortcutsAnalytics = appShortcutsAnalytics;
this.accountManager = accountManager;
=======
this.deepLinkAnalytics = deepLinkAnalytics;
>>>>>>>
this.appShortcutsAnalytics = appShortcutsAnalytics;
this.accountManager = accountManager;
this.deepLinkAnalytics = deepLinkAnalytics;
<<<<<<<
if (shortcutNavigation) {
searchAnalytics.searchStart(SearchSource.SHORTCUT);
appShortcutsAnalytics.shortcutNavigation(ShortcutDestinations.SEARCH);
} else {
searchAnalytics.searchStart(SearchSource.WIDGET);
}
=======
searchAnalytics.searchStart(SearchSource.WIDGET, false);
>>>>>>>
if (shortcutNavigation) {
searchAnalytics.searchStart(SearchSource.SHORTCUT, false);
appShortcutsAnalytics.shortcutNavigation(ShortcutDestinations.SEARCH);
} else {
searchAnalytics.searchStart(SearchSource.WIDGET, false);
} |
<<<<<<<
subscriptions.add(displayable.getUpdates()
.filter(downloadProgress -> downloadProgress.getRequest().getAppId()
== displayable.getDownload().getAppId())
.map(downloadProgress -> displayable.isDownloadingOrInstalling(downloadProgress))
=======
subscriptions.add(displayable.getDownloadManager()
.getAllDownloads()
.observeOn(Schedulers.io())
.map(downloads -> getDownloadFromList(downloads, displayable.getMd5()))
.map(download -> shouldDisplayProgress(download))
>>>>>>>
subscriptions.add(displayable.getUpdates()
.filter(
downloadProgress -> downloadProgress.getRequest().getMd5() == displayable.getDownload()
.getMd5())
.map(downloadProgress -> displayable.isDownloadingOrInstalling(downloadProgress))
<<<<<<<
=======
private Download getDownloadFromList(List<Download> downloads, String md5) {
for (int i = 0; i < downloads.size(); i++) {
Download download = downloads.get(i);
if (TextUtils.equals(download.getMd5(), md5)) {
return download;
}
}
return null;
}
>>>>>>> |
<<<<<<<
import cm.aptoide.pt.v8engine.store.StoreAnalytics;
=======
import cm.aptoide.pt.v8engine.social.view.TimelineFragment;
>>>>>>>
import cm.aptoide.pt.v8engine.store.StoreAnalytics;
import cm.aptoide.pt.v8engine.social.view.TimelineFragment; |
<<<<<<<
import cm.aptoide.pt.database.accessors.RollbackAccessor;
import cm.aptoide.pt.database.accessors.ScheduledAccessor;
import cm.aptoide.pt.database.accessors.StoreAccessor;
=======
import cm.aptoide.pt.database.accessors.DeprecatedDatabase;
import cm.aptoide.pt.database.accessors.InstalledAccessor;
>>>>>>>
import cm.aptoide.pt.database.accessors.RollbackAccessor;
import cm.aptoide.pt.database.accessors.ScheduledAccessor;
import cm.aptoide.pt.database.accessors.StoreAccessor;
<<<<<<<
//@Cleanup Realm realm = DeprecatedDatabase.get();
//realm.beginTransaction();
//realm.copyToRealmOrUpdate(scheduled);
//realm.commitTransaction();
ScheduledAccessor scheduledAccessor = AccessorFactory.getAccessorFor(Scheduled.class);
scheduledAccessor.insert(scheduled);
=======
scheduled = Scheduled.from(app, appAction);
@Cleanup Realm realm = DeprecatedDatabase.get();
realm.beginTransaction();
realm.copyToRealmOrUpdate(scheduled);
realm.commitTransaction();
>>>>>>>
scheduled = Scheduled.from(app, appAction);
//@Cleanup Realm realm = DeprecatedDatabase.get();
//realm.beginTransaction();
//realm.copyToRealmOrUpdate(scheduled);
//realm.commitTransaction();
ScheduledAccessor scheduledAccessor = AccessorFactory.getAccessorFor(Scheduled.class);
scheduledAccessor.insert(scheduled);
<<<<<<<
GetAppMeta.App app = getApp.getNodes().getMeta().getData();
scheduled = Scheduled.from(app, AppAction.INSTALL);
=======
installAction().observeOn(AndroidSchedulers.mainThread()).subscribe(appAction -> {
AppViewFragment.this.appAction = appAction;
MenuItem item = menu.findItem(R.id.menu_schedule);
if (item != null) {
item.setVisible(appAction != AppAction.OPEN);
}
});
>>>>>>>
installAction().observeOn(AndroidSchedulers.mainThread()).subscribe(appAction -> {
AppViewFragment.this.appAction = appAction;
MenuItem item = menu.findItem(R.id.menu_schedule);
if (item != null) {
item.setVisible(appAction != AppAction.OPEN);
}
}); |
<<<<<<<
@Inject @Named("followedStoresNames") List<String> followedStoresNames;
=======
@Inject InstallManager installManager;
>>>>>>>
@Inject InstallManager installManager;
@Inject @Named("followedStoresNames") List<String> followedStoresNames; |
<<<<<<<
import cm.aptoide.pt.model.v7.GetApp;
import cm.aptoide.pt.model.v7.GetAppMeta;
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
=======
>>>>>>>
import cm.aptoide.pt.model.v7.GetApp;
import cm.aptoide.pt.model.v7.GetAppMeta;
import cm.aptoide.pt.networkclient.util.HashMapNotNull;
import cm.aptoide.pt.preferences.toolbox.ToolboxManager; |
<<<<<<<
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.UpdateAccessor;
=======
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.database.accessors.DeprecatedDatabase;
>>>>>>>
import cm.aptoide.pt.crashreports.CrashReports;
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.accessors.UpdateAccessor;
<<<<<<<
=======
import cm.aptoide.pt.v8engine.util.UpdateUtils;
import io.realm.Realm;
>>>>>>>
import cm.aptoide.pt.v8engine.util.UpdateUtils;
<<<<<<<
UpdateAccessor updateAccessor = AccessorFactory.getAccessorFor(Update.class);
updateAccessor.removeAll();
DataproviderUtils.checkUpdates();
=======
@Cleanup Realm realm = DeprecatedDatabase.get();
DeprecatedDatabase.dropTable(Update.class, realm);
UpdateUtils.checkUpdates();
>>>>>>>
UpdateAccessor updateAccessor = AccessorFactory.getAccessorFor(Update.class);
updateAccessor.removeAll();
UpdateUtils.checkUpdates(); |
<<<<<<<
User user = Login.getUser();
// user.sortingFolder = Dropbox.getOldSortboxPath();
// user.save();
=======
User user = Login.getLoggedInUser();
>>>>>>>
User user = Login.getUser(); |
<<<<<<<
import cm.aptoide.pt.v8engine.interfaces.StoreCredentialsProvider;
import cm.aptoide.pt.v8engine.repository.InstalledRepository;
import cm.aptoide.pt.v8engine.repository.RepositoryFactory;
import cm.aptoide.pt.v8engine.util.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.util.StoreThemeEnum;
=======
import cm.aptoide.pt.v8engine.networking.IdsRepository;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProvider;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.store.StoreThemeEnum;
>>>>>>>
import cm.aptoide.pt.v8engine.install.InstalledRepository;
import cm.aptoide.pt.v8engine.networking.IdsRepository;
import cm.aptoide.pt.v8engine.repository.RepositoryFactory;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProvider;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.store.StoreThemeEnum;
<<<<<<<
installedRepository.getInstalled(packageName)
.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(installed -> {
if (installed != null) {
// app installed... update text
installMenuItem.setTitle(R.string.open);
}
}, err -> {
CrashReport.getInstance().log(err);
});
=======
InstalledAccessor accessor = AccessorFactory.getAccessorFor(Installed.class);
accessor.get(packageName)
.subscribe(installed -> {
if (installed != null) {
// app installed... update text
installMenuItem.setTitle(R.string.open);
}
}, err -> {
CrashReport.getInstance()
.log(err);
});
>>>>>>>
installedRepository.getInstalled(packageName)
.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(installed -> {
if (installed != null) {
// app installed... update text
installMenuItem.setTitle(R.string.open);
}
}, err -> {
CrashReport.getInstance()
.log(err);
}); |
<<<<<<<
import cm.aptoide.pt.v8engine.repository.RepositoryFactory;
import cm.aptoide.pt.v8engine.util.AppUtils;
=======
>>>>>>>
import cm.aptoide.pt.v8engine.repository.RepositoryFactory; |
<<<<<<<
private ApplicationPreferences appPreferences;
=======
private SearchBuilder searchBuilder;
>>>>>>>
private SearchBuilder searchBuilder;
private ApplicationPreferences appPreferences;
<<<<<<<
searchMenuItem = menu.findItem(R.id.action_search);
final SearchBuilder searchBuilder =
new SearchBuilder(searchMenuItem, getContext(), searchNavigator,
viewModel.getCurrentQuery());
searchBuilder.validateAndAttachSearch();
=======
if (searchBuilder != null && searchBuilder.isValid()) {
searchMenuItem = menu.findItem(R.id.action_search);
searchBuilder.attachSearch(getContext(), searchMenuItem);
} else {
menu.removeItem(R.id.action_search);
}
>>>>>>>
if (searchBuilder != null && searchBuilder.isValid()) {
searchMenuItem = menu.findItem(R.id.action_search);
searchBuilder.attachSearch(getContext(), searchMenuItem);
} else {
menu.removeItem(R.id.action_search);
}
<<<<<<<
=======
@NonNull private SearchNavigator getSearchNavigator() {
final SearchNavigator searchNavigator;
final String defaultStore = getDefaultStore();
if (viewModel.getStoreName() != null
&& viewModel.getStoreName()
.length() > 0) {
searchNavigator =
new SearchNavigator(getFragmentNavigator(), viewModel.getStoreName(), defaultStore);
} else {
searchNavigator = new SearchNavigator(getFragmentNavigator(), defaultStore);
}
return searchNavigator;
}
>>>>>>>
<<<<<<<
searchNavigator = new SearchNavigator(getFragmentNavigator(), viewModel.getStoreName());
=======
>>>>>>>
<<<<<<<
return ScreenTagHistory.Builder.build(this.getClass()
.getSimpleName());
}
private void setupTheme() {
final String defaultTheme = appPreferences.getDefaultThemeName();
if (defaultTheme != null && defaultTheme.length() > 0) {
ThemeUtils.setStoreTheme(getActivity(), defaultTheme);
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(defaultTheme));
}
}
@Override public void onDestroyView() {
setupTheme();
super.onDestroyView();
=======
return ScreenTagHistory.Builder.build(this.getClass()
.getSimpleName());
>>>>>>>
return ScreenTagHistory.Builder.build(this.getClass()
.getSimpleName());
}
private void setupTheme() {
final String defaultTheme = appPreferences.getDefaultThemeName();
if (defaultTheme != null && defaultTheme.length() > 0) {
ThemeUtils.setStoreTheme(getActivity(), defaultTheme);
ThemeUtils.setStatusBarThemeColor(getActivity(), StoreTheme.get(defaultTheme));
}
}
@Override public void onDestroyView() {
setupTheme();
super.onDestroyView(); |
<<<<<<<
selectedFragment = new AppsFragment();
=======
bottomNavigationAnalytics.sendNavigateToAppsClickEvent();
selectedFragment = new NewAccountFragment();
>>>>>>>
bottomNavigationAnalytics.sendNavigateToAppsClickEvent();
selectedFragment = new AppsFragment(); |
<<<<<<<
=======
.observeOn(viewScheduler)
.doOnNext(appViewModel -> {
if (appViewModel.hasError()) {
view.handleError(appViewModel.getError());
} else {
view.populateAppDetails(appViewModel);
}
})
.flatMap(appViewModel -> {
if (appViewModel.getOpenType() == NewAppViewFragment.OpenType.OPEN_AND_INSTALL) {
return accountManager.accountStatus()
.observeOn(viewScheduler)
.flatMapCompletable(
accountStatus -> downloadApp(DownloadAppViewModel.Action.INSTALL,
appViewModel.getPackageName(), appViewModel.getAppId()).observeOn(
viewScheduler)
.doOnCompleted(() -> {
appViewAnalytics.clickOnInstallButton(appViewModel.getPackageName(),
appViewModel.getDeveloper()
.getName(), DownloadAppViewModel.Action.INSTALL.toString());
showRecommendsDialog(accountStatus.isLoggedIn(),
appViewModel.getPackageName());
}))
.map(__ -> appViewModel);
} else if (appViewModel.getOpenType()
== NewAppViewFragment.OpenType.OPEN_WITH_INSTALL_POPUP) {
return accountManager.accountStatus()
.observeOn(viewScheduler)
.flatMap(account -> view.showOpenAndInstallDialog(appViewModel.getMarketName(),
appViewModel.getAppName())
.flatMapCompletable(action -> downloadApp(action, appViewModel.getPackageName(),
appViewModel.getAppId()).observeOn(viewScheduler)
.doOnCompleted(() -> {
appViewAnalytics.clickOnInstallButton(appViewModel.getPackageName(),
appViewModel.getDeveloper()
.getName(), action.toString());
showRecommendsDialog(account.isLoggedIn(), appViewModel.getPackageName());
})))
.map(__ -> appViewModel);
}
return Observable.just(appViewModel);
})
>>>>>>>
.flatMap(appViewModel -> {
if (appViewModel.getOpenType() == NewAppViewFragment.OpenType.OPEN_AND_INSTALL) {
return accountManager.accountStatus()
.observeOn(viewScheduler)
.flatMapCompletable(
accountStatus -> downloadApp(DownloadAppViewModel.Action.INSTALL,
appViewModel.getPackageName(), appViewModel.getAppId()).observeOn(
viewScheduler)
.doOnCompleted(() -> {
appViewAnalytics.clickOnInstallButton(appViewModel.getPackageName(),
appViewModel.getDeveloper()
.getName(), DownloadAppViewModel.Action.INSTALL.toString());
showRecommendsDialog(accountStatus.isLoggedIn(),
appViewModel.getPackageName());
}))
.map(__ -> appViewModel);
} else if (appViewModel.getOpenType()
== NewAppViewFragment.OpenType.OPEN_WITH_INSTALL_POPUP) {
return accountManager.accountStatus()
.observeOn(viewScheduler)
.flatMap(account -> view.showOpenAndInstallDialog(appViewModel.getMarketName(),
appViewModel.getAppName())
.flatMapCompletable(action -> downloadApp(action, appViewModel.getPackageName(),
appViewModel.getAppId()).observeOn(viewScheduler)
.doOnCompleted(() -> {
appViewAnalytics.clickOnInstallButton(appViewModel.getPackageName(),
appViewModel.getDeveloper()
.getName(), action.toString());
showRecommendsDialog(account.isLoggedIn(), appViewModel.getPackageName());
})))
.map(__ -> appViewModel);
}
return Observable.just(appViewModel);
}) |
<<<<<<<
import cm.aptoide.pt.NavigationTrackerPagerAdapterHelper;
import cm.aptoide.pt.analytics.AptoideNavigationTracker;
import cm.aptoide.pt.view.account.LoginSignUpFragment;
=======
import cm.aptoide.pt.account.view.LoginSignUpFragment;
>>>>>>>
import cm.aptoide.pt.NavigationTrackerPagerAdapterHelper;
import cm.aptoide.pt.analytics.AptoideNavigationTracker;
import cm.aptoide.pt.view.account.LoginSignUpFragment;
import cm.aptoide.pt.account.view.LoginSignUpFragment; |
<<<<<<<
View view, String defaultTheme, boolean firstCreated, String fileProviderAuthority) {
=======
View view, String defaultStoreName, boolean firstCreated, String fileProviderAuthority) {
>>>>>>>
View view, boolean firstCreated, String fileProviderAuthority) {
<<<<<<<
defaultTheme, firstCreated, fileProviderAuthority);
=======
defaultStoreName, firstCreated, fileProviderAuthority);
>>>>>>>
firstCreated, fileProviderAuthority); |
<<<<<<<
File file = new File(inputPath + fileName);
if (!file.renameTo(new File(outputPath + fileName))) {
cloneFile(inputPath, outputPath, fileName);
}
}
/**
* this method clones a file, it opens the file and using a stream, the new file will be written
*
* @param inputPath Path to the directory where the file to be copied is
* @param outputPath Path to the directory where the file should be copied
* @param fileName Name of the file to be copied
*/
public static void cloneFile(String inputPath, String outputPath, String fileName) {
=======
if (!fileExists(inputPath)) {
throw new RuntimeException("Input file doesn't exists");
}
>>>>>>>
if (!fileExists(inputPath)) {
throw new RuntimeException("Input file doesn't exists");
}
File file = new File(inputPath + fileName);
if (!file.renameTo(new File(outputPath + fileName))) {
cloneFile(inputPath, outputPath, fileName);
}
}
/**
* this method clones a file, it opens the file and using a stream, the new file will be written
*
* @param inputPath Path to the directory where the file to be copied is
* @param outputPath Path to the directory where the file should be copied
* @param fileName Name of the file to be copied
*/
public static void cloneFile(String inputPath, String outputPath, String fileName) { |
<<<<<<<
=======
import cm.aptoide.pt.database.accessors.AccessorFactory;
import cm.aptoide.pt.database.realm.Installed;
import cm.aptoide.pt.dataprovider.WebService;
import cm.aptoide.pt.dataprovider.interfaces.TokenInvalidator;
import cm.aptoide.pt.dataprovider.model.v7.Datalist;
import cm.aptoide.pt.dataprovider.model.v7.timeline.TimelineCard;
>>>>>>>
import cm.aptoide.pt.dataprovider.WebService;
import cm.aptoide.pt.dataprovider.interfaces.TokenInvalidator;
import cm.aptoide.pt.dataprovider.model.v7.Datalist;
import cm.aptoide.pt.dataprovider.model.v7.timeline.TimelineCard;
<<<<<<<
installedRepository), bodyInterceptor, httpClient, converterFactory);
=======
AccessorFactory.getAccessorFor(Installed.class)), bodyInterceptor, httpClient,
converterFactory, tokenInvalidator, sharedPreferences);
final ConnectivityManager connectivityManager =
(ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
final TelephonyManager telephonyManager =
(TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
final WindowManager windowManager =
(WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
>>>>>>>
installedRepository), bodyInterceptor, httpClient, converterFactory, tokenInvalidator,
sharedPreferences);
final ConnectivityManager connectivityManager =
(ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
final TelephonyManager telephonyManager =
(TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
final WindowManager windowManager =
(WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
<<<<<<<
new DownloadEventConverter(bodyInterceptor, httpClient, converterFactory),
installedRepository);
=======
new DownloadEventConverter(bodyInterceptor, httpClient, converterFactory,
tokenInvalidator, V8Engine.getConfiguration()
.getAppId(), sharedPreferences, connectivityManager, telephonyManager),
new TimelineNavigator(getFragmentNavigator(), getContext().getString(R.string.likes)),
getContext().getResources(), Application.getConfiguration()
.getMarketName(), windowManager);
>>>>>>>
new DownloadEventConverter(bodyInterceptor, httpClient, converterFactory,
tokenInvalidator, V8Engine.getConfiguration()
.getAppId(), sharedPreferences, connectivityManager, telephonyManager),
installedRepository,
new TimelineNavigator(getFragmentNavigator(), getContext().getString(R.string.likes)),
getContext().getResources(), Application.getConfiguration()
.getMarketName(), windowManager); |
<<<<<<<
private Completable payApp(DownloadAppViewModel.Action action) {
return appViewManager.loadAppViewViewModel()
.doOnSuccess(appViewViewModel -> {
billingAnalytics.sendPaymentViewShowEvent();
appViewNavigator.buyApp(appViewViewModel.getAppId());
})
.toCompletable();
}
=======
private void showRecommendsDialog(boolean isLoggedIn, AppViewViewModel appViewViewModel) {
if (isLoggedIn && appViewManager.shouldShowRecommendsPreviewDialog()) {
view.showRecommendsDialog();
appViewAnalytics.sendLoggedInRecommendAppDialogShowEvent(appViewViewModel.getPackageName());
} else if (!isLoggedIn && appViewManager.canShowNotLoggedInDialog()) {
appViewNavigator.navigateToNotLoggedInShareFragmentForResult(
appViewViewModel.getPackageName());
appViewAnalytics.sendNotLoggedInRecommendAppDialogShowEvent(
appViewViewModel.getPackageName());
}
}
>>>>>>>
private void showRecommendsDialog(boolean isLoggedIn, AppViewViewModel appViewViewModel) {
if (isLoggedIn && appViewManager.shouldShowRecommendsPreviewDialog()) {
view.showRecommendsDialog();
appViewAnalytics.sendLoggedInRecommendAppDialogShowEvent(appViewViewModel.getPackageName());
} else if (!isLoggedIn && appViewManager.canShowNotLoggedInDialog()) {
appViewNavigator.navigateToNotLoggedInShareFragmentForResult(
appViewViewModel.getPackageName());
appViewAnalytics.sendNotLoggedInRecommendAppDialogShowEvent(
appViewViewModel.getPackageName());
}
}
private Completable payApp(DownloadAppViewModel.Action action) {
return appViewManager.loadAppViewViewModel()
.doOnSuccess(appViewViewModel -> {
billingAnalytics.sendPaymentViewShowEvent();
appViewNavigator.buyApp(appViewViewModel.getAppId());
})
.toCompletable();
} |
<<<<<<<
Observable<ReactionsHomeEvent> reactionClicked();
Observable<EditorialHomeEvent> reactionButtonLongPress();
void showReactionsPopup(String cardId, String groupId, int bundlePosition);
void showLogInDialog();
Observable<Void> snackLogInClick();
void showGenericErrorToast();
void showNetworkErrorToast();
=======
void showConsentDialog();
>>>>>>>
void showConsentDialog();
Observable<ReactionsHomeEvent> reactionClicked();
Observable<EditorialHomeEvent> reactionButtonLongPress();
void showReactionsPopup(String cardId, String groupId, int bundlePosition);
void showLogInDialog();
Observable<Void> snackLogInClick();
void showGenericErrorToast();
void showNetworkErrorToast(); |
<<<<<<<
import cm.aptoide.pt.analytics.analytics.KnockEventLogger;
import cm.aptoide.pt.app.AppViewAnalytics;
import cm.aptoide.pt.app.AppViewSimilarAppAnalytics;
=======
import cm.aptoide.pt.analytics.analytics.HttpKnockEventLogger;
import cm.aptoide.pt.analytics.analytics.RealmEventMapper;
import cm.aptoide.pt.analytics.analytics.RealmEventPersistence;
import cm.aptoide.pt.analytics.analytics.RetrofitAptoideBiService;
>>>>>>>
import cm.aptoide.pt.analytics.analytics.HttpKnockEventLogger;
import cm.aptoide.pt.analytics.analytics.RealmEventMapper;
import cm.aptoide.pt.analytics.analytics.RealmEventPersistence;
import cm.aptoide.pt.analytics.analytics.RetrofitAptoideBiService;
import cm.aptoide.pt.analytics.analytics.KnockEventLogger;
import cm.aptoide.pt.app.AppViewAnalytics;
import cm.aptoide.pt.app.AppViewSimilarAppAnalytics;
<<<<<<<
import cm.aptoide.pt.notification.NotificationAnalytics;
import cm.aptoide.pt.preferences.AdultContent;
=======
import cm.aptoide.pt.preferences.AdultContentManager;
>>>>>>>
import cm.aptoide.pt.preferences.AdultContentManager;
import cm.aptoide.pt.notification.NotificationAnalytics;
<<<<<<<
@Named("Fabric") EventLogger fabricEventLogger, @Named("Knock") EventLogger knockEventLogger,
@Named("Flurry") EventLogger flurryEventLogger) {
List<String> flurryEvents = new LinkedList<>(Arrays.asList(InstallAnalytics.APPLICATION_INSTALL,
DownloadCompleteAnalytics.PARTIAL_EVENT_NAME, DownloadCompleteAnalytics.EVENT_NAME,
AppViewAnalytics.HOME_PAGE_EDITORS_CHOICE_FLURRY, AppViewAnalytics.APP_VIEW_OPEN_FROM,
StoreAnalytics.STORES_TAB_OPEN, StoreAnalytics.STORES_TAB_INTERACT,
StoreAnalytics.STORES_OPEN, StoreAnalytics.STORES_INTERACT,
AccountAnalytics.SIGN_UP_EVENT_NAME, AccountAnalytics.LOGIN_EVENT_NAME,
FirstLaunchAnalytics.FIRST_LAUNCH, AccountAnalytics.LOGIN_SIGN_UP_START_SCREEN,
AccountAnalytics.CREATE_USER_PROFILE, AccountAnalytics.PROFILE_SETTINGS,
AdultContentAnalytics.ADULT_CONTENT, AppViewAnalytics.DOWNGRADE_DIALOG,
DeepLinkAnalytics.APP_LAUNCH, DeepLinkAnalytics.FACEBOOK_APP_LAUNCH,
AppViewAnalytics.CLICK_INSTALL));
for (CardType cardType : CardType.values()) {
flurryEvents.add(cardType.name() + "_" + TimelineAnalytics.APPS_TIMELINE_EVENT);
}
=======
@Named("Fabric") EventLogger fabricEventLogger,
@Named("Flurry") EventLogger flurryEventLogger, HttpKnockEventLogger knockEventLogger) {
>>>>>>>
@Named("Fabric") EventLogger fabricEventLogger,
@Named("Flurry") EventLogger flurryEventLogger, HttpKnockEventLogger knockEventLogger) {
List<String> flurryEvents = new LinkedList<>(Arrays.asList(InstallAnalytics.APPLICATION_INSTALL,
DownloadCompleteAnalytics.PARTIAL_EVENT_NAME, DownloadCompleteAnalytics.EVENT_NAME,
AppViewAnalytics.HOME_PAGE_EDITORS_CHOICE_FLURRY, AppViewAnalytics.APP_VIEW_OPEN_FROM,
StoreAnalytics.STORES_TAB_OPEN, StoreAnalytics.STORES_TAB_INTERACT,
StoreAnalytics.STORES_OPEN, StoreAnalytics.STORES_INTERACT,
AccountAnalytics.SIGN_UP_EVENT_NAME, AccountAnalytics.LOGIN_EVENT_NAME,
FirstLaunchAnalytics.FIRST_LAUNCH, AccountAnalytics.LOGIN_SIGN_UP_START_SCREEN,
AccountAnalytics.CREATE_USER_PROFILE, AccountAnalytics.PROFILE_SETTINGS,
AdultContentAnalytics.ADULT_CONTENT, AppViewAnalytics.DOWNGRADE_DIALOG,
DeepLinkAnalytics.APP_LAUNCH, DeepLinkAnalytics.FACEBOOK_APP_LAUNCH,
AppViewAnalytics.CLICK_INSTALL));
for (CardType cardType : CardType.values()) {
flurryEvents.add(cardType.name() + "_" + TimelineAnalytics.APPS_TIMELINE_EVENT);
}
<<<<<<<
Arrays.asList(PostAnalytics.OPEN_EVENT_NAME, PostAnalytics.POST,
AppViewAnalytics.OPEN_APP_VIEW, NotificationAnalytics.NOTIFICATION_EVENT_NAME,
TimelineAnalytics.OPEN_APP, TimelineAnalytics.UPDATE_APP, TimelineAnalytics.OPEN_STORE,
TimelineAnalytics.OPEN_ARTICLE, TimelineAnalytics.LIKE, TimelineAnalytics.OPEN_BLOG,
TimelineAnalytics.OPEN_VIDEO, TimelineAnalytics.OPEN_CHANNEL,
TimelineAnalytics.OPEN_STORE_PROFILE, TimelineAnalytics.COMMENT,
TimelineAnalytics.SHARE, TimelineAnalytics.SHARE_SEND, TimelineAnalytics.COMMENT_SEND,
TimelineAnalytics.FAB, TimelineAnalytics.SCROLLING_EVENT,
TimelineAnalytics.OPEN_TIMELINE_EVENT, AccountAnalytics.APTOIDE_EVENT_NAME,
DownloadAnalytics.DOWNLOAD_EVENT))
.addLogger(facebookEventLogger,
Arrays.asList(PostAnalytics.OPEN_EVENT_NAME, PostAnalytics.NEW_POST_EVENT_NAME,
PostAnalytics.POST_COMPLETE, InstallAnalytics.APPLICATION_INSTALL,
InstallAnalytics.NOTIFICATION_APPLICATION_INSTALL,
InstallAnalytics.EDITORS_APPLICATION_INSTALL,
AddressBookAnalytics.FOLLOW_FRIENDS_CHOOSE_NETWORK,
AddressBookAnalytics.FOLLOW_FRIENDS_HOW_TO,
AddressBookAnalytics.FOLLOW_FRIENDS_APTOIDE_ACCESS,
AddressBookAnalytics.FOLLOW_FRIENDS_NEW_CONNECTIONS,
AddressBookAnalytics.FOLLOW_FRIENDS_SET_MY_PHONENUMBER,
DownloadCompleteAnalytics.PARTIAL_EVENT_NAME,
DownloadCompleteAnalytics.NOTIFICATION_DOWNLOAD_COMPLETE_EVENT_NAME,
DownloadCompleteAnalytics.EVENT_NAME, SearchAnalytics.SEARCH,
SearchAnalytics.NO_RESULTS, SearchAnalytics.APP_CLICK, SearchAnalytics.SEARCH_START,
AppViewAnalytics.EDITORS_CHOICE_CLICKS, AppViewAnalytics.APP_VIEW_OPEN_FROM,
AppViewAnalytics.APP_VIEW_INTERACT, NotificationAnalytics.NOTIFICATION_RECEIVED,
NotificationAnalytics.NOTIFICATION_PRESSED,
NotificationAnalytics.NOTIFICATION_RECEIVED,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_JOIN,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_CREATE,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_SEND_APP,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_RECEIVE_APP,
TimelineAnalytics.SOCIAL_CARD_PREVIEW, TimelineAnalytics.CARD_ACTION,
TimelineAnalytics.TIMELINE_OPENED, TimelineAnalytics.FOLLOW_FRIENDS,
StoreAnalytics.STORES_TAB_OPEN, StoreAnalytics.STORES_TAB_INTERACT,
StoreAnalytics.STORES_OPEN, StoreAnalytics.STORES_INTERACT,
AccountAnalytics.SIGN_UP_EVENT_NAME, AccountAnalytics.LOGIN_EVENT_NAME,
UpdatesAnalytics.UPDATE_EVENT, PageViewsAnalytics.PAGE_VIEW_EVENT,
DrawerAnalytics.DRAWER_OPEN_EVENT, DrawerAnalytics.DRAWER_INTERACT_EVENT,
FirstLaunchAnalytics.FIRST_LAUNCH, InstallFabricEvents.ROOT_V2_COMPLETE,
InstallFabricEvents.ROOT_V2_START,
AppViewSimilarAppAnalytics.APP_VIEW_SIMILAR_APP_SLIDE_IN,
AppViewSimilarAppAnalytics.SIMILAR_APP_INTERACT,
NotLoggedInShareAnalytics.POP_UP_SHARE_TIMELINE,
AccountAnalytics.LOGIN_SIGN_UP_START_SCREEN, AccountAnalytics.CREATE_USER_PROFILE,
AccountAnalytics.PROFILE_SETTINGS, AccountAnalytics.ENTRY,
DeepLinkAnalytics.FACEBOOK_APP_LAUNCH, AppViewAnalytics.CLICK_INSTALL))
.addLogger(fabricEventLogger, Arrays.asList(DownloadCompleteAnalytics.EVENT_NAME,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_PERMISSIONS,
InstallFabricEvents.ROOT_V2_COMPLETE, InstallFabricEvents.ROOT_V2_START,
InstallFabricEvents.IS_INSTALLATION_TYPE_EVENT_NAME))
.addLogger(knockEventLogger, Arrays.asList(NotificationAnalytics.NOTIFICATION_TOUCH))
.addLogger(flurryEventLogger, flurryEvents)
.addDataSaver(new AnalyticsDataSaver())
=======
Arrays.asList(PostAnalytics.OPEN_EVENT_NAME, "event name"))
.addLogger(facebookEventLogger, Arrays.asList(PostAnalytics.OPEN_EVENT_NAME))
.addLogger(fabricEventLogger, Collections.emptyList())
.addLogger(flurryEventLogger, Collections.emptyList())
.setKnockLogger(knockEventLogger)
>>>>>>>
Arrays.asList(PostAnalytics.OPEN_EVENT_NAME, PostAnalytics.POST,
AppViewAnalytics.OPEN_APP_VIEW, NotificationAnalytics.NOTIFICATION_EVENT_NAME,
TimelineAnalytics.OPEN_APP, TimelineAnalytics.UPDATE_APP, TimelineAnalytics.OPEN_STORE,
TimelineAnalytics.OPEN_ARTICLE, TimelineAnalytics.LIKE, TimelineAnalytics.OPEN_BLOG,
TimelineAnalytics.OPEN_VIDEO, TimelineAnalytics.OPEN_CHANNEL,
TimelineAnalytics.OPEN_STORE_PROFILE, TimelineAnalytics.COMMENT,
TimelineAnalytics.SHARE, TimelineAnalytics.SHARE_SEND, TimelineAnalytics.COMMENT_SEND,
TimelineAnalytics.FAB, TimelineAnalytics.SCROLLING_EVENT,
TimelineAnalytics.OPEN_TIMELINE_EVENT, AccountAnalytics.APTOIDE_EVENT_NAME,
DownloadAnalytics.DOWNLOAD_EVENT))
.addLogger(facebookEventLogger,
Arrays.asList(PostAnalytics.OPEN_EVENT_NAME, PostAnalytics.NEW_POST_EVENT_NAME,
PostAnalytics.POST_COMPLETE, InstallAnalytics.APPLICATION_INSTALL,
InstallAnalytics.NOTIFICATION_APPLICATION_INSTALL,
InstallAnalytics.EDITORS_APPLICATION_INSTALL,
AddressBookAnalytics.FOLLOW_FRIENDS_CHOOSE_NETWORK,
AddressBookAnalytics.FOLLOW_FRIENDS_HOW_TO,
AddressBookAnalytics.FOLLOW_FRIENDS_APTOIDE_ACCESS,
AddressBookAnalytics.FOLLOW_FRIENDS_NEW_CONNECTIONS,
AddressBookAnalytics.FOLLOW_FRIENDS_SET_MY_PHONENUMBER,
DownloadCompleteAnalytics.PARTIAL_EVENT_NAME,
DownloadCompleteAnalytics.NOTIFICATION_DOWNLOAD_COMPLETE_EVENT_NAME,
DownloadCompleteAnalytics.EVENT_NAME, SearchAnalytics.SEARCH,
SearchAnalytics.NO_RESULTS, SearchAnalytics.APP_CLICK, SearchAnalytics.SEARCH_START,
AppViewAnalytics.EDITORS_CHOICE_CLICKS, AppViewAnalytics.APP_VIEW_OPEN_FROM,
AppViewAnalytics.APP_VIEW_INTERACT, NotificationAnalytics.NOTIFICATION_RECEIVED,
NotificationAnalytics.NOTIFICATION_PRESSED,
NotificationAnalytics.NOTIFICATION_RECEIVED,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_JOIN,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_CREATE,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_SEND_APP,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_RECEIVE_APP,
TimelineAnalytics.SOCIAL_CARD_PREVIEW, TimelineAnalytics.CARD_ACTION,
TimelineAnalytics.TIMELINE_OPENED, TimelineAnalytics.FOLLOW_FRIENDS,
StoreAnalytics.STORES_TAB_OPEN, StoreAnalytics.STORES_TAB_INTERACT,
StoreAnalytics.STORES_OPEN, StoreAnalytics.STORES_INTERACT,
AccountAnalytics.SIGN_UP_EVENT_NAME, AccountAnalytics.LOGIN_EVENT_NAME,
UpdatesAnalytics.UPDATE_EVENT, PageViewsAnalytics.PAGE_VIEW_EVENT,
DrawerAnalytics.DRAWER_OPEN_EVENT, DrawerAnalytics.DRAWER_INTERACT_EVENT,
FirstLaunchAnalytics.FIRST_LAUNCH, InstallFabricEvents.ROOT_V2_COMPLETE,
InstallFabricEvents.ROOT_V2_START,
AppViewSimilarAppAnalytics.APP_VIEW_SIMILAR_APP_SLIDE_IN,
AppViewSimilarAppAnalytics.SIMILAR_APP_INTERACT,
NotLoggedInShareAnalytics.POP_UP_SHARE_TIMELINE,
AccountAnalytics.LOGIN_SIGN_UP_START_SCREEN, AccountAnalytics.CREATE_USER_PROFILE,
AccountAnalytics.PROFILE_SETTINGS, AccountAnalytics.ENTRY,
DeepLinkAnalytics.FACEBOOK_APP_LAUNCH, AppViewAnalytics.CLICK_INSTALL))
.addLogger(fabricEventLogger, Arrays.asList(DownloadCompleteAnalytics.EVENT_NAME,
SpotAndShareAnalytics.EVENT_NAME_SPOT_SHARE_PERMISSIONS,
InstallFabricEvents.ROOT_V2_COMPLETE, InstallFabricEvents.ROOT_V2_START,
InstallFabricEvents.IS_INSTALLATION_TYPE_EVENT_NAME))
.addLogger(flurryEventLogger, flurryEvents)
.setKnockLogger(knockEventLogger)
.addDataSaver(new AnalyticsDataSaver()) |
<<<<<<<
import cm.aptoide.pt.v8engine.analytics.Analytics;
=======
import cm.aptoide.pt.v8engine.comments.CommentDialogCallbackContract;
>>>>>>>
import cm.aptoide.pt.v8engine.comments.CommentDialogCallbackContract;
import cm.aptoide.pt.v8engine.analytics.Analytics; |
<<<<<<<
Analytics.Search.noSearchResults(query);
searchAnalytics.searchNoResults(query);
=======
>>>>>>>
searchAnalytics.searchNoResults(query);
<<<<<<<
Analytics.Search.searchTerm(query);
//TODO (pedro): Don't have search source (which tab)
searchAnalytics.search(query);
=======
>>>>>>>
//TODO (pedro): Don't have search source (which tab)
searchAnalytics.search(query); |
<<<<<<<
private String storeTheme;
private Subscription buttonSubscription;
=======
private CompositeSubscription subscriptions;
private GetAppMeta.Media media;
private GetAppMeta.App app;
>>>>>>>
private String storeTheme;
private Subscription buttonSubscription;
private CompositeSubscription subscriptions;
private GetAppMeta.Media media;
private GetAppMeta.App app;
<<<<<<<
this.storeTheme = app.getStore().getAppearance().getTheme();
if (!TextUtils.isEmpty(media.getDescription())) {
descriptionTextView.setText(AptoideUtils.HtmlU.parse(media.getDescription()));
buttonSubscription = RxView.clicks(readMoreBtn).subscribe(click -> {
((FragmentShower) getContext()).pushFragmentV4(
DescriptionFragment.newInstance(app.getId(), storeName, storeTheme));
});
} else {
// only show "default" description if the app doesn't have one
descriptionTextView.setText(R.string.description_not_available);
readMoreBtn.setVisibility(View.GONE);
}
=======
>>>>>>>
this.storeTheme = app.getStore().getAppearance().getTheme();
if (!TextUtils.isEmpty(media.getDescription())) {
descriptionTextView.setText(AptoideUtils.HtmlU.parse(media.getDescription()));
buttonSubscription = RxView.clicks(readMoreBtn).subscribe(click -> {
((FragmentShower) getContext()).pushFragmentV4(
DescriptionFragment.newInstance(app.getId(), storeName, storeTheme));
});
} else {
// only show "default" description if the app doesn't have one
descriptionTextView.setText(R.string.description_not_available);
readMoreBtn.setVisibility(View.GONE);
} |
<<<<<<<
import cm.aptoide.pt.abtesting.experiments.IronSourceInterstitialAdExperiment;
import cm.aptoide.pt.abtesting.experiments.SimilarAdExperiment;
=======
>>>>>>>
import cm.aptoide.pt.abtesting.experiments.IronSourceInterstitialAdExperiment;
<<<<<<<
@Mock private SimilarAdExperiment similarAdExperiment;
@Mock private IronSourceAdRepository ironSourceAdRepository;
@Mock private IronSourceInterstitialAdExperiment ironSourceInterstitialAdExperiment;
=======
>>>>>>>
@Mock private IronSourceAdRepository ironSourceAdRepository;
@Mock private IronSourceInterstitialAdExperiment ironSourceInterstitialAdExperiment;
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "marketName", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "marketName", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "marketName", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository);
<<<<<<<
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
similarAdExperiment, ironSourceInterstitialAdExperiment, ironSourceAdRepository);
=======
installAnalytics, limit, socialRepository, "anyString", appCoinsManager);
>>>>>>>
installAnalytics, limit, socialRepository, "anyString", appCoinsManager,
ironSourceInterstitialAdExperiment, ironSourceAdRepository); |
<<<<<<<
endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(this.getAdapter(),
ListAppVersionsRequest.of(appPackge, storeNames, AptoideAccountManager.getAccessToken(),
aptoideClientUUID.getUniqueIdentifier(), StoreUtils.getSubscribedStoresAuthMap()),
otherVersionsSuccessRequestListener, Throwable::printStackTrace);
=======
EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener =
new EndlessRecyclerOnScrollListener(this.getAdapter(),
ListAppVersionsRequest.of(appPackge, storeNames, AptoideAccountManager.getAccessToken(),
aptoideClientUUID.getAptoideClientUUID(), StoreUtils.getSubscribedStoresAuthMap()),
otherVersionsSuccessRequestListener, Throwable::printStackTrace);
>>>>>>>
EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener =
new EndlessRecyclerOnScrollListener(this.getAdapter(),
ListAppVersionsRequest.of(appPackge, storeNames, AptoideAccountManager.getAccessToken(),
aptoideClientUUID.getUniqueIdentifier(), StoreUtils.getSubscribedStoresAuthMap()),
otherVersionsSuccessRequestListener, Throwable::printStackTrace); |
<<<<<<<
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.downloadmanager.model.DownloadState;
import cm.aptoide.pt.logger.Logger;
import cm.aptoide.pt.utils.ShowMessage;
=======
import cm.aptoide.pt.model.v7.store.GetStore;
>>>>>>>
import cm.aptoide.pt.model.v7.store.GetStore;
import cm.aptoide.pt.downloadmanager.AptoideDownloadManager;
import cm.aptoide.pt.downloadmanager.model.DownloadState;
import cm.aptoide.pt.logger.Logger;
import cm.aptoide.pt.utils.ShowMessage;
<<<<<<<
import rx.Observable;
import rx.Subscription;
import rx.functions.Action1;
=======
import cm.aptoide.pt.v8engine.view.BadgeView;
>>>>>>>
import cm.aptoide.pt.v8engine.view.BadgeView;
import rx.Observable;
import rx.Subscription;
import rx.functions.Action1; |
<<<<<<<
=======
import cm.aptoide.accountmanager.AccountValidationException;
import cm.aptoide.pt.analytics.Analytics;
>>>>>>>
import cm.aptoide.accountmanager.AccountValidationException;
<<<<<<<
public static final String LOGIN_SIGN_UP_START_SCREEN = "Account_Login_Signup_Start_Screen";
public static final String CREATE_USER_PROFILE = "Account_Create_A_User_Profile_Screen";
public static final String PROFILE_SETTINGS = "Account_Profile_Settings_Screen";
public static final String HAS_PICTURE = "has_picture";
public static final String SCREEN = "Screen";
public static final String ENTRY = "Account_Entry";
public static final String SOURCE = "Source";
public static final String LOGIN_EVENT_NAME = "Account_Login_Screen";
public static final String SIGN_UP_EVENT_NAME = "Account_Signup_Screen";
=======
public static final String UNKNOWN_STATUS_CODE = "12501";
>>>>>>>
public static final String LOGIN_SIGN_UP_START_SCREEN = "Account_Login_Signup_Start_Screen";
public static final String CREATE_USER_PROFILE = "Account_Create_A_User_Profile_Screen";
public static final String PROFILE_SETTINGS = "Account_Profile_Settings_Screen";
public static final String HAS_PICTURE = "has_picture";
public static final String SCREEN = "Screen";
public static final String ENTRY = "Account_Entry";
public static final String SOURCE = "Source";
public static final String LOGIN_EVENT_NAME = "Account_Login_Screen";
public static final String SIGN_UP_EVENT_NAME = "Account_Signup_Screen";
public static final String UNKNOWN_STATUS_CODE = "12501"; |
<<<<<<<
private final GetStoreWidgets.WSWidget wsWidget;
private final StoreTabNavigator storeTabNavigator;
private final Model model;
=======
@Getter private final GetStoreWidgets.WSWidget wsWidget;
@Getter private final String storeTheme;
@Getter private final String tag;
@Getter private StoreContext storeContext;
private AptoideNavigationTracker aptoideNavigationTracker;
@Getter @Setter private boolean moreVisible;
>>>>>>>
private final GetStoreWidgets.WSWidget wsWidget;
private final StoreTabNavigator storeTabNavigator;
private AptoideNavigationTracker aptoideNavigationTracker;
private final Model model;
<<<<<<<
String tag, StoreContext storeContext, StoreTabNavigator storeTabNavigator) {
this.model = new Model(storeTheme, tag, storeContext);
=======
String tag, StoreContext storeContext, AptoideNavigationTracker aptoideNavigationTracker) {
>>>>>>>
String tag, StoreContext storeContext, StoreTabNavigator storeTabNavigator, AptoideNavigationTracker aptoideNavigationTracker) {
this.model = new Model(storeTheme, tag, storeContext);
<<<<<<<
public GetStoreWidgets.WSWidget getWsWidget() {
return this.wsWidget;
}
public StoreTabNavigator getStoreTabNavigator() {
return this.storeTabNavigator;
}
public Model getModel() {
return model;
}
public static class Model {
private final String storeTheme;
private final String tag;
private final StoreContext storeContext;
private boolean moreVisible;
Model(String storeTheme, String tag, StoreContext storeContext) {
this.storeTheme = storeTheme;
this.tag = tag;
this.storeContext = storeContext;
this.moreVisible = true;
}
public String getStoreTheme() {
return this.storeTheme;
}
public String getTag() {
return this.tag;
}
public StoreContext getStoreContext() {
return this.storeContext;
}
public boolean isMoreVisible() {
return this.moreVisible;
}
public void setMoreVisible(boolean moreVisible) {
this.moreVisible = moreVisible;
}
}
=======
public AptoideNavigationTracker getAptoideNavigationTracker() {
return aptoideNavigationTracker;
}
>>>>>>>
public GetStoreWidgets.WSWidget getWsWidget() {
return this.wsWidget;
}
public StoreTabNavigator getStoreTabNavigator() {
return this.storeTabNavigator;
}
public Model getModel() {
return model;
}
public static class Model {
private final String storeTheme;
private final String tag;
private final StoreContext storeContext;
private boolean moreVisible;
Model(String storeTheme, String tag, StoreContext storeContext) {
this.storeTheme = storeTheme;
this.tag = tag;
this.storeContext = storeContext;
this.moreVisible = true;
}
public String getStoreTheme() {
return this.storeTheme;
}
public String getTag() {
return this.tag;
}
public StoreContext getStoreContext() {
return this.storeContext;
}
public boolean isMoreVisible() {
return this.moreVisible;
}
public void setMoreVisible(boolean moreVisible) {
this.moreVisible = moreVisible;
}
}
public AptoideNavigationTracker getAptoideNavigationTracker() {
return aptoideNavigationTracker;
} |
<<<<<<<
import cm.aptoide.pt.model.v7.store.Store;
=======
import cm.aptoide.pt.preferences.managed.ManagerPreferences;
>>>>>>>
import cm.aptoide.pt.model.v7.store.Store;
import cm.aptoide.pt.preferences.managed.ManagerPreferences;
<<<<<<<
import cm.aptoide.pt.v8engine.util.StoreThemeEnum;
import cm.aptoide.pt.v8engine.util.ThemeUtils;
=======
import cm.aptoide.pt.v8engine.interfaces.Scrollable;
import cm.aptoide.pt.v8engine.model.MinimalAd;
import cm.aptoide.pt.v8engine.util.AppBarStateChangeListener;
import cm.aptoide.pt.v8engine.util.SearchUtils;
>>>>>>>
import cm.aptoide.pt.v8engine.util.StoreThemeEnum;
import cm.aptoide.pt.v8engine.util.ThemeUtils;
import cm.aptoide.pt.v8engine.interfaces.Scrollable;
import cm.aptoide.pt.v8engine.model.MinimalAd;
import cm.aptoide.pt.v8engine.util.AppBarStateChangeListener;
import cm.aptoide.pt.v8engine.util.SearchUtils;
<<<<<<<
@Override
public void load(boolean refresh) {
GetAppRequest.of(appId).execute(getApp -> {
header.setup(getActivity(), getApp);
setupDisplayables(getApp);
setupObservables(getApp);
finishLoading();
storeTheme = getApp.getNodes().getMeta().getData().getStore().getAppearance().getTheme();
}, refresh);
=======
public static AppViewFragment newInstance(GetAdsResponse.Ad ad) {
Bundle bundle = new Bundle();
bundle.putLong(BundleKeys.APP_ID.name(), ad.getData().getId());
bundle.putParcelable(BundleKeys.MINIMAL_AD.name(), new MinimalAd(ad));
AppViewFragment fragment = new AppViewFragment();
fragment.setArguments(bundle);
return fragment;
>>>>>>>
public static AppViewFragment newInstance(GetAdsResponse.Ad ad) {
Bundle bundle = new Bundle();
bundle.putLong(BundleKeys.APP_ID.name(), ad.getData().getId());
bundle.putParcelable(BundleKeys.MINIMAL_AD.name(), new MinimalAd(ad));
AppViewFragment fragment = new AppViewFragment();
fragment.setArguments(bundle);
return fragment;
private void setupObservables(GetApp getApp) {
// For stores subscription
Database.StoreQ.getAll(realm).asObservable().compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)).subscribe(stores -> {
if (Database.StoreQ.get(getApp.getNodes().getMeta().getData().getStore().getId(), realm) != null) {
adapter.notifyDataSetChanged();
}
});
// For install actions
Database.RollbackQ.getAll(realm).asObservable().compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)).subscribe(rollbacks -> {
adapter.notifyDataSetChanged();
});
// TODO: 27-05-2016 neuro install actions, not present in v7
<<<<<<<
storeTheme = args.getString(BundleCons.STORE_THEME);
=======
minimalAd = args.getParcelable(BundleKeys.MINIMAL_AD.name());
}
//
// Scrollable interface
//
@Override
public void scroll(Position position) {
if (position == Position.FIRST) {
Logger.d(TAG, "scrolling to first position");
getRecyclerView().smoothScrollToPosition(0);
} else if (position == Position.LAST) {
Logger.d(TAG, "scrolling to last position");
getRecyclerView().smoothScrollToPosition(getAdapter().getItemCount());
}
}
@Override
public void itemAdded(int pos) {
getLayoutManager().onItemsAdded(getRecyclerView(), pos, 1);
}
@Override
public void itemRemoved(int pos) {
getLayoutManager().onItemsRemoved(getRecyclerView(), pos, 1);
}
@Override
public void itemChanged(int pos) {
getLayoutManager().onItemsUpdated(getRecyclerView(), pos, 1);
>>>>>>>
minimalAd = args.getParcelable(BundleKeys.MINIMAL_AD.name());
storeTheme = args.getString(BundleCons.STORE_THEME);
}
//
// Scrollable interface
//
@Override
public void scroll(Position position) {
if (position == Position.FIRST) {
Logger.d(TAG, "scrolling to first position");
getRecyclerView().smoothScrollToPosition(0);
} else if (position == Position.LAST) {
Logger.d(TAG, "scrolling to last position");
getRecyclerView().smoothScrollToPosition(getAdapter().getItemCount());
}
}
@Override
public void itemAdded(int pos) {
getLayoutManager().onItemsAdded(getRecyclerView(), pos, 1);
}
@Override
public void itemRemoved(int pos) {
getLayoutManager().onItemsRemoved(getRecyclerView(), pos, 1);
}
@Override
public void itemChanged(int pos) {
getLayoutManager().onItemsUpdated(getRecyclerView(), pos, 1);
<<<<<<<
private CollapsingToolbarLayout collapsingToolbar;
private ImageView featuredGraphic;
private RelativeLayout badgeLayout;
private ImageView badge;
private TextView badgeText;
private ImageView appIcon;
private RatingBar ratingBar;
private TextView fileSize;
private TextView versionName;
private TextView downloadsCount;
private String storeTheme;
=======
@Getter
private final AppBarLayout appBarLayout;
@Getter
private final CollapsingToolbarLayout collapsingToolbar;
@Getter
private final ImageView featuredGraphic;
@Getter
private final ImageView badge;
@Getter
private final TextView badgeText;
@Getter
private final ImageView appIcon;
@Getter
private final TextView fileSize;
@Getter
private final TextView downloadsCount;
>>>>>>>
@Getter
private final AppBarLayout appBarLayout;
@Getter
private final CollapsingToolbarLayout collapsingToolbar;
@Getter
private final ImageView featuredGraphic;
@Getter
private final ImageView badge;
@Getter
private final TextView badgeText;
@Getter
private final ImageView appIcon;
@Getter
private final TextView fileSize;
@Getter
private final TextView downloadsCount;
private String storeTheme;
<<<<<<<
StoreThemeEnum storeThemeEnum = StoreThemeEnum.get(storeTheme);
collapsingToolbar.setBackgroundColor(ContextCompat.getColor(activity, storeThemeEnum
.getStoreHeader()));
collapsingToolbar.setContentScrimColor(ContextCompat.getColor(activity, storeThemeEnum
.getStoreHeader()));
ThemeUtils.setStatusBarThemeColor(activity, StoreThemeEnum.get(storeTheme));
ratingBar.setRating(getApp.getNodes().getMeta().getData().getStats().getRating().getAvg());
=======
appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
@Override
public void onStateChanged(AppBarLayout appBarLayout, State state) {
switch (state) {
case EXPANDED:
if (animationsEnabled) {
appIcon.animate().alpha(1F).start();
} else {
appIcon.setVisibility(View.VISIBLE);
}
break;
default:
case IDLE:
case COLLAPSED:
if (animationsEnabled) {
appIcon.animate().alpha(0F).start();
} else {
appIcon.setVisibility(View.INVISIBLE);
}
break;
}
}
});
>>>>>>>
StoreThemeEnum storeThemeEnum = StoreThemeEnum.get(storeTheme);
collapsingToolbar.setBackgroundColor(ContextCompat.getColor(activity, storeThemeEnum
.getStoreHeader()));
collapsingToolbar.setContentScrimColor(ContextCompat.getColor(activity, storeThemeEnum
.getStoreHeader()));
ThemeUtils.setStatusBarThemeColor(activity, StoreThemeEnum.get(storeTheme));
ratingBar.setRating(getApp.getNodes().getMeta().getData().getStats().getRating().getAvg());
appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
@Override
public void onStateChanged(AppBarLayout appBarLayout, State state) {
switch (state) {
case EXPANDED:
if (animationsEnabled) {
appIcon.animate().alpha(1F).start();
} else {
appIcon.setVisibility(View.VISIBLE);
}
break;
default:
case IDLE:
case COLLAPSED:
if (animationsEnabled) {
appIcon.animate().alpha(0F).start();
} else {
appIcon.setVisibility(View.INVISIBLE);
}
break;
}
}
}); |
<<<<<<<
private static final String INVALID_GRANT_CODE = "invalid_grant";
=======
public static final String LOGIN_SIGN_UP_START_SCREEN = "Account_Login_Signup_Start_Screen";
public static final String CREATE_USER_PROFILE = "Account_Create_A_User_Profile_Screen";
public static final String PROFILE_SETTINGS = "Account_Profile_Settings_Screen";
public static final String HAS_PICTURE = "has_picture";
public static final String SCREEN = "Screen";
public static final String ENTRY = "Account_Entry";
public static final String SOURCE = "Source";
public static final String LOGIN_EVENT_NAME = "Account_Login_Screen";
public static final String SIGN_UP_EVENT_NAME = "Account_Signup_Screen";
>>>>>>>
public static final String LOGIN_SIGN_UP_START_SCREEN = "Account_Login_Signup_Start_Screen";
public static final String CREATE_USER_PROFILE = "Account_Create_A_User_Profile_Screen";
public static final String PROFILE_SETTINGS = "Account_Profile_Settings_Screen";
public static final String HAS_PICTURE = "has_picture";
public static final String SCREEN = "Screen";
public static final String ENTRY = "Account_Entry";
public static final String SOURCE = "Source";
public static final String LOGIN_EVENT_NAME = "Account_Login_Screen";
public static final String SIGN_UP_EVENT_NAME = "Account_Signup_Screen";
private static final String INVALID_GRANT_CODE = "invalid_grant"; |
<<<<<<<
import inra.ijpb.util.IJUtils;
=======
import java.awt.Color;
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
>>>>>>>
import inra.ijpb.util.IJUtils;
import java.awt.Color;
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
<<<<<<<
private List<Roi> pathListToRoiList(Map<Integer, List<Point>> pathMap)
=======
private List<Roi> pathListToRoiList(Map<Integer, List<Point>> pathMap)
{
List<Roi> roiList = new ArrayList<Roi>(pathMap.size());
for (List<Point> path : pathMap.values())
{
if (path.size() > 1)
{
// Polyline path
int n = path.size();
float[] x = new float[n];
float[] y = new float[n];
int i = 0;
for (Point pos : path)
{
x[i] = pos.x + .5f;
y[i] = pos.y + .5f;
i++;
}
Roi roi = new PolygonRoi(x, y, n, Roi.POLYLINE);
roiList.add(roi);
}
else
{
// case of single point particle
Point p = path.get(0);
Roi roi = new PointRoi(p.x + .5, p.y + .5);
roiList.add(roi);
}
}
return roiList;
}
private static String createResultImageName(ImagePlus baseImage)
>>>>>>>
private List<Roi> pathListToRoiList(Map<Integer, List<Point>> pathMap) |
<<<<<<<
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor;
=======
import android.os.Bundle;
import android.support.annotation.NonNull;
>>>>>>>
import cm.aptoide.pt.dataprovider.ws.BodyInterceptor;
import android.os.Bundle;
import android.support.annotation.NonNull; |
<<<<<<<
private PublishSubject<Void> ready;
=======
private PublishSubject<Integer> reviewsAutoScroll;
private PublishSubject<Void> noNetworkRetryClick;
private PublishSubject<Void> genericRetryClick;
>>>>>>>
private PublishSubject<Integer> reviewsAutoScroll;
private PublishSubject<Void> noNetworkRetryClick;
private PublishSubject<Void> genericRetryClick;
private PublishSubject<Void> ready;
<<<<<<<
private TextView appcValue;
=======
private Button installButton;
private View appcRewardView;
private TextView appcRewardValue;
>>>>>>>
private TextView appcValue;
private View appcRewardView;
private TextView appcRewardValue;
<<<<<<<
ready = PublishSubject.create();
=======
reviewsAutoScroll = PublishSubject.create();
noNetworkRetryClick = PublishSubject.create();
genericRetryClick = PublishSubject.create();
>>>>>>>
ready = PublishSubject.create();
reviewsAutoScroll = PublishSubject.create();
noNetworkRetryClick = PublishSubject.create();
genericRetryClick = PublishSubject.create();
<<<<<<<
appcValue = (TextView) view.findViewById(R.id.appc_layout)
.findViewById(R.id.appcoins_reward_message);
=======
installButton = (Button) view.findViewById(R.id.install_button);
appcRewardView = view.findViewById(R.id.appc_layout);
appcRewardValue = (TextView) view.findViewById(R.id.appcoins_reward_message);
>>>>>>>
appcValue = (TextView) view.findViewById(R.id.appc_layout)
.findViewById(R.id.appcoins_reward_message);
appcRewardView = view.findViewById(R.id.appc_layout);
appcRewardValue = (TextView) view.findViewById(R.id.appcoins_reward_message);
<<<<<<<
@Override public Observable<DownloadAppViewModel.Action> installAppClick() {
return RxView.clicks(install)
.map(__ -> action);
}
@Override public Observable<Boolean> showRootInstallWarningPopup() {
return GenericDialogs.createGenericYesNoCancelMessage(this.getContext(), null,
getResources().getString(R.string.root_access_dialog))
.map(response -> (response.equals(YES)));
}
@Override public void showDownloadAppModel(DownloadAppViewModel model) {
this.action = model.getAction();
if (model.isDownloading()) {
downloadInfoLayout.setVisibility(View.VISIBLE);
install.setVisibility(View.GONE);
setDownloadState(model.getProgress(), model.getDownloadState());
} else {
downloadInfoLayout.setVisibility(View.GONE);
install.setVisibility(View.VISIBLE);
setButtonText(model.getAction());
}
}
@Override public void openApp(String packageName) {
AptoideUtils.SystemU.openApp(packageName, getContext().getPackageManager(), getContext());
}
@Override public Observable<Boolean> showDowngradeMessage() {
return GenericDialogs.createGenericContinueCancelMessage(getContext(), null,
getContext().getResources()
.getString(R.string.downgrade_warning_dialog))
.map(eResponse -> eResponse.equals(YES));
}
@Override public void showDowngradingMessage() {
Snackbar.make(getView(), R.string.downgrading_msg, Snackbar.LENGTH_SHORT)
.show();
}
@Override public Observable<Void> pauseDownload() {
return RxView.clicks(pauseDownload);
}
@Override public Observable<Void> resumeDownload() {
return RxView.clicks(resumeDownload);
}
@Override public Observable<Void> cancelDownload() {
return RxView.clicks(cancelDownload);
}
@Override public Observable<Void> isAppViewReadyToDownload() {
return ready;
}
@Override public void readyToDownload() {
ready.onNext(null);
}
private void setDownloadState(int progress, DownloadAppViewModel.DownloadState downloadState) {
switch (downloadState) {
case ACTIVE:
downloadProgressBar.setIndeterminate(false);
downloadProgressBar.setProgress(progress);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case INDETERMINATE:
downloadProgressBar.setIndeterminate(true);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case PAUSE:
downloadProgressBar.setIndeterminate(false);
downloadProgressBar.setProgress(progress);
pauseDownload.setVisibility(View.GONE);
cancelDownload.setVisibility(View.VISIBLE);
resumeDownload.setVisibility(View.VISIBLE);
break;
case COMPLETE:
downloadProgressBar.setIndeterminate(true);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case ERROR:
// TODO: 5/10/18 define error state
break;
}
}
private void setButtonText(DownloadAppViewModel.Action action) {
switch (action) {
case UPDATE:
install.setText(getResources().getString(R.string.appview_button_update));
break;
case INSTALL:
install.setText(getResources().getString(R.string.appview_button_install));
break;
case OPEN:
install.setText(getResources().getString(R.string.appview_button_open));
break;
case DOWNGRADE:
install.setText(getResources().getString(R.string.appview_button_downgrade));
break;
}
}
=======
private SpannableString formatAppCoinsRewardMessage() {
DecimalFormat twoDecimalFormat = new DecimalFormat("#.##");
String reward = String.valueOf(twoDecimalFormat.format(appcReward)) + " APPC";
String tryAppMessage =
getResources().getString(R.string.appc_message_appview_appcoins_reward, reward);
SpannableString spannable = new SpannableString(tryAppMessage);
spannable.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.orange_700)),
tryAppMessage.indexOf(reward), tryAppMessage.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
}
>>>>>>>
private SpannableString formatAppCoinsRewardMessage() {
DecimalFormat twoDecimalFormat = new DecimalFormat("#.##");
String reward = String.valueOf(twoDecimalFormat.format(appcReward)) + " APPC";
String tryAppMessage =
getResources().getString(R.string.appc_message_appview_appcoins_reward, reward);
SpannableString spannable = new SpannableString(tryAppMessage);
spannable.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.orange_700)),
tryAppMessage.indexOf(reward), tryAppMessage.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
}
@Override public Observable<DownloadAppViewModel.Action> installAppClick() {
return RxView.clicks(install)
.map(__ -> action);
}
@Override public Observable<Boolean> showRootInstallWarningPopup() {
return GenericDialogs.createGenericYesNoCancelMessage(this.getContext(), null,
getResources().getString(R.string.root_access_dialog))
.map(response -> (response.equals(YES)));
}
@Override public void showDownloadAppModel(DownloadAppViewModel model) {
this.action = model.getAction();
if (model.isDownloading()) {
downloadInfoLayout.setVisibility(View.VISIBLE);
install.setVisibility(View.GONE);
setDownloadState(model.getProgress(), model.getDownloadState());
} else {
downloadInfoLayout.setVisibility(View.GONE);
install.setVisibility(View.VISIBLE);
setButtonText(model.getAction());
}
}
@Override public void openApp(String packageName) {
AptoideUtils.SystemU.openApp(packageName, getContext().getPackageManager(), getContext());
}
@Override public Observable<Boolean> showDowngradeMessage() {
return GenericDialogs.createGenericContinueCancelMessage(getContext(), null,
getContext().getResources()
.getString(R.string.downgrade_warning_dialog))
.map(eResponse -> eResponse.equals(YES));
}
@Override public void showDowngradingMessage() {
Snackbar.make(getView(), R.string.downgrading_msg, Snackbar.LENGTH_SHORT)
.show();
}
@Override public Observable<Void> pauseDownload() {
return RxView.clicks(pauseDownload);
}
@Override public Observable<Void> resumeDownload() {
return RxView.clicks(resumeDownload);
}
@Override public Observable<Void> cancelDownload() {
return RxView.clicks(cancelDownload);
}
@Override public Observable<Void> isAppViewReadyToDownload() {
return ready;
}
@Override public void readyToDownload() {
ready.onNext(null);
}
private void setDownloadState(int progress, DownloadAppViewModel.DownloadState downloadState) {
switch (downloadState) {
case ACTIVE:
downloadProgressBar.setIndeterminate(false);
downloadProgressBar.setProgress(progress);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case INDETERMINATE:
downloadProgressBar.setIndeterminate(true);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case PAUSE:
downloadProgressBar.setIndeterminate(false);
downloadProgressBar.setProgress(progress);
pauseDownload.setVisibility(View.GONE);
cancelDownload.setVisibility(View.VISIBLE);
resumeDownload.setVisibility(View.VISIBLE);
break;
case COMPLETE:
downloadProgressBar.setIndeterminate(true);
pauseDownload.setVisibility(View.VISIBLE);
cancelDownload.setVisibility(View.GONE);
resumeDownload.setVisibility(View.GONE);
break;
case ERROR:
// TODO: 5/10/18 define error state
break;
}
}
private void setButtonText(DownloadAppViewModel.Action action) {
switch (action) {
case UPDATE:
install.setText(getResources().getString(R.string.appview_button_update));
break;
case INSTALL:
install.setText(getResources().getString(R.string.appview_button_install));
break;
case OPEN:
install.setText(getResources().getString(R.string.appview_button_open));
break;
case DOWNGRADE:
install.setText(getResources().getString(R.string.appview_button_downgrade));
break;
}
} |
<<<<<<<
import cm.aptoide.pt.v8engine.repository.SocialRepository;
import cm.aptoide.pt.v8engine.util.DownloadFactory;
=======
import cm.aptoide.pt.v8engine.spotandshare.SpotAndShareAnalytics;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProvider;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.store.StoreThemeEnum;
import cm.aptoide.pt.v8engine.timeline.SocialRepository;
>>>>>>>
import cm.aptoide.pt.v8engine.spotandshare.SpotAndShareAnalytics;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProvider;
import cm.aptoide.pt.v8engine.store.StoreCredentialsProviderImpl;
import cm.aptoide.pt.v8engine.store.StoreThemeEnum;
import cm.aptoide.pt.v8engine.timeline.SocialRepository;
<<<<<<<
private DownloadFactory downloadFactory;
private StoreMinimalAdAccessor storeMinimalAdAccessor;
=======
private StoredMinimalAdAccessor storedMinimalAdAccessor;
private PaymentAnalytics paymentAnalytics;
private SpotAndShareAnalytics spotAndShareAnalytics;
private ShareAppHelper shareAppHelper;
public static AppViewFragment newInstanceUname(String uname) {
Bundle bundle = new Bundle();
bundle.putString(BundleKeys.UNAME.name(), uname);
AppViewFragment fragment = new AppViewFragment();
fragment.setArguments(bundle);
return fragment;
}
>>>>>>>
private StoredMinimalAdAccessor storedMinimalAdAccessor;
private PaymentAnalytics paymentAnalytics;
private SpotAndShareAnalytics spotAndShareAnalytics;
private ShareAppHelper shareAppHelper;
private DownloadFactory downloadFactory;
public static AppViewFragment newInstanceUname(String uname) {
Bundle bundle = new Bundle();
bundle.putString(BundleKeys.UNAME.name(), uname);
AppViewFragment fragment = new AppViewFragment();
fragment.setArguments(bundle);
return fragment;
}
<<<<<<<
storeMinimalAdAccessor = AccessorFactory.getAccessorFor(StoredMinimalAd.class);
downloadFactory = new DownloadFactory();
=======
storedMinimalAdAccessor = AccessorFactory.getAccessorFor(StoredMinimalAd.class);
spotAndShareAnalytics = new SpotAndShareAnalytics(Analytics.getInstance());
paymentAnalytics = ((V8Engine) getContext().getApplicationContext()).getPaymentAnalytics();
shareAppHelper =
new ShareAppHelper(installedRepository, accountManager, accountNavigator, getActivity(),
spotAndShareAnalytics);
>>>>>>>
storedMinimalAdAccessor = AccessorFactory.getAccessorFor(StoredMinimalAd.class);
spotAndShareAnalytics = new SpotAndShareAnalytics(Analytics.getInstance());
paymentAnalytics = ((V8Engine) getContext().getApplicationContext()).getPaymentAnalytics();
shareAppHelper =
new ShareAppHelper(installedRepository, accountManager, accountNavigator, getActivity(),
spotAndShareAnalytics);
downloadFactory = new DownloadFactory();
<<<<<<<
@NonNull private Observable<GetApp> manageSuggestedAds(GetApp getApp1) {
List<String> keywords = getApp1.getNodes().getMeta().getData().getMedia().getKeywords();
String packageName = getApp1.getNodes().getMeta().getData().getPackageName();
=======
>>>>>>>
<<<<<<<
app.getFile().getVername()).toObservable())
=======
app.getFile()
.getVername()))
>>>>>>>
app.getFile()
.getVername())
.toObservable())
<<<<<<<
public Observable<AppAction> installAction(String packageName, int versionCode) {
return installManager.getInstallationType(packageName, versionCode).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.getInstallationType(packageName, versionCode)
.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;
}); |
<<<<<<<
SocialRepository socialRepository, AppsTimelineNavigator timelineNavigator,
WindowManager windowManager) {
=======
SocialRepository socialRepository, InstalledRepository installedRepository,
TimelineNavigator timelineNavigator, WindowManager windowManager) {
>>>>>>>
SocialRepository socialRepository, InstalledRepository installedRepository,
AppsTimelineNavigator timelineNavigator, WindowManager windowManager) {
<<<<<<<
SocialRepository socialRepository, AppsTimelineNavigator timelineNavigator,
WindowManager windowManager) {
=======
SocialRepository socialRepository, InstalledRepository installedRepository,
TimelineNavigator timelineNavigator, WindowManager windowManager) {
>>>>>>>
SocialRepository socialRepository, InstalledRepository installedRepository,
AppsTimelineNavigator timelineNavigator, WindowManager windowManager) { |
<<<<<<<
@ActivityScope @Provides WalletInstallPresenter providesPromotionsPresenter(
WalletInstallNavigator walletInstallNavigator, WalletInstallManager walletInstallManager,
PromotionsManager promotionsManager) {
return new WalletInstallPresenter((WalletInstallView) view, walletInstallManager,
walletInstallNavigator, promotionsManager, AndroidSchedulers.mainThread());
}
@ActivityScope @Provides WalletInstallNavigator providesWalletInstallNavigator(
@Named("main-fragment-navigator") FragmentNavigator fragmentNavigator) {
return new WalletInstallNavigator(fragmentNavigator);
}
@ActivityScope @Provides WalletInstallManager providesWalletInstallManager(
WalletInstallConfiguration configuration) {
return new WalletInstallManager(configuration, activity.getPackageManager());
}
@ActivityScope @Provides WalletInstallConfiguration providesWalletInstallConfiguration() {
return new WalletInstallConfiguration(
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.PACKAGE_NAME_KEY),
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.WALLET_PACKAGE_NAME_KEY));
}
=======
@ActivityScope @Provides WalletInstallPresenter providesWalletInstallPresenter(
WalletInstallNavigator walletInstallNavigator, WalletInstallManager walletInstallManager) {
return new WalletInstallPresenter((WalletInstallView) view, walletInstallManager,
walletInstallNavigator);
}
@ActivityScope @Provides WalletInstallNavigator providesWalletInstallNavigator(
@Named("main-fragment-navigator") FragmentNavigator fragmentNavigator) {
return new WalletInstallNavigator(fragmentNavigator);
}
@ActivityScope @Provides WalletInstallManager providesWalletInstallManager(
WalletInstallConfiguration configuration) {
return new WalletInstallManager(configuration);
}
@ActivityScope @Provides WalletInstallConfiguration providesWalletInstallConfiguration() {
return new WalletInstallConfiguration(
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.PACKAGE_NAME_KEY),
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.WALLET_PACKAGE_NAME_KEY));
}
>>>>>>>
@ActivityScope @Provides WalletInstallPresenter providesWalletInstallPresenter(
WalletInstallNavigator walletInstallNavigator, WalletInstallManager walletInstallManager,
PromotionsManager promotionsManager) {
return new WalletInstallPresenter((WalletInstallView) view, walletInstallManager,
walletInstallNavigator, promotionsManager, AndroidSchedulers.mainThread());
}
@ActivityScope @Provides WalletInstallNavigator providesWalletInstallNavigator(
@Named("main-fragment-navigator") FragmentNavigator fragmentNavigator) {
return new WalletInstallNavigator(fragmentNavigator);
}
@ActivityScope @Provides WalletInstallManager providesWalletInstallManager(
WalletInstallConfiguration configuration) {
return new WalletInstallManager(configuration, activity.getPackageManager());
}
@ActivityScope @Provides WalletInstallConfiguration providesWalletInstallConfiguration() {
return new WalletInstallConfiguration(
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.PACKAGE_NAME_KEY),
intent.getStringExtra(DeepLinkIntentReceiver.DeepLinksKeys.WALLET_PACKAGE_NAME_KEY));
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.