android: fixed crash

src/org/adblockplus/android/ProxyService.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 294 matching lines @@
     // Clear native proxy
     if (nativeProxy)
     {
       unregisterReceiver(connectionReceiver);
       clearConnectionProxy();
     }
 
     sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", false));
 
     // Stop proxy server
-    proxy.close();
+    if (proxy != null)

[Felix Dahlke, 2012/11/28 08:35:38]

When can the proxy be null here? When an exception occurred in onCreate? Worth a
comment I think.

[Andrey Novikov, 2013/02/22 08:31:32]

Not only on exception. I do not know why but it's commont in Android world when
onClose/onDestroy is called without onOpen/onCreate being called. It's weird but
I often got NullPointerException's in logs before I started to add such checks
in finalizers.

[Felix Dahlke, 2013/02/22 08:35:03]

So onDestroy is sometimes called without onCreate being called first? Not
satisfactory, but not something we should comment here if we need to do it in
every activity...

+      proxy.close();
 
     // Stop engine if not in interactive mode
     AdblockPlus.getApplication().stopEngine(false);
 
     // Release service lock
     stopForeground(true);
 
     Log.i(TAG, "Service stopped");
   }
 
@@ skipping 395 matching lines @@
     @Override
     public void log(int level, Object obj, String message)
     {
       if (level <= logLevel)
       {
         Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
       }
     }
   }
 }