]> sjero.net Git - linphone/commitdiff
Merge remote-tracking branch 'newui/newUI' into newUI
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 11 Jul 2012 09:52:27 +0000 (11:52 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 11 Jul 2012 09:53:33 +0000 (11:53 +0200)
Conflicts:
AndroidManifest.xml
build.xml
src/org/linphone/DialerActivity.java
src/org/linphone/IncallActivity.java
src/org/linphone/LinphoneManager.java
src/org/linphone/LinphoneService.java
src/org/linphone/LinphoneSimpleListener.java
src/org/linphone/LinphoneUtils.java
src/org/linphone/VideoCallActivity.java
src/org/linphone/core/LinphoneCallImpl.java
src/org/linphone/core/LinphoneCoreImpl.java

1  2 
LinphoneCallLogImpl.java

index 895e27a388597463782b10afcf8c5ed4dfd17a3f,996b51c10b9921510be77d0db4ac37db98d58672..8972f0a76a343474cf6dd4dbc39ac5f86bea9165
@@@ -43,17 -46,18 +46,18 @@@ class LinphoneCallLogImpl implements Li
                return new LinphoneAddressImpl(getTo(nativePtr));
        }
        public CallStatus getStatus() {
-               throw new RuntimeException("not implemented yet");
+               return LinphoneCallLog.CallStatus.fromInt(getStatus(nativePtr));
+       }
+       public long getNativePtr() {
+               return nativePtr;
        }
-       @Override
 -
++      
        public String getStartDate() {
-               // TODO Auto-generated method stub
-               return null;
+               return getStartDate(nativePtr);
        }
-       @Override
        public int getCallDuration() {
-               // TODO Auto-generated method stub
-               return 0;
+               return getCallDuration(nativePtr);
        }
  }