v0.3.1 removing support.v4-r13 to possibly fix some bugs.

integration-android/pom.xml

@@ -6,7 +6,7 @@
 
 	<artifactId>integration-android</artifactId>
 
-	<version>1.0</version>
+	<version>2.0</version>
 	<name>Infinitecoin Integration for Android</name>
 
 

wallet/AndroidManifest.xml

@@ -5,8 +5,8 @@
 
 	package="de.schildbach.wallet.infinitecoin"
 	android:installLocation="internalOnly"
-	android:versionCode="10031"
-	android:versionName="0.3.0" >
+	android:versionCode="10032"
+	android:versionName="0.3.1" >
 
 
 

wallet/CHANGES

@@ -1,5 +1,8 @@
 
 -----------------Infinitecoin Wallet
+v0.3.1
+* remove support.v4-r13 (may be causing some bugs with on pausing activities) - from litecoin wallet
+
 v0.3.0
 * merge up to Bitcoin Wallet 3.38 and digitalcoin 0.1.2
 * remove beta from title.

wallet/pom.xml

@@ -39,7 +39,7 @@
 		<dependency>
 			<groupId>com.google.android</groupId>
 			<artifactId>support-v4</artifactId>
-			<version>r13</version>
+			<version>r7</version>
 		</dependency>
 
 		<!-- com.actionbarsherlock.* -->

wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java

@@ -230,8 +230,8 @@ private void notifyCoinsReceived(@Nullable final Address from, @Nonnull final Bi
 		notification.setNumber(notificationCount == 1 ? 0 : notificationCount);
 		notification.setWhen(System.currentTimeMillis());
 		notification.setSound(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.coins_received));
-		//nm.notify(NOTIFICATION_ID_COINS_RECEIVED, notification.getNotification());
-        nm.notify(NOTIFICATION_ID_COINS_RECEIVED, notification.build());
+		nm.notify(NOTIFICATION_ID_COINS_RECEIVED, notification.getNotification());
+        //nm.notify(NOTIFICATION_ID_COINS_RECEIVED, notification.build());
 	}
 
 	private final class PeerConnectivityListener extends AbstractPeerEventListener implements OnSharedPreferenceChangeListener
@@ -285,7 +285,7 @@ private void changed(final int numPeers)
 				public void run()
 				{
 					final boolean connectivityNotificationEnabled = config.getConnectivityNotificationEnabled();
-                    /*
+
 					if (!connectivityNotificationEnabled || numPeers == 0)
 					{
 						nm.cancel(NOTIFICATION_ID_CONNECTED);
@@ -301,8 +301,8 @@ public void run()
 						notification.setWhen(System.currentTimeMillis());
 						notification.setOngoing(true);
 						nm.notify(NOTIFICATION_ID_CONNECTED, notification.getNotification());
-					}*/
-                    if (!connectivityNotificationEnabled || numPeers == 0)
+					}
+                    /*if (!connectivityNotificationEnabled || numPeers == 0)
                     {
                         nm.cancel(NOTIFICATION_ID_CONNECTED);
                     }
@@ -316,17 +316,14 @@ public void run()
                                                                 WalletActivity.class), 0))
                                                         .setWhen(System.currentTimeMillis())
                                                         .setOngoing(true);
-                                                        /*
-                                  * These calls are ignored by the support library for
-                                  * pre-4.1 devices.
-                                  */
+
                                                         notification.addAction(R.drawable.ic_action_clear,
                                                                 getString(R.string.wallet_options_disconnect),
                                                                 PendingIntent.getService(BlockchainServiceImpl.this, 0,
                                                                         new Intent(BlockchainServiceImpl.this, BlockchainServiceImpl.class)
                                                                                 .setAction(BlockchainService.ACTION_STOP_SERVICE), 0));
                                             nm.notify(NOTIFICATION_ID_CONNECTED, notification.build());
-                    }
+                    }*/
 					// send broadcast
 					sendBroadcastPeerState(numPeers);
 				}
@@ -574,7 +571,7 @@ public void onReceive(final Context context, final Intent intent)
 				if (isIdle)
 				{
 					log.info("idling detected, stopping service");
-                    WalletApplication.scheduleStartBlockchainService(BlockchainServiceImpl.this);  //disconnect feature
+                    //WalletApplication.scheduleStartBlockchainService(BlockchainServiceImpl.this);  //disconnect feature
 					stopSelf();
 				}
 			}
@@ -720,7 +717,7 @@ else if (BlockchainService.ACTION_RESET_BLOCKCHAIN.equals(action))
 			log.info("will remove blockchain on service shutdown");
 
 			resetBlockchainOnShutdown = true;
-            WalletApplication.scheduleStartBlockchainService(this);  //disconnect feature
+            //WalletApplication.scheduleStartBlockchainService(this);  //disconnect feature
 			stopSelf();
 		}
 		else if (BlockchainService.ACTION_BROADCAST_TRANSACTION.equals(action))
@@ -738,12 +735,12 @@ else if (BlockchainService.ACTION_BROADCAST_TRANSACTION.equals(action))
 				log.info("peergroup not available, not broadcasting transaction " + tx.getHashAsString());
 			}
 		}
-        else if (BlockchainService.ACTION_STOP_SERVICE.equals(action))
+        /*else if (BlockchainService.ACTION_STOP_SERVICE.equals(action))
         {
                     log.info("stopping self");
                     // deliberate stop command, so don't schedule restart
                     stopSelf();
-        }
+        }*/
 
 		return START_NOT_STICKY;
 	}
@@ -811,7 +808,7 @@ public void onDestroy()
 	public void onLowMemory()
 	{
 		log.warn("low memory detected, stopping service");
-        WalletApplication.scheduleStartBlockchainService(BlockchainServiceImpl.this);  //disconnect feature
+        //WalletApplication.scheduleStartBlockchainService(BlockchainServiceImpl.this);  //disconnect feature
 		stopSelf();
 	}