conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import static org.springframework.data.domain.Sort.Direction.DESC;
=======
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
>>>>>>>
import static org.springframework.data.domain.Sort.Direction.DESC;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
<<<<<<<
final Page<Post> posts = ... |
<<<<<<<
private static String[] CAN_EDIT_SUFFIX = {"ftl", "css", "js"};
=======
private final HaloProperties haloProperties;
public ThemeServiceImpl(HaloProperties haloProperties) {
this.haloProperties = haloProperties;
}
>>>>>>>
private final HaloProperties haloProperties;
public... |
<<<<<<<
import static org.springframework.data.domain.Sort.Direction.DESC;
=======
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
>>>>>>>
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
import static org.springframework.data.domain.Sort.Direction.DESC; |
<<<<<<<
import static org.springframework.data.domain.Sort.Direction.DESC;
=======
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
>>>>>>>
import static org.springframework.data.domain.Sort.Direction.DESC;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS; |
<<<<<<<
import static org.springframework.data.domain.Sort.Direction.DESC;
=======
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
>>>>>>>
import static org.springframework.data.domain.Sort.Direction.DESC;
import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
<<<<<<<
=======
* @param size 每页数... |
<<<<<<<
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
=======
import net.fabricmc.fabric.api.event.server.ServerStartCallback;
import net.fabricmc.fabric.api.event.server.ServerStopCallback;
import net.fabricmc.fabric.ap... |
<<<<<<<
import com.stratio.decision.commons.constants.InternalTopic;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
=======
import java.util.HashMap;
>>>>>>>
import com.stratio.decision.commons.constants.Internal... |
<<<<<<<
import android.database.sqlite.SQLiteDatabase;
=======
>>>>>>>
import android.database.sqlite.SQLiteDatabase;
<<<<<<<
import java.io.File;
=======
>>>>>>>
import java.io.File; |
<<<<<<<
builder.append(ctx.firstToUpper(thing.getName()) + ".prototype._receive = function(message) {//takes a JSONified message\n");
builder.append("this.getQueue().push(message);\n");
/** MODIFICATION **/
builder.append("this.cepDispatch(message);\n");
/** E... |
<<<<<<<
Rules.add(new InternalTransitions());
Rules.add(new AutotransitionCycles());
Rules.add(new NonDeterministicTransitions());
=======
Rules.add(new FunctionUsage());
Rules.add(new StatesUsage());
>>>>>>>
Rules.add(new InternalTransitions());
Rules.add(new ... |
<<<<<<<
=======
import org.thingml.compilers.configuration.CfgBuildCompiler;
import org.thingml.compilers.configuration.CfgExternalConnectorCompiler;
import org.thingml.compilers.configuration.CfgMainGenerator;
import org.thingml.compilers.thing.common.FSMBasedThingImplCompiler;
import org.thingml.compilers.thing.Thi... |
<<<<<<<
builder.append("//Instance " + inst.getName() + "\n");
builder.append("// Variables for the properties of the instance\n");
builder.append(ctx.getInstanceVarDecl(inst) + "\n");
if(cfg.hasAnnotation("c_dyn_connect... |
<<<<<<<
import org.thingml.compilers.CepCompiler;
import org.thingml.compilers.OpaqueThingMLCompiler;
=======
import org.thingml.compilers.utils.OpaqueThingMLCompiler;
>>>>>>>
import org.thingml.compilers.CepCompiler;
import org.thingml.compilers.utils.OpaqueThingMLCompiler;
<<<<<<<
super(new CActionCompile... |
<<<<<<<
if (cfg.hasAnnotation("c_dyn_connectors")) {
b.append("//Port message handler structure\n"
+ "typedef struct Msg_Handler {\n" +
" int nb_msg;\n" +
" uint16_t * msg;\n" +
" void ** msg_handler;\n" +
" void * instance;\n" +
"};\n\n");
=======
... |
<<<<<<<
=======
//public List<String> getFormalParameterNamelist(Thing thing, Message m) {
// List<String> paramList = new ArrayList<String>();
//
// for (Parameter p : m.getParameters()) {
// paramList.add(p.getName());
// }
// return paramList;
... |
<<<<<<<
=======
import org.sintef.thingml.helpers.ConfigurationHelper;
>>>>>>>
import org.sintef.thingml.helpers.ConfigurationHelper;
<<<<<<<
=======
import org.thingml.compilers.thing.ThingCepCompiler;
import org.thingml.compilers.thing.ThingCepSourceDeclaration;
import org.thingml.compilers.thing.ThingCepViewCo... |
<<<<<<<
table.put("TabbedPane[contentBorder].enableTop", false);
table.put("TabbedPane[contentBorder].enableLeaf", false);
table.put("TabbedPane[contentBorder].enableRight", false);
table.put("TabbedPane[contentBorder].enableBottom", false);
table.put("TextField.caretFo... |
<<<<<<<
private String title;
private String path;
private String user = "";
private String pass = "";
private String fabskin;
private BookmarkCallback bookmarkCallback;
private int studiomode = 0;
=======
private UtilitiesProviderInterface utilsProvider;
String title, path, user =... |
<<<<<<<
public Collection<String> asserts() {
return this.asser;
}
@Override
=======
@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
>>>>>>>
public Collection<String> asserts() {
return this.asser;
}
@Override
@SuppressWarnings("PMD.AvoidInstantiatingObject... |
<<<<<<<
private final Collection<String> exc =
new LinkedList<String>();
=======
private final transient Collection<String> exc = new LinkedList<>();
>>>>>>>
private final Collection<String> exc = new LinkedList<>();
<<<<<<<
private final Collection<String> asser =
new LinkedList<Str... |
<<<<<<<
"BracketsStructureCheck",
=======
"ConstantUsageCheck",
>>>>>>>
"BracketsStructureCheck",
"ConstantUsageCheck", |
<<<<<<<
private final Collection<String> messages =
new ConcurrentLinkedQueue<String>();
=======
private final transient Collection<String> messages =
new ConcurrentLinkedQueue<>();
>>>>>>>
private final Collection<String> messages =
new ConcurrentLinkedQue... |
<<<<<<<
import org.sonar.xoo.lang.CoveragePerTestSensor;
import org.sonar.xoo.lang.MeasureSensor;
import org.sonar.xoo.lang.SymbolReferencesSensor;
import org.sonar.xoo.lang.SyntaxHighlightingSensor;
import org.sonar.xoo.lang.TestCaseSensor;
import org.sonar.xoo.lang.XooTokenizerSensor;
import org.sonar.xoo.rule.Create... |
<<<<<<<
Library lib = new Library(project.getKey(), dependency.version());
index.addResource(lib);
// Temporary hack since we need snapshot id to persist dependencies
resourcePersister.persist();
=======
Library lib = new Library(dependency.key(), dependency.version());
context.sav... |
<<<<<<<
DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao());
sut = new ComputationService(dbClient, steps, activityService, settingsFactory, tempFolder, system);
=======
DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(), ... |
<<<<<<<
/**
* @deprecated since 5.0 should not be an API. Everything should be accessed using {@link SensorContext}.
*/
@Deprecated
=======
/**
* @deprecated since 4.5.2 should not be used by plugins.
*/
@Deprecated
>>>>>>>
/**
* @deprecated since 4.5.2 should not be used by plugins. Everything should be access... |
<<<<<<<
settings.checkUrlParameters(JdbcSettings.Provider.MYSQL,
"jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&useCursorFetch=true");
=======
settings.checkUrlParameters(JdbcSettings.Provider.mysql,
"jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=ut... |
<<<<<<<
settings.checkUrlParameters(JdbcSettings.Provider.MYSQL,
"jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8");
=======
settings.checkUrlParameters(JdbcSettings.Provider.mysql,
"jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&useCursorFetch=tr... |
<<<<<<<
.setCleanSonarGoals()
// exclude pom.xml, otherwise it will be published in SQ 6.3+ and not in previous versions, resulting in a different number of
// components
=======
.setCleanPackageSonarGoals()
// exclude pom.xml, otherwise it will be published in SQ 6.3+ and not in previou... |
<<<<<<<
import com.google.common.collect.Maps;
import org.sonar.api.batch.bootstrap.ProjectDefinition;
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.batch.bootstrap.ProjectD... |
<<<<<<<
wsTester = new WsTester(new QProfilesWs(mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class),
new ChangelogAction(changelogLoader, profileFactory, new Languages(), dbTester.getDbClient())));
=======
dbTester.truncateTables();
esTeste... |
<<<<<<<
String litresRel = null;
int catalogType = NetworkCatalogItem.CATALOG_OTHER;
for (ATOMLink link : entry.Links) {
=======
boolean litresCatalogue = false;
NetworkCatalogItem.CatalogType catalogType = NetworkCatalogItem.CatalogType.OTHER;
for (ATOMLink link: entry.Links) {
>>>>>>>
String litresRe... |
<<<<<<<
import org.geometerplus.android.util.UIUtil;
=======
import org.geometerplus.android.util.AndroidUtil;
import org.geometerplus.android.fbreader.FBReader;
>>>>>>>
import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.fbreader.FBReader; |
<<<<<<<
if (myDoGroupTitlesByFirstLetter) {
final String letter = TitleTree.firstTitleLetter(book);
if (letter != null) {
final TitleTree tree =
getFirstLevelTree(LibraryTree.ROOT_BY_TITLE).getTitleSubTree(letter);
tree.createBookWithAuthorsSubTree(book);
}
} else {
getFirstLevelTree(Librar... |
<<<<<<<
private final class CoverSyncRunnable implements Runnable {
private final ViewHolder myHolder;
private final ZLLoadableImage myImage;
private final int myWidth;
private final int myHeight;
private final Key myKey;
private final NetworkTree myTree;
CoverSyncRunnable(ViewHolder holder, ZLLoadableI... |
<<<<<<<
lookNFeelCategory.addOption(ZLAndroidApplication.Instance().DontTurnScreenOffOption, "dontTurnScreenOff");
=======
lookNFeelCategory.addPreference(new BatteryLevelToTurnScreenOffPreference(
this,
ZLAndroidApplication.Instance().BatteryLevelToTurnScreenOffOption,
lookNFeelCategory.Resource,
"do... |
<<<<<<<
if (myCoverManager == null) {
view.measure(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
final int height = view.getMeasuredHeight();
myCoverManager = new CoverManager(getActivity(), height * 15 / 32, height);
view.requestLayout();
}
CoverHolder holder = (CoverHold... |
<<<<<<<
public static interface CredentialsCreator {
Credentials createCredentials(String scheme, AuthScope scope, boolean quietMode);
boolean credentialsExist(AuthScope scope);
void removeCredentials(AuthScope scope);
}
public static abstract class BasicCredentialsCreator implements ZLNetworkManager.Credenti... |
<<<<<<<
private final RootTree myRootTree;
=======
private final Map<ZLFile,Book> myBooks =
Collections.synchronizedMap(new HashMap<ZLFile,Book>());
private final RootTree myRootTree;
>>>>>>>
private final RootTree myRootTree;
<<<<<<<
myRootTree = new RootTree(collection);
new FavoritesTree(myRootTree);... |
<<<<<<<
=======
private BooksDatabase myDatabase;
>>>>>>>
<<<<<<<
mySelectedBook =
SerializerUtil.deserializeBook(getIntent().getStringExtra(SELECTED_BOOK_KEY));
=======
mySelectedBook =
SerializerUtil.deserializeBook(getIntent().getStringExtra(FBReader.BOOK_KEY));
>>>>>>>
mySelectedBook =
Serial... |
<<<<<<<
final NetworkCatalogTree catalogTree = (NetworkCatalogTree)tree;
final NetworkCatalogItem item = catalogTree.Item;
if (item.URLByType.get(NetworkCatalogItem.URL_CATALOG) != null) {
=======
final NetworkCatalogItem item = ((NetworkCatalogTree)tree).Item;
if (!(item instanceof NetworkURLCatalogItem)) ... |
<<<<<<<
import android.content.*;
import android.os.Bundle;
import android.view.*;
import android.widget.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.R;
=======
import android.os.Bundle;
>>>>>>>
import android.content.*;
import android.os.Bundle;
import ... |
<<<<<<<
=======
private static class ParagonInfoReader extends ZLXMLReaderAdapter {
private final Context myContext;
private int myCounter;
ParagonInfoReader(Context context) {
myContext = context;
}
@Override
public boolean dontCacheAttributeValues() {
return true;
}
@Override
public bool... |
<<<<<<<
private final Accessibility myAccessibility;
public final int CatalogType;
=======
public final int Visibility;
private final CatalogType myCatalogType;
>>>>>>>
private final Accessibility myAccessibility;
private final CatalogType myCatalogType;
<<<<<<<
* Creates new NetworkCatalogItem instance wit... |
<<<<<<<
fbReader.addAction(ActionCode.SPEAK, new SpeakAction(this, fbReader));
=======
fbReader.addAction(ActionCode.CANCEL, new CancelAction(this, fbReader));
}
@Override
protected void onNewIntent(Intent intent) {
if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
final String pattern = intent... |
<<<<<<<
if (networkAccess != null && networkAccess.isCensored(this)) {
ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
=======
if (networkAccess.isCensored(this)) {
ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
>>>>>>>
if (ne... |
<<<<<<<
import org.thoughtcrime.securesms.*;
=======
import com.google.android.material.snackbar.Snackbar;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.BlockedContactsActivity;
import org.thoughtcrime.secures... |
<<<<<<<
=======
import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.database.Database;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.RecipientDatabase;
>>>>>>>
import org.thoughtcrime.securesms.database.Database;
import... |
<<<<<<<
=======
import org.thoughtcrime.securesms.migrations.ProfileMigrationJob;
import org.thoughtcrime.securesms.migrations.RecipientSearchMigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.migrations.ProfileMigrationJob;
<<<<<<<
=======
put(ProfileMigrationJob.KEY, new ProfileMigr... |
<<<<<<<
public static synchronized @NonNull KeyBackupService getKeyBackupService() {
return getSignalServiceAccountManager().getKeyBackupService(IasKeyStore.getIasKeyStore(getApplication()),
BuildConfig.KBS_ENCLAVE_NAME,
... |
<<<<<<<
if (KeyCachingService.isLocked()) {
return;
}
Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()));
=======
Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (S... |
<<<<<<<
private final LiveData<Boolean> canDelete;
=======
private final LiveData<Boolean> canUnblock;
>>>>>>>
private final LiveData<Boolean> canUnblock;
private final LiveData<Boolean> ... |
<<<<<<<
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.crypto.UnrecoverableKeyException;
=======
import org.thoughtcrime.securesms.database.Datab... |
<<<<<<<
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
=======
import java.util.concurrent.Executor;
>>>>>>>
import java.util.concurrent.ExecutorService;
import java.util.concurre... |
<<<<<<<
public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity
=======
public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
implements SharedPreferences.OnSharedPreferenceChangeListener
>>>>>>>
public class ApplicationPreferencesActivity extends Passphra... |
<<<<<<<
=======
import org.thoughtcrime.securesms.migrations.TrimByLengthSettingsMigrationJob;
import org.thoughtcrime.securesms.migrations.UuidMigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.migrations.TrimByLengthSettingsMigrationJob;
<<<<<<<
=======
put(TrimByLengthSettingsMigrationJob.KEY, ... |
<<<<<<<
@Override
public void clearNotifications(@NonNull Context context, boolean clearDelayed)
{
if (clearDelayed) {
cancelDelayedNotifications();
}
cancelActiveNotifications(context);
updateBadge(context, 0);
clearReminder(context);
}
private static void sendSingleThreadNotifica... |
<<<<<<<
import org.thoughtcrime.securesms.R;
=======
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.R;
>>>>>>>
import org.thoughtcrime.securesms.R;
<<<<<<<
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
=======
import org.thoughtcrime.securesms.dependenci... |
<<<<<<<
import org.thoughtcrime.securesms.ApplicationContext;
=======
import org.signal.core.util.logging.Log;
>>>>>>>
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.ApplicationContext; |
<<<<<<<
=======
import org.thoughtcrime.securesms.migrations.UserNotificationMigrationJob;
import org.thoughtcrime.securesms.migrations.UuidMigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.migrations.UserNotificationMigrationJob;
<<<<<<<
=======
put(UserNotificationMigrationJob.KEY, new User... |
<<<<<<<
if (KeyCachingService.isLocked()) {
return;
}
Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()) + ", Original Priority: " + remoteMessage.getOriginalPriority());
=======
Log.i(TAG, String.forma... |
<<<<<<<
=======
private void handleReminderAction(@IdRes int reminderActionId) {
switch (reminderActionId) {
case R.id.reminder_action_invite:
handleInviteLink();
reminderView.get().requestDismiss();
break;
case R.id.reminder_action_view_insights:
InsightsLauncher.sho... |
<<<<<<<
public void onCreateEncryptedPreferences(@Nullable Bundle savedInstanceState, String rootKey) {
=======
public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
>>>>>>>
public void onCreateEncryptedPreferences(@Nullable Bundle savedInstanceState, @Nullable String... |
<<<<<<<
=======
import org.thoughtcrime.securesms.insights.InsightsLauncher;
import org.thoughtcrime.securesms.invites.InviteReminderModel;
import org.thoughtcrime.securesms.invites.InviteReminderRepository;
import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.jobs.Gr... |
<<<<<<<
ApplicationDependencies.provider = provider;
ApplicationDependencies.messageNotifier = provider.provideMessageNotifier();
=======
ApplicationDependencies.application = application;
ApplicationDependencies.provider = provider;
ApplicationDependencies.mess... |
<<<<<<<
=======
import org.thoughtcrime.securesms.jobmanager.impl.NetworkOrCellServiceConstraint;
import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraint;
import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
import org.thoughtcrime.securesms.jobmanager.impl.We... |
<<<<<<<
if ((telcoCursor == null || telcoCursor.isAfterLast()) &&
(pushCursor == null || pushCursor.isAfterLast()))
{
clearNotifications(context, false);
=======
if (telcoCursor == null || telcoCursor.isAfterLast()) {
NotificationCancellationHelper.cancelAllMessageNotificat... |
<<<<<<<
public abstract @NonNull Pair<Long, Long> insertReceivedCall(@NonNull RecipientId address, long expiresIn, boolean isVideoOffer);
public abstract @NonNull Pair<Long, Long> insertOutgoingCall(@NonNull RecipientId address, long expiresIn, boolean isVideoOffer);
public abstract @NonNull Pair<Long, Long> inse... |
<<<<<<<
=======
import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
<<<<<<<
=======
put(KbsEnclaveMigrationJob.KEY, new KbsEnclaveMigr... |
<<<<<<<
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import android.os.CountDownTimer;
=======
import android.text.Editable;
import android.text.InputType;
>>>>>>>
import android.os.CountDownTimer;
<<<<<<<
=======
import androidx.appcompat.wid... |
<<<<<<<
=======
import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.CommunicationActions;
>>>>>>>
import org.thoughtcrime.securesms.util.CommunicationActions;
<<<<<<<
=======
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, St... |
<<<<<<<
=======
import org.thoughtcrime.securesms.jobmanager.migrations.SendReadReceiptsJobMigration;
import org.thoughtcrime.securesms.migrations.Argon2TestMigrationJob;
import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
>>>>>... |
<<<<<<<
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.SecurePreferenceManager;
=======
>>>>>>>
import org.thoughtcrime.securesms.util.SecurePreferenceManager; |
<<<<<<<
=======
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
>>>>>>>
<<<<<<<
=======
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.ApplicationContext;
>>>>>>>
import org.signal.core.util.logging.Log;
<<<<<<<
=======
import org.thoughtcrime.securesms.c... |
<<<<<<<
public void onRun() throws NoSuchMessageException, RetryLaterException {
PushDatabase database = DatabaseFactory.getPushDatabase(context);
SignalServiceEnvelope envelope = database.get(messageId);
JobManager jobManager = ApplicationDependencies.getJobManager();
=======
... |
<<<<<<<
import org.thoughtcrime.securesms.jobmanager.impl.MasterSecretConstraint;
import org.thoughtcrime.securesms.jobmanager.impl.MasterSecretConstraintObserver;
=======
import org.thoughtcrime.securesms.jobmanager.impl.CellServiceConstraintObserver;
import org.thoughtcrime.securesms.jobmanager.impl.ChargingConstra... |
<<<<<<<
=======
initializePlayServicesCheck();
>>>>>>>
initializePlayServicesCheck();
<<<<<<<
=======
RegistrationUtil.markRegistrationPossiblyComplete();
ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
if (Build.VERSION.SDK_INT < 21) {
AppCompatDelegate.setCompatVectorF... |
<<<<<<<
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
=======
>>>>>>>
import android.content.BroadcastReceiver;
<<<<<<<
import android.content.Intent;
import android.content.IntentFilter;
import android.os.AsyncTask;
=======
import android.hardware.SensorManager;
>>>>>>>
impor... |
<<<<<<<
this.findPreference(TextSecurePreferences.REGISTRATION_LOCK_PREF).setOnPreferenceClickListener(new AccountLockClickListener());
this.findPreference(TextSecurePreferences.PASSPHRASE_LOCK).setOnPreferenceChangeListener(new PassphraseLockListener());
this.findPreference(TextSecurePreferences.PASSPHRASE... |
<<<<<<<
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
public class AndroidLogger extends Log.Logger {
=======
import android.annotation.SuppressLint;
@SuppressLint("LogNotSignal")
public final class AndroidLogger extends Log.Logger {
>>>>>>>
import android.annotation.... |
<<<<<<<
private final Context context;
private final MasterSecretConstraint masterSecretConstraint;
private final NetworkConstraint networkConstraint;
private final SignalServiceNetworkAccess networkAccess;
=======
private final Context context;
p... |
<<<<<<<
=======
import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
import org.thoughtcrime.securesms.migrations.BackupNotificationMigrationJob;
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
>>>>>>>
import org.thoughtcrime.securesms.migrations.BackupNotificationMigrationJob... |
<<<<<<<
private GlideRequests glideRequests;
protected ComposeText composeText;
private AnimatingToggle buttonToggle;
private SendButton sendButton;
private ImageButton attachButton;
protected ConversationTitleView titleView;... |
<<<<<<<
this.serviceClients = createServiceConnectionHolders(configuration.getSignalServiceUrls(), configuration.getNetworkInterceptors(), configuration.getSocketFactory(), configuration.getDns());
this.cdnClientsMap = createCdnClientsMap(configuration.getSignalCdnUrlMap(), configuration.... |
<<<<<<<
import org.thoughtcrime.securesms.BuildConfig;
=======
import org.thoughtcrime.securesms.MainActivity;
>>>>>>>
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.MainActivity; |
<<<<<<<
import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
=======
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
import org.thoughtcrime.securesms.jobs.StorageSyncJob;
import org.thoughtcrime.securesms.logging.AndroidLogger;
>>>>>>>
impo... |
<<<<<<<
import androidx.annotation.MainThread;
=======
import androidx.annotation.NonNull;
>>>>>>>
import androidx.annotation.NonNull;
<<<<<<<
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.AsyncTask;
i... |
<<<<<<<
RegistrationLockDialog.showReminderIfNecessary(this);
=======
RatingManager.showRatingDialogIfNecessary(requireContext());
RegistrationLockV1Dialog.showReminderIfNecessary(this);
>>>>>>>
RegistrationLockV1Dialog.showReminderIfNecessary(this); |
<<<<<<<
=======
import org.greenrobot.eventbus.EventBus;
import org.signal.core.util.logging.Log;
>>>>>>>
import org.signal.core.util.logging.Log;
<<<<<<<
import org.thoughtcrime.securesms.preferences.widgets.PassphraseLockTriggerPreference;
import org.thoughtcrime.securesms.profiles.ProfileName;
=======
>>>>>>>... |
<<<<<<<
import java.util.Date;
public class QiscusChatActivity extends RxAppCompatActivity implements QiscusUserStatusPresenter.View,
QiscusChatFragment.UserTypingListener {
private static final String CHAT_ROOM_DATA = "chat_room_data";
=======
public class QiscusChatActivity extends RxAppCompatActivity ... |
<<<<<<<
public void updateLastDeliveredComment(int lastDeliveredCommentId) {
this.lastDeliveredCommentId = lastDeliveredCommentId;
notifyDataSetChanged();
}
public void updateLastReadComment(int lastReadCommentId) {
this.lastReadCommentId = lastReadCommentId;
notifyDataSetC... |
<<<<<<<
if (qiscusComment.getState() == QiscusComment.STATE_ON_QISCUS || qiscusComment.getState() == QiscusComment.STATE_DELIVERED) {
if (qiscusComment.getType() == QiscusComment.Type.FILE || qiscusComment.getType() == QiscusComment.Type.IMAGE) {
=======
if (qiscusComment.getState() == Qis... |
<<<<<<<
protected int lastDeliveredCommentId;
protected int lastReadCommentId;
=======
protected boolean groupChat;
>>>>>>>
protected int lastDeliveredCommentId;
protected int lastReadCommentId;
protected boolean groupChat; |
<<<<<<<
import android.text.format.DateUtils;
import android.view.Menu;
import android.view.MenuItem;
=======
>>>>>>>
import android.text.format.DateUtils;
<<<<<<<
import com.qiscus.sdk.data.model.QiscusComment;
import com.qiscus.sdk.data.model.QiscusRoomMember;
import com.qiscus.sdk.presenter.QiscusUserStatusPrese... |
<<<<<<<
private int cardTitleColor = R.color.qiscus_primary_text;
private int cardDescriptionColor = R.color.qiscus_secondary_text;
/**
* @deprecated please use {@link #sendButtonIcon} instead
*/
@Deprecated
private int sendActiveIcon = R.drawable.ic_qiscus_send_on;
/**
* @depre... |
<<<<<<<
import android.text.format.DateUtils;
=======
import android.view.Menu;
import android.view.MenuItem;
>>>>>>>
import android.text.format.DateUtils;
import android.view.Menu;
import android.view.MenuItem;
<<<<<<<
import com.qiscus.sdk.data.model.QiscusRoomMember;
import com.qiscus.sdk.presenter.QiscusUserSta... |
<<<<<<<
Qiscus.getChatConfig()
.setStatusBarColor(R.color.accent)
.setAppBarColor(R.color.accent)
.setTitleColor(R.color.qiscus_dark_white)
.setLeftBubbleColor(R.color.accent)
.setRightBubbleColor(R.color.primary)
.... |
<<<<<<<
import org.opennars.io.events.Events;
import org.opennars.io.events.EventEmitter;
import java.io.Serializable;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import org.opennars.ma... |
<<<<<<<
Sentence projGoal = task.sentence.projection(concept.memory.time(), Parameters.DURATION);
if(projGoal!=null && projGoal.truth.getExpectation() > nal.narParameters.DECISION_THRESHOLD) {
=======
final Sentence projGoal = task.sentence.projection(concept.memory.time(), Paramet... |
<<<<<<<
private final int mIconId;
=======
private final int mFieldId;
>>>>>>>
private final int mIconId;
private final int mFieldId;
<<<<<<<
public FieldInflater(FieldAdapter<?> adapter, int fieldTitle, int detailsLayout, int editLayout, int iconId)
=======
public FieldInflater(FieldAdapter<?> adapte... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.