From 78f83b9a7180af585689c60f7814bf20a46d6e47 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 22 Jun 2012 16:13:00 +0200 Subject: [PATCH] Fix infinite recursion issue on compatibility package --- src/org/linphone/LinphoneActivity.java | 4 ++-- src/org/linphone/LinphonePreferencesActivity.java | 4 ++-- src/org/linphone/compatibility/ApiFivePlus.java | 5 +++-- src/org/linphone/compatibility/Compatibility.java | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index d49b4772a..cbf0c0a4c 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -303,9 +303,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene intent.setClass(this, PreferencesActivity.class); startActivityForResult(intent, SETTINGS_ACTIVITY); if (FragmentsAvailable.SETTINGS.isRightOf(currentFragment)) { - Compatibility.overridePendingTransition(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left); + Compatibility.overridePendingTransition(this, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left); } else { - Compatibility.overridePendingTransition(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); + Compatibility.overridePendingTransition(this, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); } // } } diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java index a649551a8..2fa1dd601 100644 --- a/src/org/linphone/LinphonePreferencesActivity.java +++ b/src/org/linphone/LinphonePreferencesActivity.java @@ -117,9 +117,9 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements O private void finishWithCustomAnimation(FragmentsAvailable newFragment) { finish(); if (FragmentsAvailable.SETTINGS.isRightOf(newFragment)) { - Compatibility.overridePendingTransition(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); + Compatibility.overridePendingTransition(this, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); } else { - Compatibility.overridePendingTransition(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left); + Compatibility.overridePendingTransition(this, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left); } } diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java index 8b2c89bea..f1db292fb 100644 --- a/src/org/linphone/compatibility/ApiFivePlus.java +++ b/src/org/linphone/compatibility/ApiFivePlus.java @@ -6,6 +6,7 @@ import java.util.List; import org.linphone.mediastream.Version; +import android.app.Activity; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; @@ -40,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * @author Sylvain Berfini */ public class ApiFivePlus { - public static void overridePendingTransition(int idAnimIn, int idAnimOut) { - overridePendingTransition(idAnimIn, idAnimOut); + public static void overridePendingTransition(Activity activity, int idAnimIn, int idAnimOut) { + activity.overridePendingTransition(idAnimIn, idAnimOut); } public static Intent prepareAddContactIntent(String displayName, String sipUri) { diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java index 4fd84e2b6..fe1fdea4f 100644 --- a/src/org/linphone/compatibility/Compatibility.java +++ b/src/org/linphone/compatibility/Compatibility.java @@ -22,6 +22,7 @@ import java.util.List; import org.linphone.mediastream.Version; +import android.app.Activity; import android.content.ContentResolver; import android.content.Intent; import android.database.Cursor; @@ -30,9 +31,9 @@ import android.net.Uri; * @author Sylvain Berfini */ public class Compatibility { - public static void overridePendingTransition(int idAnimIn, int idAnimOut) { + public static void overridePendingTransition(Activity activity, int idAnimIn, int idAnimOut) { if (Version.sdkAboveOrEqual(5)) { - ApiFivePlus.overridePendingTransition(idAnimIn, idAnimOut); + ApiFivePlus.overridePendingTransition(activity, idAnimIn, idAnimOut); } }