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

Removed/fixed some warnings

Browse source
This commit is contained in:
Sylvain Berfini 2016-07-19 16:52:24 +02:00
parent f84a1d6be3
commit 9ba7065d86
18 changed files with 59 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/AboutFragment.java
View file

@ -23,7 +23,6 @@ import org.linphone.core.LinphoneCore.LogCollectionUploadState;
import org.linphone.core.LinphoneCoreListenerBase;
import org.linphone.mediastream.Log;
import android.app.Dialog;
import android.app.Fragment;
import android.app.ProgressDialog;
import android.content.Context;
@ -32,11 +31,12 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
@ -104,7 +104,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
uploadInProgress = true;
progress = ProgressDialog.show(LinphoneActivity.instance(), null, null);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorE));
Drawable d = new ColorDrawable(ContextCompat.getColor(getActivity(), R.color.colorE));
d.setAlpha(200);
progress.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
progress.getWindow().setBackgroundDrawable(d);

3
src/org/linphone/CallActivity.java
View file

@ -57,6 +57,7 @@ import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemClock;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.DrawerLayout;
import android.view.Gravity;
import android.view.KeyEvent;
@ -1401,7 +1402,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
private void showAcceptCallUpdateDialog() {
final Dialog dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorC));
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
d.setAlpha(200);
dialog.setContentView(R.layout.dialog);
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,WindowManager.LayoutParams.MATCH_PARENT);

5
src/org/linphone/CallAudioFragment.java
View file

