Merge branch 'messy' of github.com:Litecoin-Java/bitcoin-wallet into …

…messy
ToakronaFoundation · Feb 4, 2014 · 4f1d99c · 4f1d99c
2 parents f652642 + 1dd33bb
commit 4f1d99c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 46 deletions.
diff --git a/wallet/src/de/schildbach/wallet/service/AutosyncReceiver.java b/wallet/src/de/schildbach/wallet/service/AutosyncReceiver.java
diff --git a/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java b/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java
@@ -563,6 +563,7 @@ public void onReceive(final Context context, final Intent intent)
 				if (isIdle)
 				{
 					log.info("idling detected, stopping service");
+                    WalletApplication.scheduleStartBlockchainService(BlockchainServiceImpl.this);
 					stopSelf();
 				}
 			}
@@ -708,6 +709,7 @@ else if (BlockchainService.ACTION_RESET_BLOCKCHAIN.equals(action))
 			log.info("will remove blockchain on service shutdown");
 
 			resetBlockchainOnShutdown = true;
+            WalletApplication.scheduleStartBlockchainService(this);
 			stopSelf();
 		}
 		else if (BlockchainService.ACTION_BROADCAST_TRANSACTION.equals(action))
@@ -734,8 +736,6 @@ public void onDestroy()
 	{
 		log.debug(".onDestroy()");
 
-		WalletApplication.scheduleStartBlockchainService(this);
-
 		unregisterReceiver(tickReceiver);
 
 		application.getWallet().removeEventListener(walletEventListener);
@@ -792,6 +792,7 @@ public void onDestroy()
 	public void onLowMemory()
 	{
 		log.warn("low memory detected, stopping service");
+        WalletApplication.scheduleStartBlockchainService(this);
 		stopSelf();
 	}