Remove the global FonBotApplication instance.

diff --git a/src/ro/ieval/fonbot/FonBotAdminReceiver.java b/src/ro/ieval/fonbot/FonBotAdminReceiver.java
index ca1102cb7f9987b8cfec382bdec8d64053c97e80..108b1dab9f4e8ecf73a3e87d0b50c1e46232420e 100644 (file)
--- a/src/ro/ieval/fonbot/FonBotAdminReceiver.java
+++ b/src/ro/ieval/fonbot/FonBotAdminReceiver.java
@@ -77,7 +77,7 @@ public final class FonBotAdminReceiver extends DeviceAdminReceiver {
        public void onPasswordFailed(@Nullable final Context context, @Nullable final Intent intent) {
                if(context==null)
                        return;
-               final DevicePolicyManager dpm=(DevicePolicyManager) FonBotApplication.instance.getSystemService(Context.DEVICE_POLICY_SERVICE);
+               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())));
        }

diff --git a/src/ro/ieval/fonbot/FonBotApplication.java b/src/ro/ieval/fonbot/FonBotApplication.java
index 38b5b40ac7ca30ab0c70a1f4230e134d476d9cf0..be774ce6b15d8367801c850f0a514184efc3044f 100644 (file)
--- a/src/ro/ieval/fonbot/FonBotApplication.java
+++ b/src/ro/ieval/fonbot/FonBotApplication.java
@@ -36,26 +36,17 @@ public final class FonBotApplication extends Application {
         * iEval GCM sender id
         */
        public static final String GCM_SENDER_ID = "379674287523";
-       /**
-        * The one instance of FonBotApplication
-        */
-       public static FonBotApplication instance=null;
-       /**
-        * The GCM registration ID
-        */
-       public String regID=null;
 
        @Override
        public void onCreate() {
                super.onCreate();
                //GCMRegistrar.checkDevice(this);
-               regID=GCMRegistrar.getRegistrationId(this);
+               final String regID=GCMRegistrar.getRegistrationId(this);
                if("".equals(regID))
                        GCMRegistrar.register(this, GCM_SENDER_ID);
 
                final TelephonyManager tman=(TelephonyManager) getSystemService(TELEPHONY_SERVICE);
                tman.listen(new FonBotPhoneStateListener(this), PhoneStateListener.LISTEN_CALL_STATE);
-               instance=this;
 
                new PollServerAsyncTask(this).execute();
 

diff --git a/src/ro/ieval/fonbot/GCMIntentService.java b/src/ro/ieval/fonbot/GCMIntentService.java
index aea7202da4d1c23966685df588e3a193141404f2..bf17e5ffa83076f3ebd346bc56884cf48bbfdce8 100644 (file)
--- a/src/ro/ieval/fonbot/GCMIntentService.java
+++ b/src/ro/ieval/fonbot/GCMIntentService.java
@@ -64,7 +64,7 @@ public class GCMIntentService extends GCMBaseIntentService {
 
        @Override
        protected void onRegistered(@Nullable final Context context, @Nullable final String regID) {
-               FonBotApplication.instance.regID=regID;
+               //do nothing
        }
 
        @Override

diff --git a/src/ro/ieval/fonbot/PollServerAsyncTask.java b/src/ro/ieval/fonbot/PollServerAsyncTask.java
index 15bf9cc093e6a0932b1bb568d38b2a2c25d074b0..1be09c36a1730857fc4c1749daf2127090ae5f51 100644 (file)
--- a/src/ro/ieval/fonbot/PollServerAsyncTask.java
+++ b/src/ro/ieval/fonbot/PollServerAsyncTask.java
@@ -21,6 +21,8 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
+import com.google.android.gcm.GCMRegistrar;
+
 /*
  * Copyright © 2013 Marius Gavrilescu
  * 
@@ -98,7 +100,7 @@ public final class PollServerAsyncTask extends AsyncTask<Void, Void, List<PollSe
                try {
                        final URL url=Utils.getServerURL(toNonNull(context),"/get");
                        final HttpURLConnection conn=(HttpURLConnection) url.openConnection();
-                       conn.setRequestProperty("X-ID", FonBotApplication.instance.regID);
+                       conn.setRequestProperty("X-ID", GCMRegistrar.getRegistrationId(context));
                        final String user=PreferenceManager.getDefaultSharedPreferences(context).getString("username", null);
                        final String password=PreferenceManager.getDefaultSharedPreferences(context).getString("password", null);
                        if(user == null || password == null)
@@ -146,7 +148,7 @@ public final class PollServerAsyncTask extends AsyncTask<Void, Void, List<PollSe
                        Log.d(getClass().getName(), "Poll got command "+command.command+" with "+((command.args.length==0)?"no args":"args "+Utils.join(
                                        " ",toNonNull(command.args))));
                        Utils.processCommand(
-                                       toNonNull(FonBotApplication.instance),
+                                       toNonNull(context),
                                        toNonNull(command.command),
                                        toNonNull(command.args),
                                        new Address(toNonNull(Protocol.HTTP), command.replyto));//NOPMD address depends on command

diff --git a/src/ro/ieval/fonbot/SendHttpMessageAsyncTask.java b/src/ro/ieval/fonbot/SendHttpMessageAsyncTask.java
index c05dd05d1d8b58dcf4e6aeb284a357d8158c072f..68f7319251be5fbe4d4ab98a332a56a8cbb42be5 100644 (file)
--- a/src/ro/ieval/fonbot/SendHttpMessageAsyncTask.java
+++ b/src/ro/ieval/fonbot/SendHttpMessageAsyncTask.java
@@ -17,6 +17,8 @@ import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 
+import com.google.android.gcm.GCMRegistrar;
+
 /*
  * Copyright © 2013 Marius Gavrilescu
  * 
@@ -146,7 +148,7 @@ public final class SendHttpMessageAsyncTask extends AsyncTask<String, Void, Stri
                                conn.setDoOutput(true);
                                conn.setFixedLengthStreamingMode(msg.length);
                        }
-                       conn.setRequestProperty("X-ID", FonBotApplication.instance.regID);
+                       conn.setRequestProperty("X-ID", GCMRegistrar.getRegistrationId(context));
                        final String user=PreferenceManager.getDefaultSharedPreferences(context).getString("username", null);
                        final String password=PreferenceManager.getDefaultSharedPreferences(context).getString("password", null);
                        if(user == null || password == null)