@ -18,8 +18,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import android.app.Activity;
import android.os.Bundle;
import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@ -41,7 +42,7 @@ public class CallAudioFragment extends Fragment {
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
super.onAttach((Context)activity);
incallActvityInstance = (CallActivity) activity;
if (incallActvityInstance != null) {

8
src/org/linphone/CallIncomingActivity.java
View file

@ -21,6 +21,7 @@ package org.linphone;
import java.util.ArrayList;
import java.util.List;
import org.linphone.compatibility.Compatibility;
import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCall.State;
@ -35,7 +36,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.support.v4.app.ActivityCompat;
@ -89,11 +89,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
getWindow().addFlags(flags);
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
isScreenActive = pm.isInteractive();
} else {
isScreenActive = pm.isScreenOn();
}
isScreenActive = Compatibility.isScreenOn(pm);
final int screenWidth = getResources().getDisplayMetrics().widthPixels;

3
src/org/linphone/CallVideoFragment.java
View file

@ -27,6 +27,7 @@ import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener;
@ -295,7 +296,7 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
super.onAttach((Context)activity);
inCallActivity = (CallActivity) activity;
if (inCallActivity != null) {
inCallActivity.bindVideoFragment(this);

7
src/org/linphone/ContactsManager.java
View file

@ -53,7 +53,6 @@ public class ContactsManager extends ContentObserver {
private static ContactsManager instance;
private List<LinphoneContact> contacts, sipContacts;
private Account mAccount;
private boolean preferLinphoneContacts = false, isContactPresenceDisabled = true, hasContactAccess = false;
private ContentResolver contentResolver;
private Context context;
@ -179,17 +178,13 @@ public class ContactsManager extends ContentObserver {
Account[] accounts = accountManager.getAccountsByType(context.getPackageName());
if(accounts != null && accounts.length == 0) {
if (accounts != null && accounts.length == 0) {
Account newAccount = new Account(context.getString(R.string.sync_account_name), context.getPackageName());
try {
accountManager.addAccountExplicitly(newAccount, null, null);
mAccount = newAccount;
} catch (Exception e) {
Log.e(e);
mAccount = null;
}
} else {
mAccount = accounts[0];
}
initializeContactManager(context, contentResolver);
}

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

@ -70,6 +70,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.DrawerLayout;
import android.view.Gravity;
import android.view.KeyEvent;
@ -901,7 +902,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
public Dialog displayDialog(String text){
Dialog dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorC));
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
d.setAlpha(200);
dialog.setContentView(R.layout.dialog);
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
@ -915,7 +916,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
public Dialog displayWrongPasswordDialog(final String username, final String realm, final String domain){
final Dialog dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorC));
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
d.setAlpha(200);
dialog.setContentView(R.layout.input_dialog);
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);

43
src/org/linphone/LinphonePreferences.java
View file

@ -31,12 +31,12 @@ import org.linphone.core.LinphoneAddress.TransportType;
import org.linphone.core.LinphoneAuthInfo;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCore.AdaptiveRateAlgorithm;
import org.linphone.core.LinphoneCore.FirewallPolicy;
import org.linphone.core.LinphoneCore.LinphoneLimeState;
import org.linphone.core.LinphoneCore.MediaEncryption;
import org.linphone.core.LinphoneCore.Transports;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneNatPolicy;
import org.linphone.core.LinphoneProxyConfig;
import org.linphone.core.LpConfig;
import org.linphone.core.TunnelConfig;
@ -909,40 +909,43 @@ public class LinphonePreferences {
}
public String getStunServer() {
return getLc().getStunServer();
LinphoneNatPolicy nat = getLc().getNatPolicy();
if (nat == null) return null;
return nat.getStunServer();
}
public void setStunServer(String stun) {
getLc().setStunServer(stun);
LinphoneNatPolicy nat = getLc().getNatPolicy();
if (nat == null) {
nat = getLc().createNatPolicy();
}
nat.setStunServer(stun);
}
public void setIceEnabled(boolean enabled) {
LinphoneNatPolicy nat = getLc().createNatPolicy();
if (enabled) {
getLc().setFirewallPolicy(FirewallPolicy.UseIce);
nat.enableIce(true);
} else {
String stun = getStunServer();
if (stun != null && stun.length() > 0) {
getLc().setFirewallPolicy(FirewallPolicy.UseStun);
} else {
getLc().setFirewallPolicy(FirewallPolicy.NoFirewall);
nat.enableStun(true);
}
}
}
getLc().setNatPolicy(nat);
}
public void setUpnpEnabled(boolean enabled) {
LinphoneNatPolicy nat = getLc().getNatPolicy();
if (enabled) {
if (isIceEnabled()) {
Log.e("Cannot have both ice and upnp enabled, disabling upnp");
} else {
getLc().setFirewallPolicy(FirewallPolicy.UseUpnp);
}
nat.enableUpnp(true);
}
else {
String stun = getStunServer();
if (stun != null && stun.length() > 0) {
getLc().setFirewallPolicy(FirewallPolicy.UseStun);
} else {
getLc().setFirewallPolicy(FirewallPolicy.NoFirewall);
nat.enableStun(true);
}
}
}
@ -985,11 +988,15 @@ public class LinphonePreferences {
}
public boolean isUpnpEnabled() {
return getLc().upnpAvailable() && getLc().getFirewallPolicy() == FirewallPolicy.UseUpnp;
LinphoneNatPolicy nat = getLc().getNatPolicy();
if (nat == null) return false;
return nat.upnpEnabled();
}
public boolean isIceEnabled() {
return getLc().getFirewallPolicy() == FirewallPolicy.UseIce;
LinphoneNatPolicy nat = getLc().getNatPolicy();
if (nat == null) return false;
return nat.iceEnabled();
}
public MediaEncryption getMediaEncryption() {

5
src/org/linphone/StatusFragment.java
View file

@ -42,6 +42,7 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@ -159,7 +160,7 @@ public class StatusFragment extends Fragment {
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
super.onAttach((Context)activity);
isAttached = true;
if (activity instanceof LinphoneActivity) {
@ -399,7 +400,7 @@ public class StatusFragment extends Fragment {
if(ZRTPdialog == null || !ZRTPdialog.isShowing()) {
ZRTPdialog = new Dialog(getActivity());
ZRTPdialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorC));
Drawable d = new ColorDrawable(ContextCompat.getColor(getActivity(), R.color.colorC));
d.setAlpha(200);
ZRTPdialog.setContentView(R.layout.dialog);
ZRTPdialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);

5
src/org/linphone/assistant/AssistantActivity.java
View file

@ -49,6 +49,7 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
@ -452,7 +453,7 @@ private static AssistantActivity instance;
public void displayRegistrationInProgressDialog() {
if(LinphoneManager.getLc().isNetworkReachable()) {
progress = ProgressDialog.show(this, null, null);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorE));
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorE));
d.setAlpha(200);
progress.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
progress.getWindow().setBackgroundDrawable(d);
@ -465,7 +466,7 @@ private static AssistantActivity instance;
remoteProvisioningInProgress = true;
progress = ProgressDialog.show(this, null, null);
Drawable d = new ColorDrawable(getResources().getColor(R.color.colorE));
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorE));
d.setAlpha(200);
progress.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
progress.getWindow().setBackgroundDrawable(d);

