Improved popup messages

res/layout/toast.xml

@@ -3,20 +3,15 @@
 	android:id="@+id/toastRoot"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:background="@drawable/zrtp_popup"
+	android:background="@drawable/popup"
 	android:orientation="vertical" >
 	
 	<TextView
-		android:id="@+id/toastTitle"
+		android:id="@+id/toastMessage"
+		android:textColor="@android:color/white"
+		android:padding="5dp"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge" />
+	    android:textAppearance="?android:attr/textAppearanceMedium" />
-	
-	<TextView
-		android:id="@+id/toastMessage"
-		android:textColor="@android:color/black"
-		android:layout_marginTop="5dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
 
 </LinearLayout>

src/org/linphone/IncomingCallActivity.java

@@ -132,12 +132,18 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 			// the above method takes care of Samsung Galaxy S
 			Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG).show();
 		} else {
-			if (mCall.getCurrentParamsCopy().getVideoEnabled())
+			if (!LinphoneActivity.isInstanciated()) {
+				return;
+			}
+			
+			if (mCall.getCurrentParamsCopy().getVideoEnabled()) {
 				LinphoneActivity.instance().startVideoActivity(mCall);
-			else
+			}
+			else {
 				LinphoneActivity.instance().startIncallActivity(mCall);
 			}
 		}
+	}
 
 	@Override
 	public void onLeftHandleTriggered() {

src/org/linphone/LinphoneActivity.java

@@ -691,7 +691,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	@Override
 	public void onCallStateChanged(LinphoneCall call, State state, String message) {
 		if (state == State.Error) {
-			displayCustomToast(null, message, Toast.LENGTH_LONG);
+			displayCustomToast(message, Toast.LENGTH_LONG);
 		}
 		
 		if (state == State.IncomingReceived) {
@@ -710,20 +710,13 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		displayMissedCalls(missedCalls);
 	}
 	
-	private void displayCustomToast(final String title, final String message, final int duration) {
+	private void displayCustomToast(final String message, final int duration) {
 		mHandler.post(new Runnable() {
 			@Override
 			public void run() {
 				LayoutInflater inflater = getLayoutInflater();
 				View layout = inflater.inflate(R.layout.toast, (ViewGroup) findViewById(R.id.toastRoot));
 
-				TextView toastTitle = (TextView) layout.findViewById(R.id.toastTitle);
-				if (title == null) {
-					toastTitle.setVisibility(View.GONE);
-				} else {
-					toastTitle.setText(title);
-				}
-				
 				TextView toastText = (TextView) layout.findViewById(R.id.toastMessage);
 				toastText.setText(message);