* #38301: update copyrights
This commit also fixes minor indent errors and remove unused class
AnimationManager.
diff --git a/src/org/sflphone/account/AccountDetailAdvanced.java b/src/org/sflphone/account/AccountDetailAdvanced.java
index d04f968..9ba4cb3 100644
--- a/src/org/sflphone/account/AccountDetailAdvanced.java
+++ b/src/org/sflphone/account/AccountDetailAdvanced.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/src/org/sflphone/account/AccountDetailBasic.java b/src/org/sflphone/account/AccountDetailBasic.java
index 41f4587..c867258 100644
--- a/src/org/sflphone/account/AccountDetailBasic.java
+++ b/src/org/sflphone/account/AccountDetailBasic.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/src/org/sflphone/account/AccountDetailSrtp.java b/src/org/sflphone/account/AccountDetailSrtp.java
index 49accb5..8c840a4 100644
--- a/src/org/sflphone/account/AccountDetailSrtp.java
+++ b/src/org/sflphone/account/AccountDetailSrtp.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/src/org/sflphone/account/AccountDetailTls.java b/src/org/sflphone/account/AccountDetailTls.java
index 7b49c70..e3385a9 100644
--- a/src/org/sflphone/account/AccountDetailTls.java
+++ b/src/org/sflphone/account/AccountDetailTls.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/src/org/sflphone/adapters/ContactPictureTask.java b/src/org/sflphone/adapters/ContactPictureTask.java
index 52ec944..2a4f373 100644
--- a/src/org/sflphone/adapters/ContactPictureTask.java
+++ b/src/org/sflphone/adapters/ContactPictureTask.java
@@ -68,6 +68,8 @@
}
public static Bitmap loadContactPhoto(ContentResolver cr, long id) {
+ if(id == -1)
+ return null;
Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, id);
InputStream input = ContactsContract.Contacts.openContactPhotoInputStream(cr, uri, true);
if (input == null) {
diff --git a/src/org/sflphone/client/HomeActivity.java b/src/org/sflphone/client/HomeActivity.java
index e599aa2..694bfd0 100644
--- a/src/org/sflphone/client/HomeActivity.java
+++ b/src/org/sflphone/client/HomeActivity.java
@@ -40,6 +40,7 @@
import java.util.Timer;
import java.util.TimerTask;
+import android.support.v4.app.*;
import org.sflphone.R;
import org.sflphone.fragments.AboutFragment;
import org.sflphone.fragments.AccountsManagementFragment;
@@ -79,10 +80,6 @@
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.SipAddress;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentManager.BackStackEntry;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
@@ -105,7 +102,7 @@
private ISipService service;
public static final int REQUEST_CODE_PREFERENCES = 1;
- private static final int REQUEST_CODE_CALL = 2;
+ private static final int REQUEST_CODE_CALL = 3;
SlidingUpPanelLayout mContactDrawer;
private DrawerLayout mNavigationDrawer;
@@ -194,10 +191,10 @@
getActionBar().setHomeButtonEnabled(true);
mDrawerToggle = new ActionBarDrawerToggle(this, /* host Activity */
- mNavigationDrawer, /* DrawerLayout object */
- R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
- R.string.drawer_open, /* "open drawer" description for accessibility */
- R.string.drawer_close /* "close drawer" description for accessibility */
+ mNavigationDrawer, /* DrawerLayout object */
+ R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
+ R.string.drawer_open, /* "open drawer" description for accessibility */
+ R.string.drawer_close /* "close drawer" description for accessibility */
) {
@Override
public void onDrawerClosed(View view) {
@@ -351,7 +348,7 @@
BackStackEntry entry = getSupportFragmentManager().getBackStackEntryAt(0);
fContent = getSupportFragmentManager().findFragmentByTag(entry.getName());
FragmentManager fm = getSupportFragmentManager();
- for(int i = 0; i < fm.getBackStackEntryCount() - 1; ++i) {
+ for (int i = 0; i < fm.getBackStackEntryCount() - 1; ++i) {
fm.popBackStack();
}
}
@@ -392,7 +389,9 @@
// overridePendingTransition(R.anim.slide_down, R.anim.slide_up);
}
- /** Defines callbacks for service binding, passed to bindService() */
+ /**
+ * Defines callbacks for service binding, passed to bindService()
+ */
private ServiceConnection mConnection = new ServiceConnection() {
@Override
@@ -439,15 +438,16 @@
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
- case REQUEST_CODE_PREFERENCES:
- if (fMenu != null)
- fMenu.updateAllAccounts();
- break;
- case REQUEST_CODE_CALL:
- if (resultCode == CallActivity.RESULT_FAILURE) {
- Log.w(TAG, "Call Failed");
- }
- break;
+ case REQUEST_CODE_PREFERENCES:
+ case AccountsManagementFragment.ACCOUNT_EDIT_REQUEST:
+ if (fMenu != null)
+ fMenu.updateAllAccounts();
+ break;
+ case REQUEST_CODE_CALL:
+ if (resultCode == CallActivity.RESULT_FAILURE) {
+ Log.w(TAG, "Call Failed");
+ }
+ break;
}
}
@@ -516,8 +516,8 @@
getActionBar().show();
Thread launcher = new Thread(new Runnable() {
- final String[] CONTACTS_PHONES_PROJECTION = new String[] { Phone.NUMBER, Phone.TYPE };
- final String[] CONTACTS_SIP_PROJECTION = new String[] { SipAddress.SIP_ADDRESS, SipAddress.TYPE };
+ final String[] CONTACTS_PHONES_PROJECTION = new String[]{Phone.NUMBER, Phone.TYPE};
+ final String[] CONTACTS_SIP_PROJECTION = new String[]{SipAddress.SIP_ADDRESS, SipAddress.TYPE};
@Override
public void run() {
@@ -607,10 +607,10 @@
ownerActivity.startActivityForResult(in, HomeActivity.REQUEST_CODE_PREFERENCES);
}
}).setNegativeButton(getResources().getString(android.R.string.cancel), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
- dialog.dismiss();
- }
- });
+ public void onClick(DialogInterface dialog, int whichButton) {
+ dialog.dismiss();
+ }
+ });
AlertDialog alertDialog = builder.create();
alertDialog.setOwnerActivity(ownerActivity);
@@ -680,33 +680,36 @@
@Override
public void onSectionSelected(int pos) {
- switch (pos) {
- case 0:
-
- if (fContent instanceof HomeFragment)
- break;
-
- if (getSupportFragmentManager().getBackStackEntryCount() == 1)
- break;
-
- popCustomBackStack();
-
- break;
- case 1:
- if (fContent instanceof AccountsManagementFragment)
- break;
- fContent = new AccountsManagementFragment();
- getSupportFragmentManager().beginTransaction().replace(R.id.main_frame, fContent, "Accounts").addToBackStack("Accounts").commit();
- break;
- case 2:
- if (fContent instanceof AboutFragment)
- break;
- fContent = new AboutFragment();
- getSupportFragmentManager().beginTransaction().replace(R.id.main_frame, fContent, "About").addToBackStack("About").commit();
- break;
- }
mNavigationDrawer.closeDrawers();
+
+ switch (pos) {
+ case 0:
+
+ if (fContent instanceof HomeFragment)
+ break;
+
+ if (getSupportFragmentManager().getBackStackEntryCount() == 1)
+ break;
+
+ popCustomBackStack();
+
+ break;
+ case 1:
+ if (fContent instanceof AccountsManagementFragment)
+ break;
+ fContent = new AccountsManagementFragment();
+ getSupportFragmentManager().beginTransaction().setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE).replace(R.id.main_frame, fContent, "Accounts").addToBackStack("Accounts").commit();
+ break;
+ case 2:
+ if (fContent instanceof AboutFragment)
+ break;
+ fContent = new AboutFragment();
+ getSupportFragmentManager().beginTransaction().setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE).replace(R.id.main_frame, fContent, "About").addToBackStack("About").commit();
+ break;
+ }
+
+
}
}
diff --git a/src/org/sflphone/service/ConfigurationManagerCallback.java b/src/org/sflphone/service/ConfigurationManagerCallback.java
index 6cdd0f7..5d4efc1 100644
--- a/src/org/sflphone/service/ConfigurationManagerCallback.java
+++ b/src/org/sflphone/service/ConfigurationManagerCallback.java
@@ -1,6 +1,6 @@
/**
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/src/org/sflphone/utils/AnimationManager.java b/src/org/sflphone/utils/AnimationManager.java
deleted file mode 100644
index 9772847..0000000
--- a/src/org/sflphone/utils/AnimationManager.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.sflphone.utils;
-
-import android.animation.ObjectAnimator;
-import android.view.View;
-
-public class AnimationManager {
-
- public static ObjectAnimator slideOutDownAnimator(View toAnim, float height) {
-// ObjectAnimator outAnim = ObjectAnimator.ofFloat(toAnim, "y", 0, height);
- ObjectAnimator outAnim = new ObjectAnimator();
- outAnim.setDuration(500);
- outAnim.setPropertyName("y");
- outAnim.setFloatValues(0, height);
- return null;
- }
-
-}