Merge branch 'notification-disconnect' of github.com:santa4nt/litecoin-wallet into santa4nt-notification-disconnect

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

Author: hank

integration-android/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-10
 android.library=true

pom.xml

@@ -23,8 +23,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

sample-integration-android/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-10
 android.library.reference.1=../integration-android

wallet/libs/android-support-v4.jar

@@ -34,12 +34,15 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- android.support.v4.* -->
+
+        <!-- android.support.v4.* -->
 		<dependency>
 			<groupId>com.google.android</groupId>
 			<artifactId>support-v4</artifactId>
-			<version>r7</version>
-		</dependency>
+			<version>r13</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/libs/android-support-v4.jar</systemPath>
+        </dependency>
 
 		<!-- com.actionbarsherlock.* -->
 		<dependency>

wallet/pom.xml

@@ -47,6 +47,7 @@ public interface BlockchainService
 	public static final String ACTION_RESET_BLOCKCHAIN = R.class.getPackage().getName() + ".reset_blockchain";
 	public static final String ACTION_BROADCAST_TRANSACTION = R.class.getPackage().getName() + ".broadcast_transaction";
 	public static final String ACTION_BROADCAST_TRANSACTION_HASH = "hash";
+    public static final String ACTION_STOP_SERVICE = "stop_service";
 
 	@CheckForNull
 	List<Peer> getConnectedPeers();

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

@@ -234,7 +234,7 @@ 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());
 	}
 
 	private final class PeerConnectivityListener extends AbstractPeerEventListener implements OnSharedPreferenceChangeListener
@@ -287,25 +287,31 @@ private void changed(final int numPeers)
 				@Override
 				public void run()
 				{
-					final boolean connectivityNotification = prefs.getBoolean(Constants.PREFS_KEY_CONNECTIVITY_NOTIFICATION, false);
-
-					if (!connectivityNotification || numPeers == 0)
-					{
-						nm.cancel(NOTIFICATION_ID_CONNECTED);
-					}
-					else
-					{
-						final NotificationCompat.Builder notification = new NotificationCompat.Builder(BlockchainServiceImpl.this);
-						notification.setSmallIcon(R.drawable.stat_sys_peers, numPeers > 4 ? 4 : numPeers);
-						notification.setContentTitle(getString(R.string.app_name));
-						notification.setContentText(getString(R.string.notification_peers_connected_msg, numPeers));
-						notification.setContentIntent(PendingIntent.getActivity(BlockchainServiceImpl.this, 0, new Intent(BlockchainServiceImpl.this,
-								WalletActivity.class), 0));
-						notification.setWhen(System.currentTimeMillis());
-						notification.setOngoing(true);
-						nm.notify(NOTIFICATION_ID_CONNECTED, notification.getNotification());
-					}
-
+                    if (numPeers == 0)
+                    {
+                        nm.cancel(NOTIFICATION_ID_CONNECTED);
+                    }
+                    else
+                    {
+                        final NotificationCompat.Builder notification = new NotificationCompat.Builder(BlockchainServiceImpl.this)
+                                .setSmallIcon(R.drawable.stat_sys_peers, numPeers > 4 ? 4 : numPeers)
+                                .setContentTitle(getString(R.string.app_name))
+                                .setContentText(getString(R.string.notification_peers_connected_msg, numPeers))
+                                .setContentIntent(PendingIntent.getActivity(BlockchainServiceImpl.this, 0, new Intent(BlockchainServiceImpl.this,
+                                        WalletActivity.class), 0))
+                                .setWhen(System.currentTimeMillis())
+                                .setOngoing(true)
+                                /*
+                                 * These calls are ignored by the support library for
+                                 * pre-4.1 devices.
+                                 */
+                                .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);
 				}
@@ -727,6 +733,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))
+        {
+            log.info("stopping self");
+            // deliberate stop command, so don't schedule restart
+            stopSelf();
+        }
 
 		return START_NOT_STICKY;
 	}