Skip to content
Snippets Groups Projects
Commit 97362fe6 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed an issue in the RPCCall invoker from SyncableObject

parent 8f14327e
Branches
Tags
No related merge requests found
......@@ -32,7 +32,7 @@ public class RpcCallFunction {
@NonNull
public final List<Object> params;
public RpcCallFunction(@NonNull String functionName, @NonNull List<Object> params) {
public RpcCallFunction(@NonNull String functionName, @NonNull List params) {
this.functionName = functionName;
this.params = params;
}
......
......@@ -92,7 +92,8 @@ public abstract class SyncableObject<T extends SyncableObject<T>> extends Observ
public void rpc(@NonNull String procedureName, @NonNull List<QVariant> params) {
assertNotNull(provider);
provider.dispatch(new RpcCallFunction(procedureName, params));
RpcCallFunction function = new RpcCallFunction(procedureName, params);
provider.dispatch(function);
}
public void rpc(@NonNull String procedureName, @NonNull Object[] params) {
......
......@@ -22,6 +22,7 @@
package de.kuschku.libquassel.syncables.types.impl;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
......@@ -157,11 +158,16 @@ public class IgnoreListManager extends AIgnoreListManager<IgnoreListManager> {
private final SmartRegEx[] scopeRules;
private boolean isActive;
public IgnoreListItem(int type, @NonNull String ignoreRule, boolean isRegEx, int strictness, int scope, @NonNull String scopeRule, boolean isActive) {
public IgnoreListItem(int type, @Nullable String ignoreRule, boolean isRegEx, int strictness, int scope, @Nullable String scopeRule, boolean isActive) {
this(IgnoreType.of(type), ignoreRule, isRegEx, StrictnessType.of(strictness), ScopeType.of(scope), scopeRule, isActive);
}
public IgnoreListItem(IgnoreType type, @NonNull String ignoreRule, boolean isRegEx, StrictnessType strictness, ScopeType scope, @NonNull String scopeRule, boolean isActive) {
public IgnoreListItem(IgnoreType type, @Nullable String ignoreRule, boolean isRegEx, StrictnessType strictness, ScopeType scope, @Nullable String scopeRule, boolean isActive) {
if (scopeRule == null)
scopeRule = "";
if (ignoreRule == null)
ignoreRule = "";
this.type = type;
this.ignoreRule = new SmartRegEx(ignoreRule, Pattern.CASE_INSENSITIVE, SmartRegEx.Syntax.WILDCARD);
this.isRegEx = isRegEx;
......
......@@ -615,6 +615,8 @@ public class ChatActivity extends AppCompatActivity {
String text = editor.toFormatString();
context.client().sendInput(buffer.getInfo(), text);
chatline.setText("");
} else {
Snackbar.make(messages, "No buffer opened", Snackbar.LENGTH_LONG).show();
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment