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

Fixed UTF-8 handling, added ability to display status messages

parent c277e047
No related branches found
No related tags found
No related merge requests found
......@@ -11,6 +11,7 @@ import java.util.Map;
import de.kuschku.libquassel.backlogmanagers.BacklogManager;
import de.kuschku.libquassel.backlogmanagers.SimpleBacklogManager;
import de.kuschku.libquassel.events.ConnectionChangeEvent;
import de.kuschku.libquassel.events.StatusMessageEvent;
import de.kuschku.libquassel.functions.types.InitRequestFunction;
import de.kuschku.libquassel.functions.types.RpcCallFunction;
import de.kuschku.libquassel.localtypes.Buffer;
......@@ -64,6 +65,10 @@ public class Client {
backlogManager.displayMessage(message.bufferInfo.id, message);
}
public void displayStatusMsg(String scope, String message) {
busProvider.sendEvent(new StatusMessageEvent(scope, message));
}
public void putNetwork(final Network network) {
networks.put(network.getNetworkId(), network);
......
package de.kuschku.libquassel.events;
public class StatusMessageEvent {
public final String scope;
public final String message;
public StatusMessageEvent(String scope, String message) {
this.scope = scope;
this.message = message;
}
}
......@@ -50,7 +50,7 @@ public class ByteArraySerializer implements PrimitiveSerializer<String> {
// Get rid of the null byte at the end
contentBuffer.limit(len - 1);
}
return Charsets.ISO_8859_1.decode(contentBuffer).toString();
return Charsets.UTF_8.decode(contentBuffer).toString();
}
}
}
......@@ -19,6 +19,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.google.common.collect.Sets;
import com.mikepenz.fastadapter.ICollapsible;
......@@ -42,6 +43,7 @@ import de.kuschku.libquassel.BusProvider;
import de.kuschku.libquassel.IProtocolHandler;
import de.kuschku.libquassel.events.ConnectionChangeEvent;
import de.kuschku.libquassel.events.GeneralErrorEvent;
import de.kuschku.libquassel.events.StatusMessageEvent;
import de.kuschku.libquassel.exceptions.UnknownTypeException;
import de.kuschku.libquassel.functions.types.HandshakeFunction;
import de.kuschku.libquassel.localtypes.Buffer;
......@@ -322,6 +324,10 @@ public class MainActivity extends AppCompatActivity {
}
}
public void onEventMainThread(StatusMessageEvent event) {
Toast.makeText(this, String.format("%s: %s", event.scope, event.message), Toast.LENGTH_LONG).show();
}
public void onEventMainThread(GeneralErrorEvent event) {
if (event.exception != null && !(event.exception instanceof UnknownTypeException)) {
Log.e("libquassel", event.toString());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment