Clean up sendMessage calls

[fonbot.git] / src / ro / ieval / fonbot / FonBotAdminReceiver.java

diff --git a/src/ro/ieval/fonbot/FonBotAdminReceiver.java b/src/ro/ieval/fonbot/FonBotAdminReceiver.java
index 108b1dab9f4e8ecf73a3e87d0b50c1e46232420e..9f54239e54780684dd99fc14e259b7c5e68a2696 100644 (file)
--- a/src/ro/ieval/fonbot/FonBotAdminReceiver.java
+++ b/src/ro/ieval/fonbot/FonBotAdminReceiver.java
@@ -42,7 +42,7 @@ public final class FonBotAdminReceiver extends DeviceAdminReceiver {
        public void onDisabled(@Nullable final Context context, @Nullable final Intent intent) {
                if(context==null)
                        return;
-               Utils.sendMessage(context, toNonNull(MessageType.ADMIN), "Admin disabled");
+               Utils.sendMessage(context, toNonNull(MessageType.ADMIN), admin_disabled);
        }
 
        @Override
@@ -51,8 +51,7 @@ public final class FonBotAdminReceiver extends DeviceAdminReceiver {
                        Log.wtf(getClass().getName(), "context is null in onDisableRequested");
                        throw new AssertionError("Log.wtf did not terminate the process");
                }
-               Utils.sendMessage(context, toNonNull(MessageType.ADMIN),
-                               toNonNull(context.getString(admin_disable_requested)));
+               Utils.sendMessage(context, toNonNull(MessageType.ADMIN), admin_disable_requested);
                return null;//TODO: write this
        }
 
@@ -60,16 +59,14 @@ public final class FonBotAdminReceiver extends DeviceAdminReceiver {
        public void onEnabled(@Nullable final Context context, @Nullable final Intent intent) {
                if(context==null)
                        return;
-               Utils.sendMessage(context, toNonNull(MessageType.ADMIN),
-                               toNonNull(context.getString(admin_enabled)));
+               Utils.sendMessage(context, toNonNull(MessageType.ADMIN), admin_enabled);
        }
 
        @Override
        public void onPasswordChanged(@Nullable final Context context, @Nullable final Intent intent) {
                if(context==null)
                        return;
-               Utils.sendMessage(context, toNonNull(MessageType.ADMIN),
-                               toNonNull(context.getString(device_password_changed)));
+               Utils.sendMessage(context, toNonNull(MessageType.ADMIN), device_password_changed);
        }
 
        @SuppressWarnings("boxing")
@@ -78,14 +75,13 @@ public final class FonBotAdminReceiver extends DeviceAdminReceiver {
                if(context==null)
                        return;
                final DevicePolicyManager dpm=(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
-               Utils.sendMessage(context, toNonNull(MessageType.WATCH_LOGIN),
-                               toNonNull(context.getString(device_login_failed_fmt, dpm.getCurrentFailedPasswordAttempts())));
+               Utils.sendMessage(context, toNonNull(MessageType.WATCH_LOGIN), device_login_failed_fmt, dpm.getCurrentFailedPasswordAttempts());
        }
 
        @Override
        public void onPasswordSucceeded(@Nullable final Context context, @Nullable final Intent intent) {
                if(context==null)
                        return;
-               Utils.sendMessage(context, toNonNull(MessageType.WATCH_LOGIN), toNonNull(context.getString(device_login_succeeded)));
+               Utils.sendMessage(context, toNonNull(MessageType.WATCH_LOGIN), device_login_succeeded);
        }
 }