aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-11 02:52:41 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-11 02:52:41 +0100
commite441005c8768091e9e975f3d5f797fab8466861b (patch)
treec75a7bcc5f05604f2b0b10ea7cedf0d215277fa8 /src/eu/siacs
parent05694b4c06ff859dec2a3ea58c2dec159186ab30 (diff)
cleanup
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/ui/ContactDetailsActivity.java4
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
index e64339f72..46e5ab327 100644
--- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -2,7 +2,7 @@ package eu.siacs.conversations.ui;
import java.math.BigInteger;
import java.util.Iterator;
-import java.util.zip.Inflater;
+import java.util.Locale;
import android.app.AlertDialog;
import android.content.Context;
@@ -244,7 +244,7 @@ public class ContactDetailsActivity extends XmppActivity {
keyType.setText("PGP Key ID");
BigInteger bi = new BigInteger("" + contact.getPgpKeyId());
StringBuilder builder = new StringBuilder(bi.toString(16)
- .toUpperCase());
+ .toUpperCase(Locale.US));
builder.insert(8, " ");
key.setText(builder.toString());
keys.addView(view);
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 4b056dbb6..86ba49b90 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -15,7 +15,6 @@ import android.net.Uri;
import android.os.Bundle;
import android.app.AlertDialog;
import android.app.FragmentTransaction;
-import android.app.NotificationManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;