diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2d75fb20..3be9c6a5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,7 +19,7 @@ + android:label="@string/app_name" android:configChanges="orientation|keyboardHidden"> diff --git a/assets/index.html b/assets/index.html index e5913d62..f72433b7 100644 --- a/assets/index.html +++ b/assets/index.html @@ -152,10 +152,10 @@ audio = function(func) $('posdur').value = Device.audio.getDuration($('audioFile').value); }else if (func == 'setEarpiece') { - Device.audio.setAudioOutputDevice(func); + Device.audio.setAudioOutputDevice(1); } else if (func == 'setSpeaker') { - Device.audio.setAudioOutputDevice(func); + Device.audio.setAudioOutputDevice(2); }else if (func == 'getAudioOutputDevice') { $('audoutput').value = Device.audio.getAudioOutputDevice(); diff --git a/src/com/nitobi/phonegap/AudioHandler.java b/src/com/nitobi/phonegap/AudioHandler.java index 4551596f..a0e32e49 100644 --- a/src/com/nitobi/phonegap/AudioHandler.java +++ b/src/com/nitobi/phonegap/AudioHandler.java @@ -26,7 +26,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O this.mCtx = ctx; } - public void startRecording(String file){ + protected void startRecording(String file){ if (!isRecording){ saveFile=file; recorder = new MediaRecorder(); @@ -46,7 +46,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O f.renameTo(new File("/sdcard" + file)); } - public void stopRecording(){ + protected void stopRecording(){ try{ if((recorder != null)&&(isRecording)) { @@ -58,7 +58,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O }catch (Exception e){e.printStackTrace();} } - public void startPlaying(String file) { + protected void startPlaying(String file) { if (isPlaying==false) { try { mPlayer = new MediaPlayer(); @@ -82,7 +82,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O } } - public void stopPlaying() { + protected void stopPlaying() { if (isPlaying) { mPlayer.stop(); mPlayer.release(); @@ -96,7 +96,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O isPlaying=false; } - public long getCurrentPosition() { + protected long getCurrentPosition() { if (isPlaying) { return(mPlayer.getCurrentPosition()); @@ -112,7 +112,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O } } - public long getDuration(String file) { + protected long getDuration(String file) { long duration = -2; if (!isPlaying & !isStreaming(file)) { try { @@ -154,17 +154,17 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O return false; } - protected void setAudioOutputDevice(String output){ - System.out.println ("Change audio setting to be "+output); + protected void setAudioOutputDevice(int output){ + // Changes the default audio output device to speaker or earpiece AudioManager audiMgr = (AudioManager) mCtx.getSystemService(Context.AUDIO_SERVICE); - if (output.contains("Speaker")) + if (output == (2)) audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL); - else if (output.contains("Earpiece")){ + else if (output == (1)){ audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL); }else - System.out.println("input error"); - + Log.e("AudioHandler setAudioOutputDevice", " unknown output device"); } + protected int getAudioOutputDevice(){ AudioManager audiMgr = (AudioManager) mCtx.getSystemService(Context.AUDIO_SERVICE); if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE) diff --git a/src/com/nitobi/phonegap/DirectoryManager.java b/src/com/nitobi/phonegap/DirectoryManager.java index 61d81a92..2fdb45fd 100644 --- a/src/com/nitobi/phonegap/DirectoryManager.java +++ b/src/com/nitobi/phonegap/DirectoryManager.java @@ -4,6 +4,7 @@ import java.io.File; import android.os.Environment; import android.os.StatFs; +import android.util.Log; public class DirectoryManager { @@ -13,7 +14,6 @@ public class DirectoryManager { File path = Environment.getExternalStorageDirectory(); File newPath = constructFilePaths(path.toString(), name); status = newPath.exists(); - }else{ status = false; } @@ -33,7 +33,6 @@ public class DirectoryManager { long blockSize = stat.getBlockSize(); long availableBlocks = stat.getAvailableBlocks(); freeSpace = availableBlocks*blockSize/1024; - } catch (Exception e) {e.printStackTrace(); } } else { return -1; } return (freeSpace); @@ -71,17 +70,15 @@ public class DirectoryManager { File newPath = constructFilePaths(path.toString(), fileName); checker.checkDelete(newPath.toString()); if(newPath.isDirectory()){ - System.out.println("Dir = "+ fileName); String[] listfile = newPath.list(); - + // delete all files within the specified directory and then delete the directory try{ for (int i=0; i < listfile.length; i++){ - System.out.println(listfile[i].toString()+" length = "+listfile.length); File deletedFile = new File (newPath.toString()+"/"+listfile[i].toString()); deletedFile.delete(); } - newPath.delete(); + Log.i("DirectoryManager deleteDirectory", fileName); status = true; }catch (Exception e){ e.printStackTrace(); @@ -93,8 +90,8 @@ public class DirectoryManager { }else status = false; return status; - } + protected boolean deleteFile(String fileName){ boolean status; SecurityManager checker = new SecurityManager(); @@ -106,7 +103,7 @@ public class DirectoryManager { checker.checkDelete(newPath.toString()); if (newPath.isFile()){ try { - System.out.println("deleting the file"); + Log.i("DirectoryManager deleteFile", fileName); newPath.delete(); status = true; }catch (SecurityException se){ diff --git a/src/com/nitobi/phonegap/DroidGap.java b/src/com/nitobi/phonegap/DroidGap.java index 056d7312..dcaf799e 100644 --- a/src/com/nitobi/phonegap/DroidGap.java +++ b/src/com/nitobi/phonegap/DroidGap.java @@ -23,6 +23,7 @@ package com.nitobi.phonegap; */ import android.app.Activity; +import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.util.Log; @@ -64,8 +65,12 @@ public class DroidGap extends Activity { appView.loadUrl("file:///android_asset/index.html"); } - - + + @Override + public void onConfigurationChanged(Configuration newConfig) { + //don't reload the current page when the orientation is changed + super.onConfigurationChanged(newConfig); + } private void bindBrowser(WebView appView) { diff --git a/src/com/nitobi/phonegap/HttpHandler.java b/src/com/nitobi/phonegap/HttpHandler.java index f4912928..0f953d8a 100644 --- a/src/com/nitobi/phonegap/HttpHandler.java +++ b/src/com/nitobi/phonegap/HttpHandler.java @@ -11,7 +11,7 @@ import org.apache.http.impl.client.DefaultHttpClient; public class HttpHandler { - public Boolean get(String url, String file) + protected Boolean get(String url, String file) { HttpEntity entity = getHttpEntity(url); try { diff --git a/src/com/nitobi/phonegap/PhoneGap.java b/src/com/nitobi/phonegap/PhoneGap.java index 05988669..79ed8042 100644 --- a/src/com/nitobi/phonegap/PhoneGap.java +++ b/src/com/nitobi/phonegap/PhoneGap.java @@ -261,7 +261,6 @@ public class PhoneGap{ } public long getFreeDiskSpace(){ - System.out.println("FOOOOOOOO"); long freeDiskSpace=fileManager.getFreeDiskSpace(); return freeDiskSpace; } @@ -357,9 +356,10 @@ public class PhoneGap{ return(audio.getDuration(file)); } - public void setAudioOutputDevice(String output){ + public void setAudioOutputDevice(int output){ audio.setAudioOutputDevice(output); } + public int getAudioOutputDevice(){ return audio.getAudioOutputDevice(); } diff --git a/src/com/nitobi/phonegap/SmsListener.java b/src/com/nitobi/phonegap/SmsListener.java index 411dad9c..a42359bc 100644 --- a/src/com/nitobi/phonegap/SmsListener.java +++ b/src/com/nitobi/phonegap/SmsListener.java @@ -36,7 +36,7 @@ public class SmsListener extends BroadcastReceiver } } - public void onReceiveSMS(String sendersNumber, String smsContent) + protected void onReceiveSMS(String sendersNumber, String smsContent) /** * Call back to Java Script */