From 24e6b39dc0366547311481adc2780517c2225d57 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 16 Feb 2015 22:27:44 +0100
Subject: [PATCH] Stop using Intent.setClassName()

Use the type-safe Intent constructor to reference internal classes.
---
 .../src/main/java/com/fsck/k9/service/MailService.java   | 9 +++------
 .../java/com/fsck/k9/service/RemoteControlService.java   | 6 ++----
 .../src/main/java/com/fsck/k9/service/SleepService.java  | 3 +--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/k9mail/src/main/java/com/fsck/k9/service/MailService.java b/k9mail/src/main/java/com/fsck/k9/service/MailService.java
index 6a1fde5b0..601dbd5b9 100644
--- a/k9mail/src/main/java/com/fsck/k9/service/MailService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/MailService.java
@@ -163,8 +163,7 @@ public class MailService extends CoreService {
     }
 
     private void cancel() {
-        Intent i = new Intent();
-        i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
+        Intent i = new Intent(this, MailService.class);
         i.setAction(ACTION_CHECK_MAIL);
         BootReceiver.cancelIntent(this, i);
     }
@@ -304,8 +303,7 @@ public class MailService extends CoreService {
                 Log.e(K9.LOG_TAG, "Exception while logging", e);
             }
 
-            Intent i = new Intent();
-            i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
+            Intent i = new Intent(this, MailService.class);
             i.setAction(ACTION_CHECK_MAIL);
             BootReceiver.scheduleIntent(MailService.this, nextTime, i);
         }
@@ -410,8 +408,7 @@ public class MailService extends CoreService {
             long nextTime = System.currentTimeMillis() + minInterval;
             if (K9.DEBUG)
                 Log.d(K9.LOG_TAG, "Next pusher refresh scheduled for " + new Date(nextTime));
-            Intent i = new Intent();
-            i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
+            Intent i = new Intent(this, MailService.class);
             i.setAction(ACTION_REFRESH_PUSHERS);
             BootReceiver.scheduleIntent(MailService.this, nextTime, i);
         }
diff --git a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java
index e942f4d23..4db3597dc 100644
--- a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java
@@ -134,15 +134,13 @@ public class RemoteControlService extends CoreService {
                         editor.commit();
 
                         if (needsReschedule) {
-                            Intent i = new Intent();
-                            i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.RemoteControlService");
+                            Intent i = new Intent(RemoteControlService.this, RemoteControlService.class);
                             i.setAction(RESCHEDULE_ACTION);
                             long nextTime = System.currentTimeMillis() + 10000;
                             BootReceiver.scheduleIntent(RemoteControlService.this, nextTime, i);
                         }
                         if (needsPushRestart) {
-                            Intent i = new Intent();
-                            i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.RemoteControlService");
+                            Intent i = new Intent(RemoteControlService.this, RemoteControlService.class);
                             i.setAction(PUSH_RESTART_ACTION);
                             long nextTime = System.currentTimeMillis() + 10000;
                             BootReceiver.scheduleIntent(RemoteControlService.this, nextTime, i);
diff --git a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java
index 937f97dc3..ba0b8436e 100644
--- a/k9mail/src/main/java/com/fsck/k9/service/SleepService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java
@@ -31,8 +31,7 @@ public class SleepService extends CoreService {
         sleepDatum.reacquireLatch = new CountDownLatch(1);
         sleepData.put(id, sleepDatum);
 
-        Intent i = new Intent();
-        i.setClassName(context.getPackageName(), "com.fsck.k9.service.SleepService");
+        Intent i = new Intent(context, SleepService.class);
         i.putExtra(LATCH_ID, id);
         i.setAction(ALARM_FIRED + "." + id);
         long startTime = System.currentTimeMillis();