1.1.1 beta

More bugfixes

git-svn-id: http://sipdroid.googlecode.com/svn/trunk@326 8b64e154-0f13-11de-9106-f38757f67524

Author: pmerle71

src/org/sipdroid/media/RtpStreamReceiver.java

@@ -62,6 +62,7 @@ public class RtpStreamReceiver extends Thread {
 	/** Whether it is running */
 	boolean running;
 	AudioManager am;
+	ContentResolver cr;
 	public static int speakermode;
 
 	/**
@@ -142,6 +143,35 @@ void saveVolume() {
 		edit.commit();
 	}
 
+	void saveSettings() {
+		if (!PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getBoolean("oldvalid",false)) {
+			int oldvibrate = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);
+			int oldvibrate2 = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION);
+			if (!PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).contains("oldvibrate2"))
+				oldvibrate2 = AudioManager.VIBRATE_SETTING_ON;
+			int oldpolicy = android.provider.Settings.System.getInt(cr, android.provider.Settings.System.WIFI_SLEEP_POLICY, 
+					Settings.System.WIFI_SLEEP_POLICY_DEFAULT);
+			Editor edit = PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).edit();
+			edit.putInt("oldvibrate", oldvibrate);
+			edit.putInt("oldvibrate2", oldvibrate2);
+			edit.putInt("oldpolicy", oldpolicy);
+			edit.putBoolean("oldvalid", true);
+			edit.commit();
+		}
+	}
+	
+	void restoreSettings() {
+		int oldvibrate = PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getInt("oldvibrate",0);
+		int oldvibrate2 = PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getInt("oldvibrate2",0);
+		int oldpolicy = PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getInt("oldpolicy",0);
+		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,oldvibrate);
+		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,oldvibrate2);
+		Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY, oldpolicy);
+		Editor edit = PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).edit();
+		edit.putBoolean("oldvalid", false);
+		edit.commit();
+	}
+
 	public static float good, late, lost, loss;
 
 	/** Runs it in a new Thread. */
@@ -163,29 +193,24 @@ public void run() {
 
 		android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
 		am = (AudioManager) Receiver.mContext.getSystemService(Context.AUDIO_SERVICE);
-		int oldvibrate = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);
-		int oldvibrate2 = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION);
-		int oldvol = am.getStreamVolume(AudioManager.STREAM_MUSIC);
-        ContentResolver cr = Receiver.mContext.getContentResolver();
-		int oldpolicy = android.provider.Settings.System.getInt(cr, android.provider.Settings.System.WIFI_SLEEP_POLICY, 
-				Settings.System.WIFI_SLEEP_POLICY_DEFAULT);
-		if (oldpolicy != Settings.System.WIFI_SLEEP_POLICY_NEVER)
-			Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY,
-				Settings.System.WIFI_SLEEP_POLICY_NEVER);
-		restoreVolume();
+        cr = Receiver.mContext.getContentResolver();
+		saveSettings();
+		Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY,Settings.System.WIFI_SLEEP_POLICY_NEVER);
 		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,AudioManager.VIBRATE_SETTING_OFF);
 		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,AudioManager.VIBRATE_SETTING_OFF);
+		int oldvol = am.getStreamVolume(AudioManager.STREAM_MUSIC);
+		restoreVolume();
 		AudioTrack track = new AudioTrack(AudioManager.STREAM_MUSIC, 8000, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT,
 				BUFFER_SIZE*2*2, AudioTrack.MODE_STREAM);
 		track.setStereoVolume(AudioTrack.getMaxVolume()*
-				Float.valueOf(PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getString("eargain", "0.25"))
+				org.sipdroid.sipua.ui.Settings.getEarGain()
 				,AudioTrack.getMaxVolume()*
-				Float.valueOf(PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getString("eargain", "0.25")));
+				org.sipdroid.sipua.ui.Settings.getEarGain());
 		track.play();
 		short lin[] = new short[BUFFER_SIZE];
 		short lin2[] = new short[BUFFER_SIZE];
 		int user, server, lserver, luser, cnt, todo, headroom, len, timeout = 1, seq = 0, cnt2 = 0, m = 1,
-			expseq, getseq, vm = 1;
+			expseq, getseq, vm = 1, gap;
 		boolean islate;
 		user = 0;
 		lserver = 0;
