Fixes #98: When a wrong user name is used in Messenger settings we enter an endless loop of failed registrations. Fixes #93: Update Hello World sample App so that it properly uses webrtc

Author: atsakiridis

Examples/restcomm-helloworld/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/icon_144x144"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity

Examples/restcomm-helloworld/app/src/main/java/com/telestax/restcomm_helloworld/MainActivity.java

@@ -58,7 +58,8 @@ public void onError(Exception exception)
         // TODO: we don't support capability tokens yet so let's use an empty string
         device = RCClient.createDevice("", this);
         Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-        device.setIncomingIntent(intent);
+        // we don't have a separate activity for the calls, so use the same intent both for calls and messages
+        device.setPendingIntents(intent, intent);
 
         connection = null;
 

Examples/restcomm-helloworld/app/src/main/jniLibs/armeabi-v7a/.gitignore

@@ -0,0 +1 @@
+*.so

Examples/restcomm-helloworld/app/src/main/jniLibs/armeabi-v7a/.keep

@@ -9,7 +9,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 22
         versionCode 1
-        versionName "1.2.2"
+        versionName "1.2.3"
     }
     buildTypes {
         release {

Examples/restcomm-helloworld/app/src/main/res/drawable/icon_144x144.png

@@ -53,6 +53,7 @@
 import android.javax.sip.address.Address;
 import android.javax.sip.address.AddressFactory;
 import android.javax.sip.header.CSeqHeader;
+import android.javax.sip.header.CallIdHeader;
 import android.javax.sip.header.ContactHeader;
 import android.javax.sip.header.ContentTypeHeader;
 import android.javax.sip.header.HeaderFactory;
@@ -91,6 +92,8 @@ enum CallDirection {
     private HashMap<String,String> customHeaders;
 	private ClientTransaction currentClientTransaction = null;
 	private ServerTransaction currentServerTransaction;
+	private static final int MAX_REGISTER_ATTEMPTS = 3;
+	HashMap<String, Integer> registerAuthenticationMap = new HashMap<>();
 	public int ackCount = 0;
 	DigestServerAuthenticationHelper dsam;
 	// Is it an outgoing call or incoming call. We're using this so that when we hit
@@ -501,10 +504,21 @@ public void processResponse(ResponseEvent arg0) {
 									sipProfile.getRemoteIp(), sipProfile
 									.getSipPassword()), headerFactory);
 			try {
-				ClientTransaction inviteTid = authenticationHelper
-						.handleChallenge(response, tid, sipProvider, 5, true);
-				currentClientTransaction = inviteTid;
-				inviteTid.sendRequest();
+				CallIdHeader callId = (CallIdHeader)response.getHeader("Call-ID");  //responseDialog.getCallId();
+				int attempts = 0;
+				if (registerAuthenticationMap.containsKey(callId.toString())) {
+					attempts = registerAuthenticationMap.get(callId.toString()).intValue();
+				}
+
+				// we 're subtracting one since the first attempt has already taken place
+				// (that way we are enforcing MAX_REGISTER_ATTEMPTS at most)
+				if (attempts < MAX_REGISTER_ATTEMPTS - 1) {
+					ClientTransaction inviteTid = authenticationHelper
+							.handleChallenge(response, tid, sipProvider, 5, true);
+					currentClientTransaction = inviteTid;
+					inviteTid.sendRequest();
+					registerAuthenticationMap.put(callId.toString(), attempts + 1);
+				}
 			} catch (NullPointerException e) {
 				e.printStackTrace();
 			} catch (SipException e) {
@@ -544,7 +558,12 @@ public void processResponse(ResponseEvent arg0) {
 					e.printStackTrace();
 				}
 
-			} else if (cseq.getMethod().equals(Request.CANCEL)) {
+			}
+			else if (cseq.getMethod().equals(Request.REGISTER)) {
+				// we got 200 OK to register request, clear the map
+				registerAuthenticationMap.clear();
+			}
+			else if (cseq.getMethod().equals(Request.CANCEL)) {
 				if (dialog.getState() == DialogState.CONFIRMED) {
 					// oops cancel went in too late. Need to hang up the
 					// dialog.