Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix infinite recursion issue on compatibility package

Browse source
This commit is contained in:
Sylvain Berfini 2012-06-22 16:13:00 +02:00
parent 97ee310441
commit 78f83b9a71
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/linphone/LinphoneActivity.java
View file

@ -303,9 +303,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
intent.setClass(this, PreferencesActivity.class); intent.setClass(this, PreferencesActivity.class);
startActivityForResult(intent, SETTINGS_ACTIVITY); startActivityForResult(intent, SETTINGS_ACTIVITY);
if (FragmentsAvailable.SETTINGS.isRightOf(currentFragment)) { 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 { } 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);
} }
// } // }
} }

4
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -117,9 +117,9 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements O
private void finishWithCustomAnimation(FragmentsAvailable newFragment) { private void finishWithCustomAnimation(FragmentsAvailable newFragment) {
finish(); finish();
if (FragmentsAvailable.SETTINGS.isRightOf(newFragment)) { 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 { } 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);
} }
} }

5
src/org/linphone/compatibility/ApiFivePlus.java
View file

@ -6,6 +6,7 @@ import java.util.List;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentUris; import android.content.ContentUris;
import android.content.ContentValues; import android.content.ContentValues;
@ -40,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class ApiFivePlus { public class ApiFivePlus {
public static void overridePendingTransition(int idAnimIn, int idAnimOut) { public static void overridePendingTransition(Activity activity, int idAnimIn, int idAnimOut) {
overridePendingTransition(idAnimIn, idAnimOut); activity.overridePendingTransition(idAnimIn, idAnimOut);
} }
public static Intent prepareAddContactIntent(String displayName, String sipUri) { public static Intent prepareAddContactIntent(String displayName, String sipUri) {

5
src/org/linphone/compatibility/Compatibility.java
View file

@ -22,6 +22,7 @@ import java.util.List;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
@ -30,9 +31,9 @@ import android.net.Uri;
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class Compatibility { 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)) { if (Version.sdkAboveOrEqual(5)) {
ApiFivePlus.overridePendingTransition(idAnimIn, idAnimOut); ApiFivePlus.overridePendingTransition(activity, idAnimIn, idAnimOut);
} }
} }