@@ -281,15 +306,12 @@ public void run() {
 					 getseq = rtp_packet.getSequenceNumber()&0xff;
 					 expseq = ++seq&0xff;
 					 if (m == RtpStreamSender.m) vm = m;
-					 if (getseq != expseq) {
-						 if (expseq > getseq) {
-							 loss += expseq - getseq;
-							 lost += expseq - getseq;
-							 good += expseq - getseq - 1;
-						 } else {
-							 loss++;
-							 lost++;
-						 }
+					 gap = (getseq - expseq) & 0xff;
+					 if (gap > 0) {
+						 if (gap > 100) gap = 1;
+						 loss += gap;
+						 lost += gap;
+						 good += gap - 1;
 					 } else {
 						 if (m < vm)
 							 loss++;
@@ -313,9 +335,9 @@ public void run() {
 						 switch (speakermode) {
 						 case AudioManager.MODE_IN_CALL:
 								track.setStereoVolume(AudioTrack.getMaxVolume()*
-										Float.valueOf(PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getString("eargain", "0.25"))
+										org.sipdroid.sipua.ui.Settings.getEarGain()
 										,AudioTrack.getMaxVolume()*
-										Float.valueOf(PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getString("eargain", "0.25")));
+										org.sipdroid.sipua.ui.Settings.getEarGain());
 								break;
 						 case AudioManager.MODE_NORMAL:
 								track.setStereoVolume(AudioTrack.getMaxVolume(),AudioTrack.getMaxVolume());
@@ -330,12 +352,9 @@ public void run() {
 		track.stop();
 		if (Receiver.pstn_state == null || Receiver.pstn_state.equals("IDLE"))
 			am.setMode(AudioManager.MODE_NORMAL);
-		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,oldvibrate);
-		am.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,oldvibrate2);
 		saveVolume();
 		am.setStreamVolume(AudioManager.STREAM_MUSIC,oldvol,0);
-		if (oldpolicy != Settings.System.WIFI_SLEEP_POLICY_NEVER)
-			Settings.System.putInt(cr, Settings.System.WIFI_SLEEP_POLICY, oldpolicy);
+		restoreSettings();
 		ToneGenerator tg = new ToneGenerator(AudioManager.STREAM_RING,ToneGenerator.MAX_VOLUME/4*3);
 		tg.startTone(ToneGenerator.TONE_PROP_PROMPT);
 		try {

src/org/sipdroid/sipua/ui/InCallScreen.java

@@ -42,6 +42,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.media.AudioManager;
+import android.media.ToneGenerator;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -103,6 +104,7 @@ public void onPause() {
     	case UserAgent.UA_STATE_IDLE:
     		if (Receiver.ccCall != null)
     			mCallCard.displayMainCallStatus(ccPhone,Receiver.ccCall);
+			mHandler.sendEmptyMessageDelayed(MSG_BACK, 2000);
     		break;
     	}
 		if (socket != null) {
@@ -199,9 +201,7 @@ public void run() {
 		    screenOff(true);
 			break;
 		case UserAgent.UA_STATE_IDLE:
-			if (Receiver.ccConn != null && Receiver.ccConn.date != 0)
-				mHandler.sendEmptyMessageDelayed(MSG_BACK, 2000);
-			else
+			if (!mHandler.hasMessages(MSG_BACK))
 				moveBack();
 			break;
 		}
@@ -216,15 +216,21 @@ public void run() {
 	        (t = new Thread() {
 				public void run() {
 					int len = 0;
-
+					ToneGenerator tg = null;
+					
 					running = true;
+					if (Settings.System.getInt(getContentResolver(),
+							Settings.System.DTMF_TONE_WHEN_DIALING, 1) == 1)
+						tg = new ToneGenerator(AudioManager.STREAM_MUSIC, (int)(ToneGenerator.MAX_VOLUME*org.sipdroid.sipua.ui.Settings.getEarGain()));
 					for (;;) {
 						if (!running) {
 							t = null;
 							break;
 						}
 						if (len != mDigits.getText().length()) {
+							if (tg != null) tg.startTone(mToneMap.get(mDigits.getText().charAt(len)));
 							Receiver.engine(Receiver.mContext).info(mDigits.getText().charAt(len++));
+							if (tg != null) tg.stopTone();
 							continue;
 						}
 						mHandler.sendEmptyMessage(MSG_TICK);
@@ -317,6 +323,19 @@ public void initInCallScreen() {
         mDisplayMap.put(R.id.zero, '0');
         mDisplayMap.put(R.id.pound, '#');
         mDisplayMap.put(R.id.star, '*');
+        
+        mToneMap.put('1', ToneGenerator.TONE_DTMF_1);
+        mToneMap.put('2', ToneGenerator.TONE_DTMF_2);
+        mToneMap.put('3', ToneGenerator.TONE_DTMF_3);
+        mToneMap.put('4', ToneGenerator.TONE_DTMF_4);
+        mToneMap.put('5', ToneGenerator.TONE_DTMF_5);
+        mToneMap.put('6', ToneGenerator.TONE_DTMF_6);
+        mToneMap.put('7', ToneGenerator.TONE_DTMF_7);
+        mToneMap.put('8', ToneGenerator.TONE_DTMF_8);
+        mToneMap.put('9', ToneGenerator.TONE_DTMF_9);
+        mToneMap.put('0', ToneGenerator.TONE_DTMF_0);
+        mToneMap.put('#', ToneGenerator.TONE_DTMF_P);
+        mToneMap.put('*', ToneGenerator.TONE_DTMF_S);
 
         View button;
         for (int viewId : mDisplayMap.keySet()) {
@@ -330,6 +349,8 @@ public void initInCallScreen() {
 	boolean running;
     private static final HashMap<Integer, Character> mDisplayMap =
         new HashMap<Integer, Character>();
+    private static final HashMap<Character, Integer> mToneMap =
+        new HashMap<Character, Integer>();
 
 	public void onClick(View v) {
         int viewId = v.getId();
@@ -439,7 +460,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
             return true;
 
         case KeyEvent.KEYCODE_BACK:
-    		reject();      
+        	if (mDialerDrawer.isOpened())
+        		mDialerDrawer.animateClose();
+        	else
+        		reject();      
             return true;
 
         case KeyEvent.KEYCODE_CAMERA:

src/org/sipdroid/sipua/ui/Receiver.java

@@ -33,6 +33,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.location.Location;
 import android.location.LocationManager;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
@@ -192,6 +193,9 @@ public static void onState(int state,String caller) {
 					if (wl != null && wl.isHeld())
 						wl.release();
 			        mContext.startActivity(createIntent(InCallScreen.class));
+					ccConn.log(ccCall.base);
+					ccConn.date = 0;
+					engine(mContext).listen();
 					break;
 				case UserAgent.UA_STATE_INCALL:
 					broadcastCallStateChanged("OFFHOOK", null);
@@ -211,23 +215,7 @@ public static void onState(int state,String caller) {
 			        mContext.startActivity(createIntent(InCallScreen.class));
 					break;
 				}
-				if (call_state == UserAgent.UA_STATE_IDLE) {
-			        (new Thread() {
-						public void run() {
-
-							try {
-								sleep(2000);
-							} catch (InterruptedException e) {
-							}
-							if (ccConn.date != 0) {
-								ccConn.log(ccCall.base);
-								ccConn.date = 0;
-							}
-							engine(mContext).listen();
-						}
-					}).start();   
-				}
-				// stop the ringback player
+				pos(true);
 				if (ringbackPlayer != null && ringbackPlayer.isPlaying()) {
 					ringbackPlayer.stop();
 				}
@@ -306,29 +294,59 @@ public static void registered() {
 			pos(true);
 		}
 
-		public static void pos(boolean enabled) {
-	        Intent intent = new Intent(mContext, OneShotLocation.class);
-	        PendingIntent sender = PendingIntent.getBroadcast(mContext,
-	                0, intent, 0);
-	        Intent loopintent = new Intent(mContext, LoopLocation.class);
-	        PendingIntent loopsender = PendingIntent.getBroadcast(mContext,
-	                0, loopintent, 0);
-	        LocationManager lm = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
-			AlarmManager am = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
-			lm.removeUpdates(sender);
-			am.cancel(sender);
-			if (PreferenceManager.getDefaultSharedPreferences(mContext).getBoolean("pos",false) &&
-					PreferenceManager.getDefaultSharedPreferences(mContext).getString("posurl","").length() > 0) {
-				if (call_state == UserAgent.UA_STATE_IDLE && enabled) {
-					lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, sender);
-					am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime()+10*1000, sender);
-					lm.removeUpdates(loopsender);
-					lm.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 10*60000, 3000, loopsender);
+		static LocationManager lm;
+		static AlarmManager am;
+		static PendingIntent gps_sender,net_sender;
+		static boolean gps_enabled,net_enabled;
+		
+		static final int GPS_UPDATES = 4000*1000;
+		static final int NET_UPDATES = 600*1000;
+		
+		public static void pos(boolean enable) {
+	        if (lm == null) lm = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
+			if (am == null) am = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
+			pos_gps(false);
+			if (enable) {
+				pos_net(false);
+				if (call_state == UserAgent.UA_STATE_IDLE && Sipdroid.on(mContext) &&
+						PreferenceManager.getDefaultSharedPreferences(mContext).getBoolean("pos",false) &&
+						PreferenceManager.getDefaultSharedPreferences(mContext).getString("posurl","").length() > 0) {
+					Location last = lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+					if (last == null || System.currentTimeMillis() - last.getTime() > GPS_UPDATES)
+						pos_gps(true);
+					pos_net(true);
 				}
-			} else
-				lm.removeUpdates(loopsender);
+			}
 		}
 
+		static void pos_gps(boolean enable) {
+			if (gps_sender == null) {
+		        Intent intent = new Intent(mContext, OneShotLocation.class);
+		        gps_sender = PendingIntent.getBroadcast(mContext,
+		                0, intent, 0);
+			}
+	        if (enable) {
+				lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, GPS_UPDATES, 3000, gps_sender);
+				am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime()+10*1000, gps_sender);	        	
+	        } else {
+				am.cancel(gps_sender);
+				lm.removeUpdates(gps_sender);
+	        }
+		}
+		
+		static void pos_net(boolean enable) {
+			if (net_sender == null) {
+		        Intent loopintent = new Intent(mContext, LoopLocation.class);
+		        net_sender = PendingIntent.getBroadcast(mContext,
+		                0, loopintent, 0);
+			}
+			if (enable) {
+				lm.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, NET_UPDATES, 3000, net_sender);
+			} else {
+				lm.removeUpdates(net_sender);
+			}
+		}
+		
 		public static void url(final String opt) {
 	        (new Thread() {
 				public void run() {

src/org/sipdroid/sipua/ui/Settings.java

@@ -43,6 +43,14 @@ public static int getMinEdge() {
 			}			
 		}
 
+		public static float getEarGain() {
+			try {
+				return Float.valueOf(PreferenceManager.getDefaultSharedPreferences(Receiver.mContext).getString("eargain", "0.25"));
+			} catch (NumberFormatException i) {
+				return (float)0.25;
+			}			
+		}
+
 		@Override
 		public void onCreate(Bundle savedInstanceState) {
 			super.onCreate(savedInstanceState);
@@ -86,17 +94,25 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
 		        	Checkin.checkin(false);
 	        		edit.putString("protocol",sharedPreferences.getString("server", "").equals("pbxes.org")?"tcp":"udp");
 	        		edit.commit();
-	        		return;
-	        	}
+	        	} else
         		if (sharedPreferences.getBoolean("callback",false) && sharedPreferences.getBoolean("callthru",false)) {
  	        		CheckBoxPreference cb = (CheckBoxPreference) getPreferenceScreen().findPreference(
  	        				key.equals("callback")?"callthru":"callback");
 	        		cb.setChecked(false);
-	        		return;
-	        	}
-        		if (key.equals("wlan") || key.equals("3g"))
-        			updateSleep();
- 	        	if (!key.equals("dns")) {
+	        	} else
+ 	        	if (key.equals("wlan") ||
+ 	        			key.equals("3g") ||
+ 	        			key.equals("username") ||
+ 	        			key.equals("password") ||
+ 	        			key.equals("domain") ||
+ 	        			key.equals("server") ||
+ 	        			key.equals("port") ||
+ 	        			key.equals("protocol") ||
+ 	        			key.equals("minedge") ||
+ 	        			key.equals("pos") ||
+ 	        			key.equals("posurl")) {
+ 	        		if (key.equals("wlan") || key.equals("3g"))
+ 	        			updateSleep();
  		        	Receiver.engine(this).halt();
 		    		Receiver.engine(this).StartEngine();
 		    		updateSummaries();        

src/org/sipdroid/sipua/ui/Sipdroid.java

@@ -268,6 +268,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			} catch (InterruptedException e1) {
 			}
 			on(this,false);
+			Receiver.pos(true);
 			Receiver.engine(this).halt();
 			Receiver.mSipdroidEngine = null;
 			stopService(new Intent(this,RegisterService.class));