diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index e8c93441b..755b9b0a9 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -22,6 +22,7 @@ package org.linphone; import static android.content.Intent.ACTION_MAIN; import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener; +import org.linphone.compatibility.Compatibility; import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCore; @@ -102,7 +103,7 @@ public class LinphoneActivity extends TabActivity implements ContactPicked setContentView(R.layout.main); @SuppressWarnings("deprecation") - int rotation = getWindowManager().getDefaultDisplay().getOrientation(); + int rotation = Compatibility.getRotation(getWindowManager().getDefaultDisplay()); // Inverse landscape rotation to initiate linphoneCore correctly if (rotation == 270) rotation = 90; diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 4f54e5cc2..7551bc229 100755 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. package org.linphone; import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener; +import org.linphone.compatibility.Compatibility; import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCallParams; @@ -456,7 +457,8 @@ public class VideoCallActivity extends Activity implements private void resizePreview() { Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)) .getDefaultDisplay(); - int rotation = display.getOrientation(); + + int rotation = Compatibility.getRotation(display); LayoutParams params; int w, h; diff --git a/src/org/linphone/compatibility/API4Compatibility.java b/src/org/linphone/compatibility/API4Compatibility.java new file mode 100644 index 000000000..62aad0f7b --- /dev/null +++ b/src/org/linphone/compatibility/API4Compatibility.java @@ -0,0 +1,10 @@ +package org.linphone.compatibility; + +import android.view.Display; + +public class API4Compatibility { + + public static int getRotation(Display display) { + return display.getOrientation(); + } +} diff --git a/src/org/linphone/compatibility/API8Compatibility.java b/src/org/linphone/compatibility/API8Compatibility.java new file mode 100644 index 000000000..07567b09d --- /dev/null +++ b/src/org/linphone/compatibility/API8Compatibility.java @@ -0,0 +1,10 @@ +package org.linphone.compatibility; + +import android.view.Display; + +public class API8Compatibility { + + public static int getRotation(Display display) { + return display.getRotation(); + } +} diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java new file mode 100644 index 000000000..ce05a237d --- /dev/null +++ b/src/org/linphone/compatibility/Compatibility.java @@ -0,0 +1,17 @@ +package org.linphone.compatibility; + +import org.linphone.mediastream.Version; + +import android.view.Display; + +public class Compatibility { + + public static int getRotation(Display display) { + if (Version.sdkStrictlyBelow(8)) { + return API4Compatibility.getRotation(display); + } else { + return API8Compatibility.getRotation(display); + } + } + +}