Updated README

README

@@ -7,8 +7,8 @@ COMPILATION INSTRUCTIONS
 
 To build liblinphone for Android, you must:
 -------------------------------------------
-0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
+0) download the Android sdk (API 24) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path.
-1) download the Android ndk (version r11) from google and add it to your path (no symlink !!!).
+1) download the Android ndk (version r11c or 12b) from google and add it to your path (no symlink !!!).
 2) install yasm, nasm, ant, python, cmake and vim-common
 	On 64 bits linux systems you'll need the ia32-libs package
 	With the latest Debian (multiarch), you need this:
@@ -27,11 +27,12 @@ To build liblinphone for Android, you must:
 	$ make mediastreamer2-sdk
 8) (Optional) To generate a signed apk to publish on the Google Play, run
 	$ make release
-Make sure you filled the ant.properties values for version.name, key.store and key.alias in order to correctly sign the generated apk. 
+	Make sure you filled the ant.properties values for version.name, key.store and key.alias in order to correctly sign the generated apk. 
-You also may want to create a file name ant_password.properties with the following:
+	You also may want to create a file name ant_password.properties with the following:
-key.store.password=[your_password]
+	key.store.password=[your_password]
-key.alias.password=[your_password]
+	key.alias.password=[your_password]
-If you don't, the passwords will be asked at the signing phase.
+	If you don't, the passwords will be asked at the signing phase.
+9) (Optional) Once you compiled the libraries succesfully with 'make', you can reduce the compilation time using 'make quick': it will only generate a new APK from java files.
 
 To run the tutorials:
 --------------------

res/xml/contacts.xml

@@ -3,7 +3,7 @@
 <ContactsSource
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Change package ! -->
+    <!-- Change package, leave vnd.android.cursor.item/ before and .profile at the end. -->
     <ContactsDataKind
         android:mimeType="vnd.android.cursor.item/org.linphone.profile"
         android:icon="@drawable/linphone_logo"

src/org/linphone/AboutFragment.java

@@ -69,11 +69,11 @@ public class AboutFragment extends Fragment implements OnClickListener {
 
 		sendLogButton = view.findViewById(R.id.send_log);
 		sendLogButton.setOnClickListener(this);
-		sendLogButton.setVisibility(org.linphone.LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
+		sendLogButton.setVisibility(LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
 
 		resetLogButton = view.findViewById(R.id.reset_log);
 		resetLogButton.setOnClickListener(this);
-		resetLogButton.setVisibility(org.linphone.LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
+		resetLogButton.setVisibility(LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
 		
 		mListener = new LinphoneCoreListenerBase() {
 			@Override
@@ -145,7 +145,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
 			lc.addListener(mListener);
 		}
 		
-		if (org.linphone.LinphoneActivity.isInstanciated()) {
+		if (LinphoneActivity.isInstanciated()) {
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.ABOUT);
 		}
 		
@@ -154,8 +154,8 @@ public class AboutFragment extends Fragment implements OnClickListener {
 
 	@Override
 	public void onClick(View v) {
-		if (org.linphone.LinphoneActivity.isInstanciated()) {
+		if (LinphoneActivity.isInstanciated()) {
-			LinphoneCore lc = org.linphone.LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 			if (v == sendLogButton) {
 				if (lc != null) {
 					lc.uploadLogCollection();
@@ -174,6 +174,4 @@ public class AboutFragment extends Fragment implements OnClickListener {
 	public void onDestroy() {
 		super.onDestroy();
 	}
-
-	
 }

src/org/linphone/AccountPreferencesFragment.java

@@ -53,8 +53,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		mPrefs = LinphonePreferences.instance();
 	}
 	
-	public void onCreate(Bundle savedInstanceState) 
+	public void onCreate(Bundle savedInstanceState) {
-	{
 		super.onCreate(savedInstanceState);
 		
 		PreferenceScreen screen = getPreferenceScreen();
@@ -69,7 +68,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
 		getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 	}
 	
-	public static boolean isEditTextEmpty(String s){
+	public static boolean isEditTextEmpty(String s) {
 	      return s.equals("");  // really empty.          
 	}
 	

src/org/linphone/LinphoneUtils.java

@@ -431,7 +431,7 @@ public final class LinphoneUtils {
         StringBuilder sb = new StringBuilder();
 
     	try {
-			p = Runtime.getRuntime().exec(new String[] { "logcat", "-d", "|", "grep", "`adb shell ps | grep org.linphone | cut -c10-15`" });
+			p = Runtime.getRuntime().exec(new String[] { "logcat", "-d", "|", "grep", "`adb shell ps | grep " + context.getPackageName() + " | cut -c10-15`" });
 	    	br = new BufferedReader(new InputStreamReader(p.getInputStream()), 2048);
 
             String line;

src/org/linphone/tutorials/TutorialCardDavSync.java

@@ -162,8 +162,7 @@ public class TutorialCardDavSync extends Activity implements OnClickListener, Li
 	}
 
 	@Override
-	public void onLinphoneFriendSyncStatusChanged(LinphoneFriendList list,
+	public void onLinphoneFriendSyncStatusChanged(LinphoneFriendList list, LinphoneFriendList.State status, String message) {
-			org.linphone.core.LinphoneFriendList.State status, String message) {
 		// TODO Auto-generated method stub
 		String msg = "Sync status changed: " + status.toString() + " (" + message + ")";
 		myLog(msg);