diff --git a/README b/README index 1fa98ca6913f3e671d747b9e47c44a5b676057de..549cdb7bc150d15bbf3fe7604a1d74be8635f403 100644 --- a/README +++ b/README @@ -25,7 +25,8 @@ Check that following files are executable: Compile pjsip-android $ pushd jni/pjproject-android/android -$ ./configure-android --disable-sound +$ ./configure-android --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l + $ make dep && make $ popd diff --git a/jenkins-sflphone-android.sh b/jenkins-sflphone-android.sh index 546cb689bacd6271a206bd908ef6732ab8d788e1..a7acfde11e1f325ab78e074eaacd6c8061a50878 100755 --- a/jenkins-sflphone-android.sh +++ b/jenkins-sflphone-android.sh @@ -106,17 +106,24 @@ launch_emulator() { build_sflphone_android() { # android update project --target $VIRTUAL_DEVICE_ID --path $ANDROID_PROJECT_PATH + echo "Compile pjandroid stack" + pushd jni/pjproject-android/android + ./configure-android --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l + make dep && make + popd + + ./make-swig.h echo "Build JNI related libraries" # ndk-build clean - ndk-build -j4 + ndk-build echo "Build Java application" ant clean ant debug - echo "Upload sflphone on the virtual device" - adb install -r $ANDROID_SFLPHONE_BIN + # echo "Upload sflphone on the virtual device" + #adb install -r $ANDROID_SFLPHONE_BIN # ./adb-push-sflphone.sh } diff --git a/local.properties b/local.properties new file mode 100644 index 0000000000000000000000000000000000000000..93298d9420d09c81366e1b0a6715980626010be6 --- /dev/null +++ b/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/home/lisional/Dev/ADT/sdk diff --git a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java index 8c356d000c146e77f3e4f09ead150e1eecaa6ee4..360d2ca3d4dc73cf33fc82116c5a94117e01d0e6 100644 --- a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java +++ b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java @@ -172,7 +172,7 @@ public class ContactListFragment extends Fragment implements OnQueryTextListener @Override public void onItemClick(AdapterView<?> arg0, View v, int pos, long arg3) { - mCallbacks.onContactSelected(mListAdapter.getItem(pos)); + mCallbacks.onContactSelected(mListAdapter.getItem(pos-1)); // ((SearchView) mHandle.findViewById(R.id.contact_search_text)).setIconified(true); }