2
src/org/linphone/assistant/CreateAccountActivationFragment.java
View file

@ -38,7 +38,7 @@ import de.timroes.axmlrpc.XMLRPCServerException;
* @author Sylvain Berfini
*/
public class CreateAccountActivationFragment extends Fragment {
private String username, password, domain;
private String username, password;
private Handler mHandler = new Handler();
private Button checkAccount;

7
src/org/linphone/assistant/CreateAccountFragment.java
View file

@ -63,11 +63,6 @@ public class CreateAccountFragment extends Fragment {
private boolean confirmPasswordOk = false;
private Button createAccount;
private final Pattern UPPER_CASE_REGEX = Pattern.compile("[A-Z]");
private char[] acceptedChars = new char[]{ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '_', '-' };
private char[] acceptedCharsForPhoneNumbers = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '+' };
private String inputFilterCharacters;
private String getUsername() {
String username = usernameEdit.getText().toString();
@ -96,9 +91,7 @@ public class CreateAccountFragment extends Fragment {
addXMLRPCUsernameHandler(usernameEdit, null);
inputFilterCharacters = new String(acceptedChars);
if (getResources().getBoolean(R.bool.allow_only_phone_numbers_in_wizard)) {
inputFilterCharacters = new String(acceptedCharsForPhoneNumbers);
usernameEdit.setInputType(InputType.TYPE_CLASS_NUMBER);
}

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

@ -36,6 +36,7 @@ import android.database.Cursor;
import android.graphics.Bitmap;
import android.media.AudioManager;
import android.net.Uri;
import android.os.PowerManager;
import android.preference.Preference;
import android.provider.Settings;
import android.view.ViewTreeObserver;
@ -344,4 +345,13 @@ public class Compatibility {
}
return true;
}
@SuppressWarnings("deprecation")
public static boolean isScreenOn(PowerManager pm) {
if (Version.sdkAboveOrEqual(20)) {
return pm.isInteractive();
} else {
return pm.isScreenOn();
}
}
}

1
src/org/linphone/purchase/InAppPurchaseActivity.java
View file

@ -39,7 +39,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;

1
src/org/linphone/ui/BubbleChat.java
View file

@ -29,7 +29,6 @@ import java.util.Map.Entry;
import org.linphone.LinphoneActivity;
import org.linphone.LinphoneContact;
import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences;
import org.linphone.LinphoneUtils;
import org.linphone.R;
import org.linphone.core.LinphoneBuffer;

1
src/org/linphone/ui/LinphoneOverlay.java
View file

@ -12,7 +12,6 @@ import android.content.Intent;
import android.graphics.PixelFormat;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.view.DragEvent;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.SurfaceView;

2
src/org/linphone/ui/LinphoneSliders.java
View file

@ -1,7 +1,5 @@
package org.linphone.ui;
import org.linphone.R;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;

1
src/org/linphone/ui/SlidingDrawer.java
View file

@ -160,6 +160,7 @@ public class SlidingDrawer extends ViewGroup {
* @param defStyle
* The style to apply to this widget.
*/
@SuppressWarnings("deprecation")
public SlidingDrawer(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
TypedArray a = context.obtainStyledAttributes(attrs,