fixed majority of java-related warnings
diff --git a/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java b/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java
index ded776c..2a99448 100644
--- a/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java
@@ -82,6 +82,7 @@
private boolean isDifferent = false;
+ @SuppressWarnings("deprecation")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/src/com/savoirfairelinux/sflphone/client/AccountWizard.java b/src/com/savoirfairelinux/sflphone/client/AccountWizard.java
index 6218ab9..129a6bf 100644
--- a/src/com/savoirfairelinux/sflphone/client/AccountWizard.java
+++ b/src/com/savoirfairelinux/sflphone/client/AccountWizard.java
@@ -32,16 +32,14 @@
package com.savoirfairelinux.sflphone.client;
import java.util.ArrayList;
+import java.util.Locale;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.ServiceConnection;
import android.os.Bundle;
-import android.os.IBinder;
import android.support.v13.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.Log;
@@ -50,8 +48,6 @@
import com.savoirfairelinux.sflphone.R;
import com.savoirfairelinux.sflphone.fragments.AccountCreationFragment;
import com.savoirfairelinux.sflphone.interfaces.AccountsInterface;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.SipService;
public class AccountWizard extends Activity implements AccountsInterface {
static final String TAG = "AccountWizard";
@@ -59,7 +55,6 @@
public static final int ACCOUNT_CREATED = Activity.RESULT_OK;
ViewPager mViewPager;
- private ISipService service;
private SectionsPagerAdapter mSectionsPagerAdapter;
@Override
@@ -71,40 +66,17 @@
getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setHomeButtonEnabled(true);
-
- Intent intent = new Intent(this, SipService.class);
- bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+ mSectionsPagerAdapter = new SectionsPagerAdapter(AccountWizard.this, getFragmentManager());
+ mViewPager.setAdapter(mSectionsPagerAdapter);
}
/* activity finishes itself or is being killed by the system */
@Override
protected void onDestroy() {
- /* stop the service, if no other bound user, no need to check if it is running */
-
- unbindService(mConnection);
-
super.onDestroy();
}
- /** Defines callbacks for service binding, passed to bindService() */
- private ServiceConnection mConnection = new ServiceConnection() {
-
- @Override
- public void onServiceConnected(ComponentName className, IBinder binder) {
- service = ISipService.Stub.asInterface(binder);
-
- mSectionsPagerAdapter = new SectionsPagerAdapter(AccountWizard.this, getFragmentManager());
- mViewPager.setAdapter(mSectionsPagerAdapter);
-
- }
-
- @Override
- public void onServiceDisconnected(ComponentName arg0) {
-
- }
- };
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -178,7 +150,7 @@
public CharSequence getPageTitle(int position) {
switch (position) {
case 0:
- return mContext.getString(R.string.title_section0).toUpperCase();
+ return mContext.getString(R.string.title_section0).toUpperCase(Locale.getDefault());
default:
Log.e(TAG, "getPageTitle: unknown tab position " + position);
break;
diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index d66fecd..d92b53f 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -33,7 +33,6 @@
package com.savoirfairelinux.sflphone.client;
-import java.util.ArrayList;
import java.util.HashMap;
import android.app.Activity;
@@ -264,6 +263,7 @@
}
+ @SuppressWarnings("unchecked") // No proper solution with HashMap runtime cast
public void processCallStateChangedSignal(String callID, String newState) {
/*
* Bundle bundle = intent.getBundleExtra("com.savoirfairelinux.sflphone.service.newstate"); String callID = bundle.getString("CallID"); String
@@ -285,8 +285,8 @@
}
if (callMap.size() > 0) {
- ArrayList<SipCall> calls = new ArrayList<SipCall>(callMap.values());
- HashMap<String, String> details = (HashMap<String, String>) service.getCallDetails(calls.get(0).getCallId());
+// ArrayList<SipCall> calls = new ArrayList<SipCall>(callMap.values());
+// HashMap<String, String> details = (HashMap<String, String>) service.getCallDetails(calls.get(0).getCallId());
}
} catch (RemoteException e) {
@@ -317,6 +317,7 @@
if (mCurrentCallFragment == null || mCurrentCallFragment.getBubbleView() == null) {
return;
}
+ mHandler.removeCallbacks(mUpdateTimeTask);
mCurrentCallFragment.getBubbleView().stopThread();
mCurrentCallFragment = new CallFragment();
Bundle b = new Bundle();
@@ -492,6 +493,7 @@
@Override
public void replaceCurrentCallDisplayed() {
+ mHandler.removeCallbacks(mUpdateTimeTask);
mCurrentCallFragment.getBubbleView().stopThread();
getFragmentManager().beginTransaction().remove(mCurrentCallFragment).commit();
mCurrentCallFragment = null;
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
index 53a6c6e..43c450e 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
@@ -200,13 +200,6 @@
// mTabHost = (TabHost) findViewById(android.R.id.tabhost);
mDrawerLayout.setDrawerListener(mDrawerToggle);
- mViewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
- @Override
- public void onPageSelected(int position) {
- // mTabHost.setCurrentTab(position);
- }
- });
-
}
@Override
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
index f657702..86f21fc 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
@@ -31,6 +31,8 @@
package com.savoirfairelinux.sflphone.client;
+import java.util.Locale;
+
import android.app.ActionBar;
import android.app.Activity;
import android.app.Fragment;
@@ -49,7 +51,6 @@
import com.savoirfairelinux.sflphone.R;
import com.savoirfairelinux.sflphone.fragments.AccountManagementFragment;
-import com.savoirfairelinux.sflphone.fragments.AudioManagementFragment;
import com.savoirfairelinux.sflphone.service.ISipService;
import com.savoirfairelinux.sflphone.service.SipService;
@@ -198,7 +199,7 @@
public CharSequence getPageTitle(int position) {
switch (position) {
case 0:
- return getString(R.string.preference_section1).toUpperCase();
+ return getString(R.string.preference_section1).toUpperCase(Locale.getDefault());
// case 1:
// return getString(R.string.preference_section2).toUpperCase();
default:
diff --git a/src/com/savoirfairelinux/sflphone/client/ZoomOutPageTransformer.java b/src/com/savoirfairelinux/sflphone/client/ZoomOutPageTransformer.java
index b48844c..9faabd0 100644
--- a/src/com/savoirfairelinux/sflphone/client/ZoomOutPageTransformer.java
+++ b/src/com/savoirfairelinux/sflphone/client/ZoomOutPageTransformer.java
@@ -5,11 +5,11 @@
public class ZoomOutPageTransformer implements ViewPager.PageTransformer {
private static final float MIN_ALPHA = .6f;
- private final float scalingStart;
+// private final float scalingStart;
public ZoomOutPageTransformer(float scalingStart) {
super();
- this.scalingStart = 1 - scalingStart;
+// this.scalingStart = 1 - scalingStart;
}
@Override