From 1ecc31e477ebfeeed9b53a439154048f77a047a7 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Mon, 8 Feb 2016 15:45:26 +0100 Subject: [PATCH] Removed unnecessary account handling code for now --- .../libquassel/syncables/types/impl/Identity.java | 4 ++-- .../java/de/kuschku/util/CompatibilityUtils.java | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Identity.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Identity.java index b7a81f271..27c067aef 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Identity.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Identity.java @@ -81,12 +81,12 @@ public class Identity extends AIdentity<Identity> { } private String defaultNick() { - return CompatibilityUtils.accountNick("quassel").replaceAll("(^[\\d-]+|[^A-Za-z0-9\\x5b-\\x60\\x7b-\\x7d])", ""); + return "quassel"; } private String defaultRealName() { - return CompatibilityUtils.accountNick("Quassel IRC User"); + return "Quassel IRC User"; } @Override diff --git a/app/src/main/java/de/kuschku/util/CompatibilityUtils.java b/app/src/main/java/de/kuschku/util/CompatibilityUtils.java index ec83d84b1..5ec83b0e7 100644 --- a/app/src/main/java/de/kuschku/util/CompatibilityUtils.java +++ b/app/src/main/java/de/kuschku/util/CompatibilityUtils.java @@ -94,19 +94,6 @@ public class CompatibilityUtils { return def; } - public static String accountNick(String defaultValue) { - Pattern emailPattern = Patterns.EMAIL_ADDRESS; - AccountManager accountManager = AccountManager.get(QuasselDroidNG.context()); - Account[] accounts = accountManager.getAccounts(); - for (Account account : accounts) { - if (emailPattern.matcher(account.name).matches()) { - String possibleEmail = account.name; - Log.e("DEBUG", account.name + ":" + account.type); - } - } - return defaultValue; - } - /** * Because Android’s String::split is broken * @param str The string to be broken into chars -- GitLab