Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-13916(android): Suppress deprecation warnings #121

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CB-13916(android): Suppress deprecation warnings #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 49 additions & 34 deletions src/android/Notification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ Licensed to the Apache Software Foundation (ASF) under one
import org.json.JSONException;
import org.json.JSONObject;

import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.ProgressDialog;
// NOTE: These packages seem to be "deprecated":
// import android.app.AlertDialog;
// import android.app.AlertDialog.Builder;
// import android.app.ProgressDialog;

import android.content.DialogInterface;
import android.content.res.Resources;
import android.media.Ringtone;
Expand All @@ -53,8 +54,12 @@ public class Notification extends CordovaPlugin {
private static final String LOG_TAG = "Notification";

public int confirmResult = -1;
public ProgressDialog spinnerDialog = null;
public ProgressDialog progressDialog = null;

@SuppressWarnings("deprecation")
public android.app.ProgressDialog spinnerDialog = null;

@SuppressWarnings("deprecation")
public android.app.ProgressDialog progressDialog = null;

/**
* Constructor.
Expand Down Expand Up @@ -164,19 +169,19 @@ public synchronized void alert(final String message, final String title, final S

Runnable runnable = new Runnable() {
public void run() {
android.app.AlertDialog.Builder dlg = createAlertDialog(cordova);

AlertDialog.Builder dlg = createDialog(cordova); // new AlertDialog.Builder(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
dlg.setMessage(message);
dlg.setTitle(title);
dlg.setCancelable(true);
dlg.setPositiveButton(buttonLabel,
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, 0));
}
});
dlg.setOnCancelListener(new AlertDialog.OnCancelListener() {
dlg.setOnCancelListener(new android.app.AlertDialog.OnCancelListener() {
public void onCancel(DialogInterface dialog)
{
dialog.dismiss();
Expand Down Expand Up @@ -205,7 +210,7 @@ public synchronized void confirm(final String message, final String title, final

Runnable runnable = new Runnable() {
public void run() {
AlertDialog.Builder dlg = createDialog(cordova); // new AlertDialog.Builder(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
android.app.AlertDialog.Builder dlg = createAlertDialog(cordova);
dlg.setMessage(message);
dlg.setTitle(title);
dlg.setCancelable(true);
Expand All @@ -214,7 +219,7 @@ public void run() {
if (buttonLabels.length() > 0) {
try {
dlg.setNegativeButton(buttonLabels.getString(0),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, 1));
Expand All @@ -229,7 +234,7 @@ public void onClick(DialogInterface dialog, int which) {
if (buttonLabels.length() > 1) {
try {
dlg.setNeutralButton(buttonLabels.getString(1),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, 2));
Expand All @@ -244,7 +249,7 @@ public void onClick(DialogInterface dialog, int which) {
if (buttonLabels.length() > 2) {
try {
dlg.setPositiveButton(buttonLabels.getString(2),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, 3));
Expand All @@ -254,7 +259,7 @@ public void onClick(DialogInterface dialog, int which) {
LOG.d(LOG_TAG,"JSONException on third button.");
}
}
dlg.setOnCancelListener(new AlertDialog.OnCancelListener() {
dlg.setOnCancelListener(new android.app.AlertDialog.OnCancelListener() {
public void onCancel(DialogInterface dialog)
{
dialog.dismiss();
Expand All @@ -280,8 +285,8 @@ public void onCancel(DialogInterface dialog)
* @param buttonLabels A comma separated list of button labels (Up to 3 buttons)
* @param callbackContext The callback context.
*/
@SuppressWarnings("deprecation")
public synchronized void prompt(final String message, final String title, final JSONArray buttonLabels, final String defaultText, final CallbackContext callbackContext) {

final CordovaInterface cordova = this.cordova;

Runnable runnable = new Runnable() {
Expand All @@ -295,7 +300,7 @@ But for some android versions is not visible (for example 5.1.1).
int promptInputTextColor = resources.getColor(android.R.color.primary_text_light);
promptInput.setTextColor(promptInputTextColor);
promptInput.setText(defaultText);
AlertDialog.Builder dlg = createDialog(cordova); // new AlertDialog.Builder(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
android.app.AlertDialog.Builder dlg = createAlertDialog(cordova);
dlg.setMessage(message);
dlg.setTitle(title);
dlg.setCancelable(true);
Expand All @@ -308,7 +313,7 @@ But for some android versions is not visible (for example 5.1.1).
if (buttonLabels.length() > 0) {
try {
dlg.setNegativeButton(buttonLabels.getString(0),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
try {
Expand All @@ -329,7 +334,7 @@ public void onClick(DialogInterface dialog, int which) {
if (buttonLabels.length() > 1) {
try {
dlg.setNeutralButton(buttonLabels.getString(1),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
try {
Expand All @@ -350,7 +355,7 @@ public void onClick(DialogInterface dialog, int which) {
if (buttonLabels.length() > 2) {
try {
dlg.setPositiveButton(buttonLabels.getString(2),
new AlertDialog.OnClickListener() {
new android.app.AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
try {
Expand All @@ -366,7 +371,7 @@ public void onClick(DialogInterface dialog, int which) {
LOG.d(LOG_TAG,"JSONException on third button.");
}
}
dlg.setOnCancelListener(new AlertDialog.OnCancelListener() {
dlg.setOnCancelListener(new android.app.AlertDialog.OnCancelListener() {
public void onCancel(DialogInterface dialog){
dialog.dismiss();
try {
Expand Down Expand Up @@ -398,7 +403,7 @@ public synchronized void activityStart(final String title, final String message)
final CordovaInterface cordova = this.cordova;
Runnable runnable = new Runnable() {
public void run() {
notification.spinnerDialog = createProgressDialog(cordova); // new ProgressDialog(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
notification.spinnerDialog = createProgressDialog(cordova);
notification.spinnerDialog.setTitle(title);
notification.spinnerDialog.setMessage(message);
notification.spinnerDialog.setCancelable(true);
Expand Down Expand Up @@ -440,8 +445,7 @@ public synchronized void progressStart(final String title, final String message)
final CordovaInterface cordova = this.cordova;
Runnable runnable = new Runnable() {
public void run() {
notification.progressDialog = createProgressDialog(cordova); // new ProgressDialog(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
notification.progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
notification.progressDialog = createProgressDialogWithHorizontalStyle(cordova);
notification.progressDialog.setTitle(title);
notification.progressDialog.setMessage(message);
notification.progressDialog.setCancelable(true);
Expand Down Expand Up @@ -480,31 +484,42 @@ public synchronized void progressStop() {
}
}

@SuppressLint("NewApi")
private AlertDialog.Builder createDialog(CordovaInterface cordova) {
@SuppressWarnings("deprecation")
private android.app.AlertDialog.Builder createAlertDialog(CordovaInterface cordova) {
int currentapiVersion = android.os.Build.VERSION.SDK_INT;
if (currentapiVersion >= android.os.Build.VERSION_CODES.HONEYCOMB) {
return new AlertDialog.Builder(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
return new android.app.AlertDialog.Builder(cordova.getActivity(),
android.app.AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
} else {
return new AlertDialog.Builder(cordova.getActivity());
return new android.app.AlertDialog.Builder(cordova.getActivity());
}
}

@SuppressLint("InlinedApi")
private ProgressDialog createProgressDialog(CordovaInterface cordova) {
@SuppressWarnings("deprecation")
private android.app.ProgressDialog createProgressDialog(CordovaInterface cordova) {
int currentapiVersion = android.os.Build.VERSION.SDK_INT;
if (currentapiVersion >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
return new ProgressDialog(cordova.getActivity(), AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
return new android.app.ProgressDialog(cordova.getActivity(),
android.app.AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
} else {
return new ProgressDialog(cordova.getActivity());
return new android.app.ProgressDialog(cordova.getActivity());
}
}

@SuppressLint("NewApi")
private void changeTextDirection(Builder dlg){
@SuppressWarnings("deprecation")
private android.app.ProgressDialog createProgressDialogWithHorizontalStyle(CordovaInterface cordova) {
android.app.ProgressDialog dialog =
createProgressDialog(cordova);

dialog.setProgressStyle(android.app.ProgressDialog.STYLE_HORIZONTAL);
return dialog;
}

@SuppressWarnings("deprecation")
private void changeTextDirection(android.app.AlertDialog.Builder dlg){
int currentapiVersion = android.os.Build.VERSION.SDK_INT;
dlg.create();
AlertDialog dialog = dlg.show();
android.app.AlertDialog dialog = dlg.show();
if (currentapiVersion >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
TextView messageview = (TextView)dialog.findViewById(android.R.id.message);
messageview.setTextDirection(android.view.View.TEXT_DIRECTION_LOCALE);
Expand Down