diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml
index 5153147164f936f2636a62b7943d84687bafd561..a0409cdd317d5784a1011b82592284268e77f9ec 100644
--- a/ring-android/app/src/main/AndroidManifest.xml
+++ b/ring-android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Adrien Beraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
index e8bb56a2e50d03582452d36575122efa398a22a8..a924e5a3633eb0485d14e7fab8afc98e74d1cc21 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.adapters;
@@ -50,10 +40,10 @@ public class AccountSelectionAdapter extends BaseAdapter {
private static final String TAG = AccountSelectionAdapter.class.getSimpleName();
- List<Account> accounts;
- Context mContext;
- int selectedAccount = -1;
- static final String DEFAULT_ACCOUNT_ID = "IP2IP";
+ private List<Account> accounts;
+ private Context mContext;
+ private int selectedAccount = -1;
+ private static final String DEFAULT_ACCOUNT_ID = "IP2IP";
public AccountSelectionAdapter(Context cont, List<Account> newList) {
super();
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java
index 461930c330cb3757127c0f315bd0f3a55519e59f..5f31e31ff8f5544f757a465b887d7742013086f9 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/ContactPictureTask.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.adapters;
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
index 1597065a0029d7b1a0cc69ded93893eab58f21a0..8913f80f0b2a8a693dc73a13170855c12721080e 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
index 39afc2b916a430eba62a3eab671edaa2c7c20bed..ed50c6759ea2f24a3329f6141e20fcee90a5d678 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
index 5d3c11fbf105fb90cd4b44fc40cee0348e88d617..f1e93e280baa1636f3b437df23c4eed299ba7acf 100644
--- a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Alexandre Savard <alexandre.savard@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountWizard.java b/ring-android/app/src/main/java/cx/ring/client/AccountWizard.java
index b0dd739958bff88f91b6594b978e36cd5c7a4498..58ed1ef6db49e572c8a8835d1e96ebed5ade28d2 100644
--- a/ring-android/app/src/main/java/cx/ring/client/AccountWizard.java
+++ b/ring-android/app/src/main/java/cx/ring/client/AccountWizard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/client/CallActivity.java b/ring-android/app/src/main/java/cx/ring/client/CallActivity.java
index c4d2fd0a6e00d4389ef2ae5407ef0fe1fca9934e..55d5d318f9f388275b2f38d14fab45aaadc50a02 100644
--- a/ring-android/app/src/main/java/cx/ring/client/CallActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/CallActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
index ff024cc1f76b98b41e8d4bf5cc657b98d0f8bdb9..40698f481081a683604b92b193feecc0c9b40191 100644
--- a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/client/DetailHistoryActivity.java b/ring-android/app/src/main/java/cx/ring/client/DetailHistoryActivity.java
deleted file mode 100644
index c3d37d8c2906824ea8b0b2d8bf731be2b44228eb..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/client/DetailHistoryActivity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.client;
-
-import cx.ring.R;
-import cx.ring.fragments.DetailsHistoryEntryFragment;
-import cx.ring.fragments.HistoryFragment;
-import cx.ring.model.Conference;
-import cx.ring.model.SipCall;
-import cx.ring.service.DRingService;
-import cx.ring.service.IDRingService;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-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.util.Log;
-import android.view.MenuItem;
-
-public class DetailHistoryActivity extends Activity implements DetailsHistoryEntryFragment.Callbacks {
-
- private boolean mBound = false;
- private IDRingService service;
- private String TAG = DetailHistoryActivity.class.getSimpleName();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_holder);
-
- Intent intent = new Intent(this, DRingService.class);
- bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
- getActionBar().setDisplayHomeAsUpEnabled(true);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
- default:
- return true;
- }
- }
-
- @Override
- public IDRingService getService() {
- return service;
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- if (mBound) {
- unbindService(mConnection);
- mBound = false;
- }
- }
-
- /** Defines callbacks for service binding, passed to bindService() */
- private ServiceConnection mConnection = new ServiceConnection() {
-
- @Override
- public void onServiceConnected(ComponentName className, IBinder binder) {
- service = IDRingService.Stub.asInterface(binder);
-
- FragmentTransaction ft = getFragmentManager().beginTransaction();
-
- Fragment fr = new DetailsHistoryEntryFragment();
- fr.setArguments(getIntent().getBundleExtra(HistoryFragment.ARGS));
- ft.replace(R.id.frag_container, fr);
-
- ft.commit();
-
- mBound = true;
- Log.d(TAG, "Service connected service=" + service);
-
- }
-
- @Override
- public void onServiceDisconnected(ComponentName arg0) {
-
- mBound = false;
- Log.d(TAG, "Service disconnected service=" + service);
- }
- };
-
- @Override
- public void onCall(String account_id, String number) {
- /*Bundle bundle = new Bundle();
- Conference tmp = new Conference(Conference.DEFAULT_ID);
-
- tmp.getParticipants().add(call);
-
- bundle.putParcelable("conference", tmp);
- Intent intent = new Intent().setClass(this, CallActivity.class);
- intent.putExtra("resuming", false);
- intent.putExtras(bundle);
- startActivity(intent);*/
- }
-}
\ No newline at end of file
diff --git a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
index feaea584b1fb70ce4ce4e8d238dae24d5703ecd2..ebf83819e51f1f86a693f937a9c01e5dcc5bff55 100644
--- a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/HomeActivity.java
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
- * Author: Adrien Beraud <adrien.beraud@gmail.com>
+ * Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.client;
@@ -46,14 +35,9 @@ import cx.ring.fragments.AccountsManagementFragment;
import cx.ring.fragments.CallListFragment;
import cx.ring.fragments.ContactListFragment;
import cx.ring.fragments.DialingFragment;
-import cx.ring.fragments.HistoryFragment;
import cx.ring.fragments.MenuFragment;
import cx.ring.fragments.SettingsFragment;
-import cx.ring.history.HistoryEntry;
import cx.ring.model.CallContact;
-import cx.ring.model.account.Account;
-import cx.ring.model.Conference;
-import cx.ring.model.SipCall;
import cx.ring.service.IDRingService;
import cx.ring.service.LocalService;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
index a239cc46a380c3f133760bfd51f34f19288aa1b7..691b2deddb3a999028d1589e1d20d8bc695a47ae 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
index a5fefd4e63cdf3c74443befbd2cc2a5c6d2e2be1..01c88d360c367864e5ad34f555ebceda741d5876 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
index 0a9c7ae69132e17e7c85f71531df83ff89012f84..9d30b38ce60a1475479d0776db2c9a53aec12080 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
index a9d470018a22dba6c6fd2b2d56bf9f1f630f2f4a..2c8d31edf49163d9125724de22993580eecca37f 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
index 8eb07553afc6c7e78029804b1bbd61f4e0a09fe4..1f0dbb5485a40ebb96215ebdf0ad12aa98a05b18 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -22,14 +22,11 @@
package cx.ring.fragments;
import android.app.Activity;
-import android.graphics.Color;
import android.media.AudioManager;
import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.PowerManager;
@@ -40,7 +37,6 @@ import android.util.Log;
import android.view.*;
import android.view.View.OnClickListener;
import android.widget.*;
-import android.widget.CompoundButton.OnCheckedChangeListener;
import cx.ring.R;
import cx.ring.adapters.ContactPictureTask;
import cx.ring.client.ConversationActivity;
@@ -53,8 +49,6 @@ import cx.ring.model.CallContact;
import cx.ring.model.Conference;
import cx.ring.model.SecureSipCall;
import cx.ring.model.SipCall;
-import cx.ring.model.account.Account;
-import cx.ring.service.DRingService;
import cx.ring.service.LocalService;
public class CallFragment extends CallableWrapperFragment implements CallInterface {
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
index a14524b1a8cab86e90cdd490fc4ba9c99e8e71f8..dd584e957be76271da2c437feed6492333943d77 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallListFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java
index 1a083a3f64a00208759a00017025b104e4ebaac2..8d211570554110791a4700b4e8d90a33e9d0c9b3 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallableWrapperFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
index 7e2e761f7769891ba15d0a073c6a0f839f89b4c8..ea17d84a91188d63c994766112e52efc6daa83e8 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ContactListFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java
index 8a9ece3621c230ce9635c84d1be9808fce01754d..a3edace3a0f6b437064a217370d7eb8a733afc5f 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/DetailsHistoryEntryFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java
index a4a22b993cb87181169908d45b42c602f0f00d95..112deea381f6c7427004129148921664cf42e7fb 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/DialingFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java b/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java
index 9dd2ebc72e518cc7d50ae8332ea8aed1bb076e6f..aa612595c64665ad3554c60d22cc358cb04f23cc 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/DropActionsChoice.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
index d03f53ade1b0a841b73654ea8f4ec49e279fd29f..ad36504ab2a5d587c706849be6732cdf4b69c9f0 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/HistoryFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/HistoryFragment.java
deleted file mode 100644
index 6b050550c6c792834767e71b811a781b878e631f..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/fragments/HistoryFragment.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-package cx.ring.fragments;
-
-import java.util.ArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import android.app.ListFragment;
-import android.app.LoaderManager;
-import android.content.AsyncTaskLoader;
-import android.content.Loader;
-import android.view.*;
-import cx.ring.R;
-import cx.ring.adapters.ContactPictureTask;
-import cx.ring.client.DetailHistoryActivity;
-import cx.ring.history.HistoryManager;
-import cx.ring.loaders.HistoryLoader;
-import cx.ring.loaders.LoaderConstants;
-import cx.ring.history.HistoryEntry;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-public class HistoryFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<HistoryEntry>>
-{
-
- private static final String TAG = HistoryFragment.class.getSimpleName();
-
- HistoryAdapter mAdapter;
- private Callbacks mCallbacks = sDummyCallbacks;
- HistoryManager mHistoryManager;
-
- public interface Callbacks {
- void onCallHistory(HistoryEntry to);
- }
- private static final Callbacks sDummyCallbacks = new Callbacks() {
- @Override
- public void onCallHistory(HistoryEntry to) {}
- };
-
- public static String ARGS = "Bundle.args";
-
-
- @Override
- public void onAttach(Activity activity) {
- Log.i(TAG, "Attaching HISTORY");
- super.onAttach(activity);
-
- if (!(activity instanceof Callbacks)) {
- throw new IllegalStateException("Activity must implement fragment's callbacks.");
- }
-
- mCallbacks = (Callbacks) activity;
-
- }
-
- @Override
- public void onDetach() {
- super.onDetach();
- mCallbacks = sDummyCallbacks;
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.history, menu);
- mHistoryManager = new HistoryManager(getActivity());
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_clear_history:
- // TODO clean Database!
- mHistoryManager.clearDB();
- getLoaderManager().restartLoader(LoaderConstants.HISTORY_LOADER, null, this);
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mAdapter = new HistoryAdapter(getActivity(), new ArrayList<HistoryEntry>());
- setHasOptionsMenu(true);
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
- View inflatedView = inflater.inflate(R.layout.frag_history, parent, false);
-
- return inflatedView;
- }
-
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
-
- super.onActivityCreated(savedInstanceState);
- getListView().setAdapter(mAdapter);
-
- getListView().setOnItemClickListener(new OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView<?> arg0, View arg1, int pos, long arg3) {
-
- Bundle b = new Bundle();
- b.putParcelable("entry", mAdapter.getItem(pos));
- Intent toStart = new Intent(getActivity(), DetailHistoryActivity.class).putExtra(HistoryFragment.ARGS, b);
- startActivity(toStart);
-
- }
- });
- }
-
- @Override
- public void onStart() {
- super.onStart();
- Log.w(TAG, "onStart");
- getLoaderManager().restartLoader(LoaderConstants.HISTORY_LOADER, null, this);
- }
-
- public void makeNewCall(int position) {
- mCallbacks.onCallHistory(mAdapter.getItem(position));
- }
-
- public class HistoryAdapter extends BaseAdapter implements ListAdapter {
-
- Context mContext;
- ArrayList<HistoryEntry> dataset;
- private ExecutorService infos_fetcher = Executors.newCachedThreadPool();
-
- public HistoryAdapter(Context activity, ArrayList<HistoryEntry> history) {
- mContext = activity;
- dataset = history;
- }
-
- @Override
- public View getView(final int pos, View convertView, ViewGroup arg2) {
-
- HistoryView entryView;
-
- if (convertView == null) {
- // Get a new instance of the row layout view
- LayoutInflater inflater = LayoutInflater.from(mContext);
- convertView = inflater.inflate(R.layout.item_history, null);
-
- // Hold the view objects in an object
- // so they don't need to be re-fetched
- entryView = new HistoryView();
- entryView.photo = (ImageButton) convertView.findViewById(R.id.photo);
- entryView.displayName = (TextView) convertView.findViewById(R.id.display_name);
- entryView.date = (TextView) convertView.findViewById(R.id.date_start);
- entryView.incoming = (TextView) convertView.findViewById(R.id.incomings);
- entryView.outgoing = (TextView) convertView.findViewById(R.id.outgoings);
- entryView.replay = (Button) convertView.findViewById(R.id.replay);
- convertView.setTag(entryView);
- } else {
- entryView = (HistoryView) convertView.getTag();
- }
-
- // Transfer the stock data from the data object
- // to the view objects
-
- // SipCall call = (SipCall) mCallList.values().toArray()[position];
- entryView.displayName.setText(dataset.get(pos).getContact().getDisplayName());
- infos_fetcher.execute(new ContactPictureTask(mContext, entryView.photo, dataset.get(pos).getContact()));
-
- entryView.incoming.setText(getString(R.string.hist_in_calls, dataset.get(pos).getIncomingSum()));
- entryView.outgoing.setText(getString(R.string.hist_out_calls, dataset.get(pos).getOutgoingSum()));
-
- /*if (dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath().length() > 0) {
- entryView.replay.setVisibility(View.VISIBLE);
- entryView.replay.setTag(R.id.replay, true);
- entryView.replay.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- try {
- if ((Boolean) v.getTag(R.id.replay)) {
- mCallbacks.getService().startRecordedFilePlayback(dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath());
- v.setTag(R.id.replay, false);
- ((Button) v).setText(getString(R.string.hist_replay_button_stop));
- } else {
- mCallbacks.getService().stopRecordedFilePlayback(dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath());
- v.setTag(R.id.replay, true);
- ((Button) v).setText(getString(R.string.hist_replay_button));
- }
- } catch (RemoteException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- });
- }*/
-
- /*entryView.date.setText(dataset.get(pos).getCalls().lastEntry().getValue().getDate());*/
- entryView.photo.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- makeNewCall(pos);
-
- }
- });
-
- return convertView;
-
- }
-
- /**
- * ******************
- * ViewHolder Pattern
- * *******************
- */
- public class HistoryView {
- public ImageButton photo;
- protected TextView displayName;
- protected TextView date;
- private Button replay;
- private TextView outgoing;
- private TextView incoming;
- }
-
- @Override
- public int getCount() {
-
- return dataset.size();
- }
-
- @Override
- public HistoryEntry getItem(int pos) {
- return dataset.get(pos);
- }
-
- @Override
- public long getItemId(int arg0) {
- return 0;
- }
-
- public void clear() {
- dataset.clear();
-
- }
-
- public void addAll(ArrayList<HistoryEntry> history) {
- dataset.addAll(history);
- }
-
- }
-
- @Override
- public AsyncTaskLoader<ArrayList<HistoryEntry>> onCreateLoader(int arg0, Bundle arg1) {
- HistoryLoader loader = new HistoryLoader(getActivity());
- loader.forceLoad();
- return loader;
- }
-
- @Override
- public void onLoadFinished(Loader<ArrayList<HistoryEntry>> arrayListLoader, ArrayList<HistoryEntry> historyEntries) {
- mAdapter.clear();
- mAdapter.addAll(historyEntries);
- mAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onLoaderReset(Loader<ArrayList<HistoryEntry>> arrayListLoader) {
-
- }
-
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java
index b30e8c50d2c20015bc66825957af3853e5236c77..78397771f4ed015642f153a9348c13f379c4e357 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/MenuFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java
index 0108955409672a83e5c62c9f8e713950b99d2e56..34d7d241ef8edf623cb6edf6d99dea492e672170 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/NestedSettingsFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java
index f0399954034589230eca1589f37c2d8f42f82915..1bc9699fa9a525de3497318cd86b38a33ab7633f 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
index db9cf0253112cca7ef2f86b2b3bfae797f05a1fe..571c86fe6e9fc87f9c292fb52490846d927afb10 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/TransferDFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
diff --git a/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java b/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java
index 7f5e491bb2bd386fda1656d0782a9bea00cac341..bb7b4cca7af1b8cd53536352fa779c5730145063 100644
--- a/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java
+++ b/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/ring-android/app/src/main/java/cx/ring/history/HistoryCall.java b/ring-android/app/src/main/java/cx/ring/history/HistoryCall.java
index 6cf998b08818aad0cf8329581c55197c255e2760..c6bb0918c27e14e8f01063c7905409b6b243aab6 100644
--- a/ring-android/app/src/main/java/cx/ring/history/HistoryCall.java
+++ b/ring-android/app/src/main/java/cx/ring/history/HistoryCall.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
diff --git a/ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java b/ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java
index d108de99a57106dad8d8d63a416108becb1af9db..6b3efb10e4f59fa3f487f4cc95c3ae8a6337d00d 100644
--- a/ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java
+++ b/ring-android/app/src/main/java/cx/ring/history/HistoryEntry.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.history;
diff --git a/ring-android/app/src/main/java/cx/ring/history/HistoryManager.java b/ring-android/app/src/main/java/cx/ring/history/HistoryManager.java
index 07355c29b6df5c359e0a737d9a9138a55939d781..86a26be0c17c0adefaf866ac46516978f6e369e9 100644
--- a/ring-android/app/src/main/java/cx/ring/history/HistoryManager.java
+++ b/ring-android/app/src/main/java/cx/ring/history/HistoryManager.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.history;
diff --git a/ring-android/app/src/main/java/cx/ring/history/HistoryText.java b/ring-android/app/src/main/java/cx/ring/history/HistoryText.java
index 5230f669eceb30a345426382782cb9abff7b2c8a..e43c72e9704c20f2266f37d73e751fb0fab8b0f8 100644
--- a/ring-android/app/src/main/java/cx/ring/history/HistoryText.java
+++ b/ring-android/app/src/main/java/cx/ring/history/HistoryText.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,20 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
-
package cx.ring.history;
import android.os.Parcel;
diff --git a/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java b/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java
index e4416471949bb0224b993661ced0d75941d2c826..22d563e8479dfea80636e65da8ce70496b0bb5a2 100644
--- a/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java
+++ b/ring-android/app/src/main/java/cx/ring/interfaces/AccountsInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.interfaces;
diff --git a/ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java b/ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java
index 2e3aa7a4bcfe2a5d169cd14632b0e5001c3df04e..cd12b5930c22859f703966ccd6b482b2f9a72240 100644
--- a/ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java
+++ b/ring-android/app/src/main/java/cx/ring/interfaces/CallInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java
index 3c94e0898fd8796c054d8a3bba63bd8413e2b1dc..75d5c0f44e37a55e1f96a27c3bc8af35e42dd877 100644
--- a/ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java
+++ b/ring-android/app/src/main/java/cx/ring/loaders/AccountsLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.loaders;
diff --git a/ring-android/app/src/main/java/cx/ring/loaders/AccountsStateLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/AccountsStateLoader.java
index 14a40fb3a05c8e4e9a642bdb126605cc5cc13581..37788ad47358d8f28035f3585be25e6be42a8829 100644
--- a/ring-android/app/src/main/java/cx/ring/loaders/AccountsStateLoader.java
+++ b/ring-android/app/src/main/java/cx/ring/loaders/AccountsStateLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.loaders;
diff --git a/ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java
index 283887140e3d266418ca11482d4b0738bb38411c..ab6ed8ed1d89accc02ac7233430cdf5f0fb04554 100644
--- a/ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java
+++ b/ring-android/app/src/main/java/cx/ring/loaders/ContactsLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/loaders/HistoryLoader.java b/ring-android/app/src/main/java/cx/ring/loaders/HistoryLoader.java
deleted file mode 100644
index a7cebadbfbcffe0a5cecb17f48060ebda3cd8937..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/loaders/HistoryLoader.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.loaders;
-
-import android.content.AsyncTaskLoader;
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract;
-import cx.ring.history.HistoryCall;
-import cx.ring.history.HistoryEntry;
-import cx.ring.history.HistoryManager;
-import cx.ring.model.CallContact;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class HistoryLoader extends AsyncTaskLoader<ArrayList<HistoryEntry>> {
-
- private static final String TAG = HistoryLoader.class.getSimpleName();
-
- private HistoryManager historyManager = null;
-
- public HistoryLoader(Context context) {
- super(context);
- historyManager = new HistoryManager(context);
- }
-
- @SuppressWarnings("unchecked")
- // Hashmap runtime cast
- @Override
- public ArrayList<HistoryEntry> loadInBackground() {
-
- HashMap<String,HistoryEntry> historyEntries = new HashMap<>();
-
- try {
- List<HistoryCall> list = historyManager.getAll();
- for (HistoryCall call : list) {
- CallContact contact;
- if (call.getContactID() == CallContact.DEFAULT_ID) {
- contact = CallContact.buildUnknown(call.getNumber());
- } else {
- Cursor result = getContext().getContentResolver().query(ContactsContract.Contacts.CONTENT_URI, null,
- ContactsContract.Contacts._ID + " = ?",
- new String[]{String.valueOf(call.getContactID())}, null);
- int iID = result.getColumnIndex(ContactsContract.Contacts._ID);
- int iKey = result.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
- int iName = result.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
- int iPhoto = result.getColumnIndex(ContactsContract.Contacts.PHOTO_ID);
-
- if (result.moveToFirst()) {
- contact = new CallContact(result.getLong(iID), result.getString(iKey), result.getString(iName), result.getLong(iPhoto));
- contact.addPhoneNumber(call.getNumber());
- } else {
- contact = CallContact.buildUnknown(call.getNumber());
- }
- result.close();
- }
-
- if (historyEntries.containsKey(call.getNumber())) {
- // It's a direct match
- historyEntries.get(call.getNumber()).addHistoryCall(call, contact);
- } else {
- // Maybe we can extract the extension @ account pattern
- Pattern p = Pattern.compile("<sip:([^@]+)@([^>]+)>");
- Matcher m = p.matcher(call.getNumber());
- if (m.find()) {
-
- if (historyEntries.containsKey(m.group(1) + "@" + m.group(2))) {
- historyEntries.get(m.group(1) + "@" + m.group(2)).addHistoryCall(call, contact);
- } else {
- HistoryEntry e = new HistoryEntry(call.getAccountID(), contact);
- e.addHistoryCall(call, contact);
- historyEntries.put(m.group(1) + "@" + m.group(2), e);
- }
-
- } else {
- HistoryEntry e = new HistoryEntry(call.getAccountID(), contact);
- e.addHistoryCall(call, contact);
- historyEntries.put(call.getNumber(), e);
- }
-
- }
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
-
-/*
- try {
- ArrayList<HashMap<String, String>> history = (ArrayList<HashMap<String, String>>) service.getHistory();
-
- for (HashMap<String, String> entry : history) {
-
- CallContact contact;
- String contactName = entry.get(ServiceConstants.history.DISPLAY_NAME_KEY);
- String number_called = entry.get(ServiceConstants.history.PEER_NUMBER_KEY);
- if (contactName.isEmpty()) {
- contact = ContactBuilder.buildUnknown(number_called);
- } else {
- contact = ContactBuilder.getInstance().buildSimpleContact(contactName, number_called);
- }
-
- if (historyEntries.containsKey(number_called)) {
- // It's a direct match
- historyEntries.get(number_called).addHistoryCall(new HistoryCall(entry), contact);
- } else {
- // Maybe we can extract the extension @ account pattern
- Pattern p = Pattern.compile("<sip:([^@]+)@([^>]+)>");
- Matcher m = p.matcher(number_called);
- if (m.find()) {
-
- if (historyEntries.containsKey(m.group(1) + "@" + m.group(2))) {
- historyEntries.get(m.group(1) + "@" + m.group(2)).addHistoryCall(new HistoryCall(entry), contact);
- } else {
- HistoryEntry e = new HistoryEntry(entry.get(ServiceConstants.history.ACCOUNT_ID_KEY), contact);
- e.addHistoryCall(new HistoryCall(entry), contact);
- historyEntries.put(m.group(1) + "@" + m.group(2), e);
- }
-
- } else {
-
- HistoryEntry e = new HistoryEntry(entry.get(ServiceConstants.history.ACCOUNT_ID_KEY), contact);
- e.addHistoryCall(new HistoryCall(entry), contact);
- historyEntries.put(number_called, e);
- }
-
- }
-
- }
-
- } catch (RemoteException e) {
- Log.i(TAG, e.toString());
- }*/
- return new ArrayList<HistoryEntry>(historyEntries.values());
- }
-
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java b/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java
index 2f2b26ce65e3ad44c9265098bf21239c76f80d2f..a82a63818fe6435efc165f7f1dc88ecf02003eab 100644
--- a/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java
+++ b/ring-android/app/src/main/java/cx/ring/loaders/LoaderConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.loaders;
diff --git a/ring-android/app/src/main/java/cx/ring/model/Attractor.java b/ring-android/app/src/main/java/cx/ring/model/Attractor.java
deleted file mode 100644
index 8240c570122972b3c7583f38280c5503e435bfb9..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/model/Attractor.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Adrien Beraud <adrien.beraud@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.model;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.PointF;
-import android.graphics.RectF;
-
-public class Attractor {
-
- public interface Callback {
-
- /**
- * Called when a bubble is on the "active" zone of the attractor.
- *
- * @param b The bubble that is on the attractor.
- * @return true if the bubble should be removed from the model, false otherwise.
- */
- public boolean onBubbleSucked(Bubble b);
- }
-
- public enum Type {
- POINT, BORDER
- }
-
- final Callback callback;
- final Type type;
-
- private final RectF bounds = new RectF();
- private final RectF boundsScaled = new RectF();
- final PointF pos = new PointF();
- final float radius;
- private final Bitmap img;
- final String name;
-
- public Attractor(PointF pos, float size, Callback callback, Bitmap img) {
- this.type = Type.POINT;
- this.callback = callback;
- this.pos.set(pos);
- this.radius = size/2;
- this.img = img;
- this.name = null;
- setBounds();
- }
-
- public Attractor(PointF pos, float radius, Callback callback, Context c, int resId) {
- this(pos, radius, callback, BitmapFactory.decodeResource(c.getResources(), resId));
- }
-
- public Attractor(String name, float size, Callback callback, Bitmap img) {
- this.type = Type.POINT;
- this.name = name;
- this.callback = callback;
- this.radius = size/2;
- this.img = img;
- setBounds();
- }
-
- public void setSize(float w, float h)
- {
- if (type != Type.BORDER)
- return;
- pos.set(w, h);
- setBounds();
- }
-
- public void setPos(float x, float y) {
- pos.set(x, y);
- setBounds();
- }
-
- private void setBounds() {
- bounds.set(pos.x - radius, pos.y - radius, pos.x + radius, pos.y + radius);
- }
-
- public RectF getBounds() {
- return bounds;
- }
-
- public RectF getBounds(float scale) {
- float r = radius * scale;
- boundsScaled.set(pos.x - r, pos.y - r, pos.x + r, pos.y + r);
- return boundsScaled;
- }
-
- public RectF getBounds(float scale, PointF start, float d) {
- float r = radius * scale;
- float md = 1.f - d;
- float x = pos.x * d + start.x * md;
- float y = pos.y * d + start.y * md;
- boundsScaled.set(x - r, y - r, x + r, y + r);
- return boundsScaled;
- }
-
- public Bitmap getBitmap() {
- return img;
- }
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/model/Bubble.java b/ring-android/app/src/main/java/cx/ring/model/Bubble.java
deleted file mode 100644
index 3387427eb86f577a7cc3cac186e8fc3e7c6ab6f5..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/model/Bubble.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.model;
-
-import android.content.Context;
-import android.graphics.*;
-import android.graphics.Paint.Style;
-import cx.ring.R;
-import cx.ring.adapters.ContactPictureTask;
-
-public abstract class Bubble {
-
- protected PointF pos = new PointF();
- protected RectF bounds;
- private float targetScale = 1.f;
- protected float radius;
- protected float scale = .1f;
- public PointF speed = new PointF(0, 0);
- //public PointF last_speed = new PointF();
- public final PointF attractionPoint;
- public Attractor attractor = null;
-
- public boolean isUser;
-
- private boolean grabbed = false;
- private long lastDrag;
-
- public boolean markedToDie = false;
- //public long lastTime = System.nanoTime();
-
- // A Bitmap object that is going to be passed to the BitmapShader
- protected Bitmap externalBMP;
- protected Bitmap savedPhoto;
-
- protected Context mContext;
-
- public Bubble(Context context, CallContact contact, float x, float y, float size) {
- mContext = context;
- pos.set(x, y);
- radius = size / 2; // 10 is the white stroke
- savedPhoto = getContactPhoto(context, contact, (int) size);
- generateBitmap();
- attractionPoint = new PointF(x, y);
- isUser = false;
- }
-
- public void update(float dt) {
- setScale(scale + (targetScale - scale) * dt * 5.f);
- }
-
- public void grab() {
- grabbed = true;
- lastDrag = System.nanoTime();
- targetScale = .8f;
- }
-
- public void ungrab() {
- grabbed = false;
- targetScale = 1.f;
- }
-
- public void close() {
- markedToDie = true;
- targetScale = .1f;
- }
-
- public void drag(float x, float y) {
- long now = System.nanoTime();
- float dt = (float) ((now - lastDrag) / 1000000000.);
- float dx = x - pos.x, dy = y - pos.y;
- lastDrag = now;
- setPos(x, y);
- speed.x = dx / dt;
- speed.y = dy / dt;
- }
-
- public void setTargetScale(float t) {
- targetScale = t;
- }
-
- public boolean isGrabbed() {
- return grabbed;
- }
-
- protected void generateBitmap() {
-
- int w = savedPhoto.getWidth(), h = savedPhoto.getHeight();
- if (w > h) {
- w = h;
- } else if (h > w) {
- h = w;
- }
- externalBMP = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
- BitmapShader shader;
- shader = new BitmapShader(savedPhoto, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
-
- Paint paint = new Paint();
- paint.setDither(true);
- paint.setAntiAlias(true);
- paint.setShader(shader);
- Canvas internalCanvas = new Canvas(externalBMP);
- internalCanvas.drawCircle(w / 2, h / 2, w / 2, paint);
-
- Paint mLines = new Paint();
- mLines.setStyle(Style.STROKE);
- mLines.setStrokeWidth(8);
- mLines.setColor(Color.WHITE);
-
- mLines.setDither(true);
- mLines.setAntiAlias(true);
- internalCanvas.drawCircle(w / 2, h / 2, w / 2 - 4, mLines);
-
- bounds = new RectF(pos.x - getRadius(), pos.y - getRadius(), pos.x + getRadius(), pos.y + getRadius());
- }
-
- protected Bitmap getContactPhoto(Context context, CallContact contact, int size) {
- if (contact.getPhotoId() > 0) {
- return ContactPictureTask.loadContactPhoto(context.getContentResolver(), contact.getId());
- } else {
- return ContactPictureTask.decodeSampledBitmapFromResource(context.getResources(), R.drawable.ic_contact_picture, size, size);
- }
- }
-
- public Bitmap getBitmap() {
- return externalBMP;
- }
-
- public RectF getBounds() {
- return bounds;
- }
-
- public void set(float x, float y, float s) {
- scale = s;
- pos.x = x;
- pos.y = y;
- bounds.set(pos.x - getRadius(), pos.y - getRadius(), pos.x + getRadius(), pos.y + getRadius());
- }
-
- public float getPosX() {
- return pos.x;
- }
-
- public float getPosY() {
- return pos.y;
- }
-
- public void setPos(float x, float y) {
- set(x, y, scale);
- }
-
- public PointF getPos() {
- return pos;
- }
-
- public float getScale() {
- return scale;
- }
-
- public void setScale(float s) {
- set(pos.x, pos.y, s);
- }
-
- public int getRadius() {
- return (int) (radius * scale);
- }
-
- /**
- * Point intersection test.
- */
- boolean intersects(float x, float y) {
- float dx = x - pos.x;
- float dy = y - pos.y;
-
- return dx * dx + dy * dy < getRadius() * getRadius();
- }
-
- /**
- * Other circle intersection test.
- */
- boolean intersects(float x, float y, float radius) {
- float dx = x - pos.x, dy = y - pos.y;
- float tot_radius = getRadius() + radius;
- return dx * dx + dy * dy < tot_radius * tot_radius;
- }
-
- public boolean isOnBorder(float w, float h) {
- return (bounds.left < 0 || bounds.right > w || bounds.top < 0 || bounds.bottom > h);
- }
-
- /**
- * Always return the normal radius of the bubble
- *
- * @return
- */
- public float getRetractedRadius() {
- return radius;
- }
-
- public abstract boolean getHoldStatus();
-
- public abstract boolean getRecordStatus();
-
- public abstract String getName();
-
- public abstract boolean callIDEquals(String call);
-
- public abstract String getCallID();
-
- public boolean isConference() {
- return false;
- }
-
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/model/BubbleContact.java b/ring-android/app/src/main/java/cx/ring/model/BubbleContact.java
deleted file mode 100644
index 7c0ce6ed69e1dbb82a489ef53d025a4d27f13728..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/model/BubbleContact.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.model;
-
-import android.content.Context;
-
-public class BubbleContact extends Bubble {
-
- public SipCall associated_call;
-
- public BubbleContact(Context context, SipCall call, float x, float y, float size) {
- super(context, call.getContact(), x, y, size);
- associated_call = call;
- }
-
- @Override
- public boolean getHoldStatus() {
- return associated_call.isOnHold();
- }
-
- @Override
- public boolean getRecordStatus() {
- return associated_call.isRecording();
- }
-
- public SipCall getCall() {
- return associated_call;
- }
-
- public void setCall(SipCall call) {
- associated_call = call;
- }
-
- @Override
- public String getName() {
- return associated_call.getContact().getDisplayName();
- }
-
- @Override
- public boolean callIDEquals(String call) {
- return associated_call.getCallId().contentEquals(call);
- }
-
- @Override
- public String getCallID() {
- return associated_call.getCallId();
- }
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/model/CallContact.java b/ring-android/app/src/main/java/cx/ring/model/CallContact.java
index f54b3812741384b45db6afe57e870f0a578dc0f0..5624eaabb7a1da0db7eab3aa1824cd1b345f506c 100644
--- a/ring-android/app/src/main/java/cx/ring/model/CallContact.java
+++ b/ring-android/app/src/main/java/cx/ring/model/CallContact.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/model/Codec.java b/ring-android/app/src/main/java/cx/ring/model/Codec.java
index 7becf13b641e24cf6609de8267b8c2f5424d8a62..01c5b85f8bd6a972f0ca8743879e9e64b94a2ba6 100644
--- a/ring-android/app/src/main/java/cx/ring/model/Codec.java
+++ b/ring-android/app/src/main/java/cx/ring/model/Codec.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/model/Conference.java b/ring-android/app/src/main/java/cx/ring/model/Conference.java
index 38b6872a8e6ea40cdd2149165d055c0f8c858a04..618e02fe4dafecc166f1f0d9be2719269e1c54ef 100644
--- a/ring-android/app/src/main/java/cx/ring/model/Conference.java
+++ b/ring-android/app/src/main/java/cx/ring/model/Conference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/model/Conversation.java b/ring-android/app/src/main/java/cx/ring/model/Conversation.java
index abb74c4dcd806a9b98c7a0afd658e56f8ec11351..6dfc3c8781a2cd1640f73042941d10226de10b7a 100644
--- a/ring-android/app/src/main/java/cx/ring/model/Conversation.java
+++ b/ring-android/app/src/main/java/cx/ring/model/Conversation.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ *
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
package cx.ring.model;
import android.content.res.Resources;
diff --git a/ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java b/ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java
index af6fd89dbe86e4a8199f917118642ed09c7e8b95..4699fd3e36ae9a976770792689212bcef0cd7b64 100644
--- a/ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java
+++ b/ring-android/app/src/main/java/cx/ring/model/SecureSipCall.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/model/SipCall.java b/ring-android/app/src/main/java/cx/ring/model/SipCall.java
index 9203fcd396d87ad5c75920085c1bad7617afa9eb..42a1295510e545927350e2a8b4e061c4e3744cf4 100644
--- a/ring-android/app/src/main/java/cx/ring/model/SipCall.java
+++ b/ring-android/app/src/main/java/cx/ring/model/SipCall.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Alexandre Savard <alexandre.savard@gmail.com>
diff --git a/ring-android/app/src/main/java/cx/ring/model/SipUri.java b/ring-android/app/src/main/java/cx/ring/model/SipUri.java
index d4d2913b736f111a02a2ebc28b82fa3077e51791..15f500eb7ca6a02b1d2a5dcb9c08cf5270236913 100644
--- a/ring-android/app/src/main/java/cx/ring/model/SipUri.java
+++ b/ring-android/app/src/main/java/cx/ring/model/SipUri.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/TextMessage.java b/ring-android/app/src/main/java/cx/ring/model/TextMessage.java
index 7692f3c9bfdddd48deac004522dddafa566e0c49..f394568a9c5570c5b049db883f397369bee8c42d 100644
--- a/ring-android/app/src/main/java/cx/ring/model/TextMessage.java
+++ b/ring-android/app/src/main/java/cx/ring/model/TextMessage.java
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
- * Author: Adrien Béraud <adrien.beraud@gmail.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/Account.java b/ring-android/app/src/main/java/cx/ring/model/account/Account.java
index 30c28bf0ea785b7150457f86d5f5d4481ddb229c..17186016902d9a4586c7f68f638aa94671f14a88 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/Account.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/Account.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.model.account;
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java
index 6a747febda6186254a182954f9b55374762a1c5e..463ff3dafab9cc83b5b3d8aab07e23f46ab2035b 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountCredentials.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java
index 9ec2ef288ae2efd436e8d3342344f684700841dc..268682e478de03a7e606c14c679c19d1e7606d41 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetail.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java
index 0691d1624a90cd89f7c07bd9f282252210cb23d2..7dc386986a112be93cd56d15102fd6489b1bad79 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailAdvanced.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
index 46097ec3c2beda651d0a11dbaae48b5d06054f8d..75708b668bde18f538d2976b2695197663969a3b 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailBasic.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java
index 81d1bc7c96dd91922878e11ca38361c61a664821..69d1fd2150e8ea4636497fa542f7cbc5414311d1 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailSrtp.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java
index 9ebfa241510a82f44c1e8e5f069cc5252061bd15..b79e5e58816c30ffd00bbddcf11a5913d2f24361 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailTls.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailVolatile.java b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailVolatile.java
index a8b8813f4d985ca8955fbfaaedf8aba43b5ddd97..3f39d9e88c390e0225070ea8629cf83980a32ee8 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailVolatile.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/AccountDetailVolatile.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java b/ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java
index f3ae1a28d84ffb0e5b52f4746c2bb041fc58a872..bf1fc86f19b42d52d88886e83b701800ef8e7c68 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/CredentialsManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.model.account;
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java b/ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java
index 1414d0d98c47ba6e872fffc3e2a544e51f022952..7732e7bbc5402d542c6b0d0206b1ffe7a7f05bda 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/SRTPManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.model.account;
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java b/ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java
index c2f6dcabe45b6d35a86916ca45f6c957d71340b1..42cb7824c16f6f055da794e1b9a853b46038f8d9 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/TLSManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.model.account;
diff --git a/ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java b/ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java
index 13ee9ca8d789061763bc6682b8d8ca92cc2dc542..02b573f89d0cd2d822aa194dd7f48262bd85a963 100644
--- a/ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java
+++ b/ring-android/app/src/main/java/cx/ring/service/ConfigurationManagerCallback.java
@@ -1,6 +1,6 @@
/**
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/service/DRingService.java b/ring-android/app/src/main/java/cx/ring/service/DRingService.java
index 2e1c8ed1cc213980a748a12b4f15f9805f761949..5b47f23cdf53710e27dfa09efbce17f278b7fdb1 100644
--- a/ring-android/app/src/main/java/cx/ring/service/DRingService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/DRingService.java
@@ -1,6 +1,6 @@
/**
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Regis Montoya <r3gis.3R@gmail.com>
* Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
@@ -53,7 +53,6 @@ import cx.ring.model.account.AccountDetailBasic;
import cx.ring.model.account.AccountDetailSrtp;
import cx.ring.model.account.AccountDetailTls;
import cx.ring.utils.MediaManager;
-import cx.ring.utils.SipNotifications;
import cx.ring.utils.SwigNativeConverter;
import cx.ring.model.SipCall;
diff --git a/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl b/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
index 61688875cc9191cd3f9e8fe169282ff5e39cd438..2faa8db84c88a9e177ad9701978ae4d07aafc18c 100644
--- a/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
+++ b/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+ *
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
package cx.ring.service;
interface IDRingService {
diff --git a/ring-android/app/src/main/java/cx/ring/service/LocalService.java b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
index afd2deed93853f0749a424d6988cb427a38374ae..cff6809030e5a2bda74c0d7f5f4ea2478f77f031 100644
--- a/ring-android/app/src/main/java/cx/ring/service/LocalService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2015-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java b/ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java
index f2bbca74a3763ff716ca28a20060810944df0732..479de35b595aa7ec000554d998377928b8d5d947 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/AccelerometerListener.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Regis Montoya <r3gis.3R@gmail.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -18,17 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.utils;
diff --git a/ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java b/ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java
index 5198434abc95b97d8018af76f1f6845ffc667b64..49c125648befdc6906ded8b6e45eb1cc14f9a434 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/CallProximityManager.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Regis Montoya <r3gis.3R@gmail.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -24,7 +24,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/utils/Compatibility.java b/ring-android/app/src/main/java/cx/ring/utils/Compatibility.java
index b40cbfc55b6c6974a0924a8286c9df01828904ee..852a6c23ec6dd42f685d46215e878851c92a2952 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/Compatibility.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/Compatibility.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Regis Montoya <r3gis.3R@gmail.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -24,7 +24,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/utils/MediaManager.java b/ring-android/app/src/main/java/cx/ring/utils/MediaManager.java
index acbe4c0ee23493e4d620625679a49f4cdc71dce1..42d88461e9d2c99e6abe89890be74cc66ec96f1f 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/MediaManager.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/MediaManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/utils/Ringer.java b/ring-android/app/src/main/java/cx/ring/utils/Ringer.java
index 3c3408e812545bc9affbbc6f3bd173943e03d6ed..ef3ef9f72b82c08e51c93502b8c82c6c7cbdac84 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/Ringer.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/Ringer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java b/ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java
index 93a6cf4cad192c2787b4c82a97a18365598fe0fc..2c63cf5e250f3bca237fe60ff35acd541c2b8458 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/SettingsContentObserver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
deleted file mode 100644
index cf3400e5255fccf7a8bdcde7479ad5261b5ae786..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- * Adrien Béraud <adrien.beraud@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.utils;
-
-import java.util.HashMap;
-import java.util.Random;
-
-import cx.ring.R;
-import cx.ring.client.HomeActivity;
-import cx.ring.model.Conference;
-import cx.ring.model.SipCall;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.BitmapFactory;
-import android.graphics.Typeface;
-import android.net.sip.SipProfile;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationManagerCompat;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.style.StyleSpan;
-
-public class SipNotifications {
-
- public final NotificationManagerCompat notificationManager;
- private final Context context;
-
- public static final String NOTIF_CREATION = "notif_creation";
- public static final String NOTIF_DELETION = "notif_deletion";
-
- private final int NOTIFICATION_ID = new Random().nextInt(1000);
-
- public static final int REGISTER_NOTIF_ID = 1;
- public static final int CALL_NOTIF_ID = REGISTER_NOTIF_ID + 1;
- public static final int CALLLOG_NOTIF_ID = REGISTER_NOTIF_ID + 2;
- public static final int MESSAGE_NOTIF_ID = REGISTER_NOTIF_ID + 3;
- public static final int VOICEMAIL_NOTIF_ID = REGISTER_NOTIF_ID + 4;
-
- private static boolean isInit = false;
-
- public SipNotifications(Context aContext) {
- context = aContext;
- notificationManager = NotificationManagerCompat.from(aContext);
- ;//(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
- if (!isInit) {
- cancelAll();
- cancelCalls();
- isInit = true;
- }
-
- }
-
- public void onServiceCreate() {
-
- }
-
- public void onServiceDestroy() {
- // Make sure our notification is gone.
- cancelAll();
- cancelCalls();
- }
-
- // Calls
- public void showNotificationForCall(SipCall callInfo) {
- // TODO
- }
-
- public void showNotificationForVoiceMail(SipProfile acc, int numberOfMessages) {
- // TODO
- }
-
- protected static CharSequence buildTickerMessage(Context context, String address, String body) {
- String displayAddress = address;
-
- StringBuilder buf = new StringBuilder(displayAddress == null ? "" : displayAddress.replace('\n', ' ').replace('\r', ' '));
- buf.append(':').append(' ');
-
- int offset = buf.length();
-
- if (!TextUtils.isEmpty(body)) {
- body = body.replace('\n', ' ').replace('\r', ' ');
- buf.append(body);
- }
-
- SpannableString spanText = new SpannableString(buf.toString());
- spanText.setSpan(new StyleSpan(Typeface.BOLD), 0, offset, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
- return spanText;
- }
-
- public final void cancelCalls() {
- notificationManager.cancel(CALL_NOTIF_ID);
- }
-
- public final void cancelMissedCalls() {
- notificationManager.cancel(CALLLOG_NOTIF_ID);
- }
-
- public final void cancelMessages() {
- notificationManager.cancel(MESSAGE_NOTIF_ID);
- }
-
- public final void cancelVoicemails() {
- notificationManager.cancel(VOICEMAIL_NOTIF_ID);
- }
-
- public final void cancelAll() {
- cancelMessages();
- cancelMissedCalls();
- cancelVoicemails();
- }
-
- public void publishMissedCallNotification(Conference missedConf) {
-
- CharSequence tickerText = context.getString(R.string.notif_missed_call_title);
- long when = System.currentTimeMillis();
-
- Builder nb = new NotificationCompat.Builder(context);
- nb.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_launcher));
- nb.setSmallIcon(R.drawable.ic_call_white_24dp);
-
- nb.setTicker(tickerText);
- nb.setWhen(when);
- nb.setContentTitle(context.getString(R.string.notif_missed_call_title));
- nb.setContentText(context.getString(R.string.notif_missed_call_content, missedConf.getParticipants().get(0).getContact().getDisplayName()));
- Intent notificationIntent = new Intent(context, HomeActivity.class);
- notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
- // notification.setLatestEventInfo(context, contentTitle,
- // contentText, contentIntent);
- nb.setOnlyAlertOnce(true);
- nb.setContentIntent(contentIntent);
-
- // We have to re-write content view because getNotification setLatestEventInfo implicitly
- // notification.contentView = contentView;
-
- // startForegroundCompat(CALL_NOTIF_ID, notification);
- notificationManager.notify(CALL_NOTIF_ID, nb.build());
- }
-
- public void makeNotification(HashMap<String, SipCall> calls) {
- if (calls.size() == 0) {
- return;
- }
- Intent notificationIntent = new Intent(context, HomeActivity.class);
- PendingIntent contentIntent = PendingIntent.getActivity(context, 007, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
- //NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
- notificationManager.cancel(NOTIFICATION_ID); // clear previous notifications.
-
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
-
- builder.setContentIntent(contentIntent).setOngoing(true).setSmallIcon(R.drawable.ic_launcher)
- .setContentTitle(calls.size() + " ongoing calls").setTicker("Pending calls").setWhen(System.currentTimeMillis()).setAutoCancel(false);
- builder.setPriority(NotificationCompat.PRIORITY_MAX);
-
- notificationManager.notify(NOTIFICATION_ID, builder.build());
- }
-
- public void removeNotification() {
- //NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
- notificationManager.cancel(NOTIFICATION_ID);
- }
-}
\ No newline at end of file
diff --git a/ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java b/ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java
index 0aa76e672c0b135e1fdb18e8ba20d8a42e2e6ecc..f6e61c86627ed670a9f3dbfb16b420518a0d5882 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/SwigNativeConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.utils;
diff --git a/ring-android/app/src/main/java/cx/ring/views/CallPaneLayout.java b/ring-android/app/src/main/java/cx/ring/views/CallPaneLayout.java
deleted file mode 100644
index cd2afcfbca453e8de57980c363d2c6341b727fe9..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/views/CallPaneLayout.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Adrien Beraud <adrien.beraud@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.views;
-
-import cx.ring.fragments.CallFragment;
-
-import android.content.Context;
-import android.support.v4.widget.SlidingPaneLayout;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-public class CallPaneLayout extends SlidingPaneLayout
-{
- private CallFragment curFragment = null;
-
- public CallFragment getCurFragment() {
- return curFragment;
- }
-
- public void setCurFragment(CallFragment curFragment) {
- this.curFragment = curFragment;
- }
-
- public CallPaneLayout(Context context, AttributeSet attrs)
- {
- super(context, attrs);
- }
-
- public CallPaneLayout(Context context, AttributeSet attrs, int defStyle)
- {
- super(context, attrs, defStyle);
- }
-
- /*
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event)
- {
- if(curFragment!=null && !curFragment.canOpenIMPanel()) {
- return false;
- }
-
- return super.onInterceptTouchEvent(event);
- }*/
-
-}
diff --git a/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java b/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java
index ad5e73c73be3760574ad0298a8204787d63a5877..6cb9e1f75f53491cdcc182f2e6e091cb95470aaf 100644
--- a/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java
+++ b/ring-android/app/src/main/java/cx/ring/views/CircularImageView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.views;
diff --git a/ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java b/ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java
index 9527fd0bbaab44638f3f8e2f249bd149b4d8bc5b..f7ccec1e96429e5c2c73064ed7141956e8fc44c9 100644
--- a/ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java
+++ b/ring-android/app/src/main/java/cx/ring/views/ClearableEditText.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java b/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
index 4514898ad8a565487622b24fae9744202e974f8c..daa2b1e5224a85cf5ef78ad02c603b25d4394a79 100644
--- a/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
+++ b/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java b/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java
index 46ed0d6746e39c791c3f433b9221c12e476bb5cd..8b1c4ac44a7164da9d644fe9f521334104c43e5f 100644
--- a/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java
+++ b/ring-android/app/src/main/java/cx/ring/views/HalfCircleImageView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java b/ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java
index cc6b156fbe302289672f6058cda665dda16e00b4..71045ef4d6ce682de76068b3d46b3d0bcae2732a 100644
--- a/ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java
+++ b/ring-android/app/src/main/java/cx/ring/views/NumberPickerPreference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.views;
diff --git a/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java b/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java
index 17272339d71a75714bd5b56ea9777dd3e3f6fd77..45fd6d86606ebdc83d61d61e796d5bb6a88dde4f 100644
--- a/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java
+++ b/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -16,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.views;
diff --git a/ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java b/ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java
index 3604fd29a118710d0fead95f2bc94d22a49af292..0a54ea6b830adfe60f9ef4827fbba7dc32037a61 100644
--- a/ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java
+++ b/ring-android/app/src/main/java/cx/ring/views/QuadNumberPickerPreference.java
@@ -1,38 +1,10 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2011 The CyanogenMod Project
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.views;
-
-/*
- * Copyright (C) 2011 The CyanogenMod Project
+ * Author: Danesh
+ * Author: nebkat
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,6 +19,8 @@ package cx.ring.views;
* limitations under the License.
*/
+package cx.ring.views;
+
import android.content.Context;
import android.content.res.TypedArray;
import android.preference.DialogPreference;
@@ -61,11 +35,6 @@ import cx.ring.R;
import java.lang.reflect.Field;
-/*
- * @author Danesh
- * @author nebkat
- */
-
public class QuadNumberPickerPreference extends DialogPreference {
private int mMin1, mMax1, mDefault1;
private int mMin2, mMax2, mDefault2;
diff --git a/ring-android/app/src/main/java/cx/ring/views/SlidingUpPanelLayout.java b/ring-android/app/src/main/java/cx/ring/views/SlidingUpPanelLayout.java
deleted file mode 100644
index d25b92e8efb917556d0e16a4448e15d286f4787e..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/views/SlidingUpPanelLayout.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.views;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ViewDragHelper;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.SoundEffectConstants;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-
-public class SlidingUpPanelLayout extends ViewGroup {
-
- private static final String TAG = SlidingUpPanelLayout.class.getSimpleName();
-
- /**
- * Default peeking out panel height
- */
- private static final int DEFAULT_PANEL_HEIGHT = 68; // dp;
-
- /**
- * Default height of the shadow above the peeking out panel
- */
- private static final int DEFAULT_SHADOW_HEIGHT = 4; // dp;
-
- /**
- * If no fade color is given by default it will fade to 80% gray.
- */
- private static final int DEFAULT_FADE_COLOR = 0x99000000;
-
- /**
- * Minimum velocity that will be detected as a fling
- */
- private static final int MIN_FLING_VELOCITY = 400; // dips per second
-
- /**
- * The fade color used for the panel covered by the slider. 0 = no fading.
- */
- private int mCoveredFadeColor = DEFAULT_FADE_COLOR;
-
- /**
- * The paint used to dim the main layout when sliding
- */
- private final Paint mCoveredFadePaint = new Paint();
-
- /**
- * Drawable used to draw the shadow between panes.
- */
- private Drawable mShadowDrawable;
-
- /**
- * The size of the overhang in pixels.
- */
- private int mPanelHeight;
-
- /**
- * The size of the shadow in pixels.
- */
- private final int mShadowHeight;
-
- /**
- * True if a panel can slide with the current measurements
- */
- private boolean mCanSlide;
-
- /**
- * If provided, the panel can be dragged by only this view. Otherwise, the entire panel can be used for dragging.
- */
- private View mDragView;
-
- /**
- * The child view that can slide, if any.
- */
- private View mSlideableView;
-
- /**
- * How far the panel is offset from its expanded position. range [0, 1] where 0 = expanded, 1 = collapsed.
- */
- private float mSlideOffset;
-
- /**
- * How far in pixels the slideable panel may move.
- */
- private int mSlideRange;
-
- /**
- * A panel view is locked into internal scrolling or another condition that is preventing a drag.
- */
- private boolean mIsUnableToDrag;
-
- /**
- * Flag indicating that sliding feature is enabled\disabled
- */
- private boolean mIsSlidingEnabled;
-
- /**
- * Flag indicating if a drag view can have its own touch events. If set to true, a drag view can scroll horizontally and have its own click
- * listener.
- *
- * Default is set to false.
- */
- private boolean mIsUsingDragViewTouchEvents;
-
- /**
- * Threshold to tell if there was a scroll touch event.
- */
- private int mScrollTouchSlop;
-
- private float mInitialMotionX;
- private float mInitialMotionY;
- private boolean mDragViewHit;
- private float mAnchorPoint = 0.f;
-
- private PanelSlideListener mPanelSlideListener;
-
- private final ViewDragHelper mDragHelper;
-
- /**
- * Stores whether or not the pane was expanded the last time it was slideable. If expand/collapse operations are invoked this state is modified.
- * Used by instance state save/restore.
- */
- private boolean mPreservedExpandedState;
- private boolean mFirstLayout = true;
-
- private final Rect mTmpRect = new Rect();
-
- /**
- * Listener for monitoring events about sliding panes.
- */
- public interface PanelSlideListener {
- /**
- * Called when a sliding pane's position changes.
- *
- * @param panel
- * The child view that was moved
- * @param slideOffset
- * The new offset of this sliding pane within its range, from 0-1
- */
- public void onPanelSlide(View panel, float slideOffset);
-
- /**
- * Called when a sliding pane becomes slid completely collapsed. The pane may or may not be interactive at this point depending on if it's
- * shown or hidden
- *
- * @param panel
- * The child view that was slid to an collapsed position, revealing other panes
- */
- public void onPanelCollapsed(View panel);
-
- /**
- * Called when a sliding pane becomes slid completely expanded. The pane is now guaranteed to be interactive. It may now obscure other views
- * in the layout.
- *
- * @param panel
- * The child view that was slid to a expanded position
- */
- public void onPanelExpanded(View panel);
-
- public void onPanelAnchored(View panel);
- }
-
- /**
- * No-op stubs for {@link PanelSlideListener}. If you only want to implement a subset of the listener methods you can extend this instead of
- * implement the full interface.
- */
- public static class SimplePanelSlideListener implements PanelSlideListener {
- @Override
- public void onPanelSlide(View panel, float slideOffset) {
- }
-
- @Override
- public void onPanelCollapsed(View panel) {
- }
-
- @Override
- public void onPanelExpanded(View panel) {
- }
-
- @Override
- public void onPanelAnchored(View panel) {
- }
- }
-
- public SlidingUpPanelLayout(Context context) {
- this(context, null);
- }
-
- public SlidingUpPanelLayout(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- final float density = context.getResources().getDisplayMetrics().density;
- mPanelHeight = (int) (DEFAULT_PANEL_HEIGHT * density + 0.5f);
- mShadowHeight = (int) (DEFAULT_SHADOW_HEIGHT * density + 0.5f);
-
- setWillNotDraw(false);
-
- mDragHelper = ViewDragHelper.create(this, 0.5f, new DragHelperCallback());
- mDragHelper.setMinVelocity(MIN_FLING_VELOCITY * density);
-
- mCanSlide = true;
- mIsSlidingEnabled = true;
-
- setCoveredFadeColor(DEFAULT_FADE_COLOR);
-
- ViewConfiguration vc = ViewConfiguration.get(context);
- mScrollTouchSlop = vc.getScaledTouchSlop();
- }
-
- /**
- * Set the color used to fade the pane covered by the sliding pane out when the pane will become fully covered in the expanded state.
- *
- * @param color
- * An ARGB-packed color value
- */
- public void setCoveredFadeColor(int color) {
- mCoveredFadeColor = color;
- invalidate();
- }
-
- /**
- * @return The ARGB-packed color value used to fade the fixed pane
- */
- public int getCoveredFadeColor() {
- return mCoveredFadeColor;
- }
-
- /**
- * Set the collapsed panel height in pixels
- *
- * @param val
- * A height in pixels
- */
- public void setPanelHeight(int val) {
- mPanelHeight = val;
- requestLayout();
- }
-
- /**
- * @return The current collapsed panel height
- */
- public int getPanelHeight() {
- return mPanelHeight;
- }
-
- public void setPanelSlideListener(PanelSlideListener listener) {
- mPanelSlideListener = listener;
- }
-
- /**
- * Set the draggable view portion. Use to null, to allow the whole panel to be draggable
- *
- * @param dragView
- * A view that will be used to drag the panel.
- */
- public void setDragView(View dragView) {
- mDragView = dragView;
- }
-
- /**
- * Set an anchor point where the panel can stop during sliding
- *
- * @param anchorPoint
- * A value between 0 and 1, determining the position of the anchor point starting from the top of the layout.
- */
- public void setAnchorPoint(float anchorPoint) {
- if (anchorPoint > 0 && anchorPoint < 1)
- mAnchorPoint = anchorPoint;
- }
-
- /**
- * Set the shadow for the sliding panel
- *
- */
- public void setShadowDrawable(Drawable drawable) {
- mShadowDrawable = drawable;
- }
-
- void dispatchOnPanelSlide(View panel) {
- if (mPanelSlideListener != null) {
- mPanelSlideListener.onPanelSlide(panel, mSlideOffset);
- }
- }
-
- void dispatchOnPanelExpanded(View panel) {
- if (mPanelSlideListener != null) {
- mPanelSlideListener.onPanelExpanded(panel);
- }
- sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- }
-
- void dispatchOnPanelCollapsed(View panel) {
- if (mPanelSlideListener != null) {
- mPanelSlideListener.onPanelCollapsed(panel);
- }
- sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- }
-
- void dispatchOnPanelAnchored(View panel) {
- if (mPanelSlideListener != null) {
- mPanelSlideListener.onPanelAnchored(panel);
- }
- sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- }
-
- void updateObscuredViewVisibility() {
- if (getChildCount() == 0) {
- return;
- }
- final int leftBound = getPaddingLeft();
- final int rightBound = getWidth() - getPaddingRight();
- final int topBound = getPaddingTop();
- final int bottomBound = getHeight() - getPaddingBottom();
- final int left;
- final int right;
- final int top;
- final int bottom;
- if (mSlideableView != null && hasOpaqueBackground(mSlideableView)) {
- left = mSlideableView.getLeft();
- right = mSlideableView.getRight();
- top = mSlideableView.getTop();
- bottom = mSlideableView.getBottom();
- } else {
- left = right = top = bottom = 0;
- }
- View child = getChildAt(0);
- final int clampedChildLeft = Math.max(leftBound, child.getLeft());
- final int clampedChildTop = Math.max(topBound, child.getTop());
- final int clampedChildRight = Math.min(rightBound, child.getRight());
- final int clampedChildBottom = Math.min(bottomBound, child.getBottom());
- final int vis;
- if (clampedChildLeft >= left && clampedChildTop >= top && clampedChildRight <= right && clampedChildBottom <= bottom) {
- vis = INVISIBLE;
- } else {
- vis = VISIBLE;
- }
- child.setVisibility(vis);
- }
-
- void setAllChildrenVisible() {
- for (int i = 0, childCount = getChildCount(); i < childCount; i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() == INVISIBLE) {
- child.setVisibility(VISIBLE);
- }
- }
- }
-
- private static boolean hasOpaqueBackground(View v) {
- final Drawable bg = v.getBackground();
- if (bg != null) {
- return bg.getOpacity() == PixelFormat.OPAQUE;
- }
- return false;
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- mFirstLayout = true;
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- mFirstLayout = true;
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
- final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
- final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
- final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
-
- if (widthMode != MeasureSpec.EXACTLY) {
- throw new IllegalStateException("Width must have an exact value or MATCH_PARENT");
- } else if (heightMode != MeasureSpec.EXACTLY) {
- throw new IllegalStateException("Height must have an exact value or MATCH_PARENT");
- }
-
- int layoutHeight = heightSize - getPaddingTop() - getPaddingBottom();
- int panelHeight = mPanelHeight;
-
- final int childCount = getChildCount();
-
- if (childCount > 2) {
- Log.e(TAG, "onMeasure: More than two child views are not supported.");
- } else if (getChildAt(1).getVisibility() == GONE) {
- panelHeight = 0;
- }
-
- // We'll find the current one below.
- mSlideableView = null;
- mCanSlide = false;
-
- // First pass. Measure based on child LayoutParams width/height.
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
- int height = layoutHeight;
- if (child.getVisibility() == GONE) {
- lp.dimWhenOffset = false;
- continue;
- }
-
- if (i == 1) {
- lp.slideable = true;
- lp.dimWhenOffset = true;
- mSlideableView = child;
- mCanSlide = true;
- } else {
- height -= panelHeight;
- }
-
- int childWidthSpec;
- if (lp.width == LayoutParams.WRAP_CONTENT) {
- childWidthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.AT_MOST);
- } else if (lp.width == LayoutParams.MATCH_PARENT) {
- childWidthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
- } else {
- childWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
- }
-
- int childHeightSpec;
- if (lp.height == LayoutParams.WRAP_CONTENT) {
- childHeightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
- } else if (lp.height == LayoutParams.MATCH_PARENT) {
- childHeightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
- } else {
- childHeightSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
- }
-
- child.measure(childWidthSpec, childHeightSpec);
- }
-
- setMeasuredDimension(widthSize, heightSize);
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- final int paddingLeft = getPaddingLeft();
- final int paddingTop = getPaddingTop();
-
- final int childCount = getChildCount();
- int yStart = paddingTop;
- int nextYStart = yStart;
-
- if (mFirstLayout) {
- mSlideOffset = mCanSlide && mPreservedExpandedState ? 0.f : 1.f;
- }
-
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
-
- if (child.getVisibility() == GONE) {
- continue;
- }
-
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
- int childHeight = child.getMeasuredHeight();
-
- if (lp.slideable) {
- mSlideRange = childHeight - mPanelHeight;
- yStart += (int) (mSlideRange * mSlideOffset);
- } else {
- yStart = nextYStart;
- }
-
- final int childTop = yStart;
- final int childBottom = childTop + childHeight;
- final int childLeft = paddingLeft;
- final int childRight = childLeft + child.getMeasuredWidth();
- child.layout(childLeft, childTop, childRight, childBottom);
-
- nextYStart += child.getHeight();
- }
-
- if (mFirstLayout) {
- updateObscuredViewVisibility();
- }
-
- mFirstLayout = false;
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- // Recalculate sliding panes and their details
- if (h != oldh) {
- mFirstLayout = true;
- }
- }
-
- /**
- * Set sliding enabled flag
- *
- * @param enabled
- * flag value
- */
- public void setSlidingEnabled(boolean enabled) {
- mIsSlidingEnabled = enabled;
- }
-
- /**
- * Set if the drag view can have its own touch events. If set to true, a drag view can scroll horizontally and have its own click listener.
- *
- * Default is set to false.
- */
- public void setEnableDragViewTouchEvents(boolean enabled) {
- mIsUsingDragViewTouchEvents = enabled;
- }
-
- private boolean isDragViewHit(int x, int y) {
- View v = mDragView != null ? mDragView : mSlideableView;
- if (v == null)
- return false;
- int[] viewLocation = new int[2];
- v.getLocationOnScreen(viewLocation);
- int[] parentLocation = new int[2];
- this.getLocationOnScreen(parentLocation);
- int screenX = parentLocation[0] + x;
- int screenY = parentLocation[1] + y;
- return screenX >= viewLocation[0] && screenX < viewLocation[0] + v.getWidth() && screenY >= viewLocation[1]
- && screenY < viewLocation[1] + v.getHeight();
- }
-
- @Override
- public void requestChildFocus(View child, View focused) {
- super.requestChildFocus(child, focused);
- if (!isInTouchMode() && !mCanSlide) {
- mPreservedExpandedState = child == mSlideableView;
- }
- }
-
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- final int action = MotionEventCompat.getActionMasked(ev);
-
- if (!mCanSlide || !mIsSlidingEnabled || (mIsUnableToDrag && action != MotionEvent.ACTION_DOWN)) {
- mDragHelper.cancel();
- return super.onInterceptTouchEvent(ev);
- }
-
- if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
- mDragHelper.cancel();
- return false;
- }
-
- final float x = ev.getX();
- final float y = ev.getY();
- boolean interceptTap = false;
-
- switch (action) {
- case MotionEvent.ACTION_DOWN: {
- mIsUnableToDrag = false;
- mInitialMotionX = x;
- mInitialMotionY = y;
- mDragViewHit = isDragViewHit((int) x, (int) y);
-
- if (mDragViewHit && !mIsUsingDragViewTouchEvents) {
- interceptTap = true;
- }
- break;
- }
-
- case MotionEvent.ACTION_MOVE: {
- final float adx = Math.abs(x - mInitialMotionX);
- final float ady = Math.abs(y - mInitialMotionY);
- final int dragSlop = mDragHelper.getTouchSlop();
-
- // Handle any horizontal scrolling on the drag view.
- if (mIsUsingDragViewTouchEvents) {
- if (adx > mScrollTouchSlop && ady < mScrollTouchSlop) {
- return super.onInterceptTouchEvent(ev);
- }
- // Intercept the touch if the drag view has any vertical scroll.
- // onTouchEvent will determine if the view should drag vertically.
- else if (ady > mScrollTouchSlop) {
- interceptTap = mDragViewHit;
- }
- }
-
- if (ady > dragSlop && adx > ady) {
- mDragHelper.cancel();
- mIsUnableToDrag = true;
- return false;
- }
- break;
- }
- }
-
- final boolean interceptForDrag = mDragViewHit && mDragHelper.shouldInterceptTouchEvent(ev);
-
- return interceptForDrag || interceptTap;
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- if (!mCanSlide || !mIsSlidingEnabled) {
- return super.onTouchEvent(ev);
- }
-
- mDragHelper.processTouchEvent(ev);
-
- final int action = ev.getAction();
- boolean wantTouchEvents = true;
-
- switch (action & MotionEventCompat.ACTION_MASK) {
- case MotionEvent.ACTION_DOWN: {
- final float x = ev.getX();
- final float y = ev.getY();
- mInitialMotionX = x;
- mInitialMotionY = y;
- break;
- }
-
- case MotionEvent.ACTION_UP: {
- final float x = ev.getX();
- final float y = ev.getY();
- final float dx = x - mInitialMotionX;
- final float dy = y - mInitialMotionY;
- final int slop = mDragHelper.getTouchSlop();
- if (dx * dx + dy * dy < slop * slop && isDragViewHit((int) x, (int) y)) {
- View v = mDragView != null ? mDragView : mSlideableView;
- v.playSoundEffect(SoundEffectConstants.CLICK);
- if (!isExpanded() && !isAnchored()) {
- expandPane(mSlideableView, 0, mAnchorPoint);
- } else {
- collapsePane();
- }
- break;
- }
- break;
- }
- }
-
- return wantTouchEvents;
- }
-
- private boolean expandPane(View pane, int initialVelocity, float mSlideOffset) {
- if (mFirstLayout || smoothSlideTo(mSlideOffset, initialVelocity)) {
- mPreservedExpandedState = true;
- return true;
- }
- return false;
- }
-
- private boolean collapsePane(View pane, int initialVelocity) {
- if (mFirstLayout || smoothSlideTo(1.f, initialVelocity)) {
- mPreservedExpandedState = false;
- return true;
- }
- return false;
- }
-
- /**
- * Collapse the sliding pane if it is currently slideable. If first layout has already completed this will animate.
- *
- * @return true if the pane was slideable and is now collapsed/in the process of collapsing
- */
- public boolean collapsePane() {
- return collapsePane(mSlideableView, 0);
- }
-
- /**
- * Expand the sliding pane if it is currently slideable. If first layout has already completed this will animate.
- *
- * @return true if the pane was slideable and is now expanded/in the process of expading
- */
- public boolean expandPane() {
- return expandPane(0);
- }
-
- /**
- * Partially expand the sliding pane up to a specific offset
- *
- * @param mSlideOffset
- * Value between 0 and 1, where 0 is completely expanded.
- * @return true if the pane was slideable and is now expanded/in the process of expading
- */
- public boolean expandPane(float mSlideOffset) {
- if (!isPaneVisible()) {
- showPane();
- }
- return expandPane(mSlideableView, 0, mSlideOffset);
- }
-
- /**
- * Check if the layout is completely expanded.
- *
- * @return true if sliding panels are completely expanded
- */
- public boolean isExpanded() {
- return mFirstLayout && mPreservedExpandedState || !mFirstLayout && mCanSlide && mSlideOffset == 0;
- }
-
- /**
- * Check if the layout is anchored in an intermediate point.
- *
- * @return true if sliding panels are anchored
- */
- public boolean isAnchored() {
- int anchoredTop = (int) (mAnchorPoint * mSlideRange);
- return !mFirstLayout && mCanSlide && mSlideOffset == (float) anchoredTop / (float) mSlideRange;
- }
-
- /**
- * Check if the content in this layout cannot fully fit side by side and therefore the content pane can be slid back and forth.
- *
- * @return true if content in this layout can be expanded
- */
- public boolean isSlideable() {
- return mCanSlide;
- }
-
- public boolean isPaneVisible() {
- if (getChildCount() < 2) {
- return false;
- }
- View slidingPane = getChildAt(1);
- return slidingPane.getVisibility() == View.VISIBLE;
- }
-
- public void showPane() {
- if (getChildCount() < 2) {
- return;
- }
- View slidingPane = getChildAt(1);
- slidingPane.setVisibility(View.VISIBLE);
- requestLayout();
- }
-
- public void hidePane() {
- if (mSlideableView == null) {
- return;
- }
- mSlideableView.setVisibility(View.GONE);
- requestLayout();
- }
-
- private void onPanelDragged(int newTop) {
- final int topBound = getPaddingTop();
- mSlideOffset = (float) (newTop - topBound) / mSlideRange;
- dispatchOnPanelSlide(mSlideableView);
- }
-
- @Override
- protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- boolean result;
- final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);
-
- boolean drawScrim = false;
-
- if (mCanSlide && !lp.slideable && mSlideableView != null) {
- // Clip against the slider; no sense drawing what will immediately be covered.
- canvas.getClipBounds(mTmpRect);
- mTmpRect.bottom = (int) Math.min(mTmpRect.bottom, mSlideableView.getTop() + getResources().getDisplayMetrics().density * 68); // + 60
- // cause of
- // the
- // rounded
- // shape
- // handle
- canvas.clipRect(mTmpRect);
- if (mSlideOffset < 1) {
- drawScrim = true;
- }
- }
-
- result = super.drawChild(canvas, child, drawingTime);
- canvas.restoreToCount(save);
-
- if (drawScrim) {
- final int baseAlpha = (mCoveredFadeColor & 0xff000000) >>> 24;
- final int imag = (int) (baseAlpha * (1 - mSlideOffset));
- final int color = imag << 24 | (mCoveredFadeColor & 0xffffff);
- mCoveredFadePaint.setColor(color);
- canvas.drawRect(mTmpRect, mCoveredFadePaint);
- }
-
- return result;
- }
-
- /**
- * Smoothly animate mDraggingPane to the target X position within its range.
- *
- * @param slideOffset
- * position to animate to
- * @param velocity
- * initial velocity in case of fling, or 0.
- */
- boolean smoothSlideTo(float slideOffset, int velocity) {
- if (!mCanSlide) {
- // Nothing to do.
- return false;
- }
-
- final int topBound = getPaddingTop();
- int y = (int) (topBound + slideOffset * mSlideRange);
-
- if (mDragHelper.smoothSlideViewTo(mSlideableView, mSlideableView.getLeft(), y)) {
- setAllChildrenVisible();
- ViewCompat.postInvalidateOnAnimation(this);
- return true;
- }
- return false;
- }
-
- @Override
- public void computeScroll() {
- if (mDragHelper.continueSettling(true)) {
- if (!mCanSlide) {
- mDragHelper.abort();
- return;
- }
-
- ViewCompat.postInvalidateOnAnimation(this);
- }
- }
-
- @Override
- public void draw(Canvas c) {
- super.draw(c);
-
- if (mSlideableView == null) {
- // No need to draw a shadow if we don't have one.
- return;
- }
-
- final int right = mSlideableView.getRight();
- final int top = mSlideableView.getTop() - mShadowHeight;
- final int bottom = mSlideableView.getTop();
- final int left = mSlideableView.getLeft();
-
- if (mShadowDrawable != null) {
- mShadowDrawable.setBounds(left, top, right, bottom);
- mShadowDrawable.draw(c);
- }
- }
-
- /**
- * Tests scrollability within child views of v given a delta of dx.
- *
- * @param v
- * View to test for horizontal scrollability
- * @param checkV
- * Whether the view v passed should itself be checked for scrollability (true), or just its children (false).
- * @param dx
- * Delta scrolled in pixels
- * @param x
- * X coordinate of the active touch point
- * @param y
- * Y coordinate of the active touch point
- * @return true if child views of v can be scrolled by delta of dx.
- */
- protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
- if (v instanceof ViewGroup) {
- final ViewGroup group = (ViewGroup) v;
- final int scrollX = v.getScrollX();
- final int scrollY = v.getScrollY();
- final int count = group.getChildCount();
- // Count backwards - let topmost views consume scroll distance first.
- for (int i = count - 1; i >= 0; i--) {
- final View child = group.getChildAt(i);
- if (x + scrollX >= child.getLeft() && x + scrollX < child.getRight() && y + scrollY >= child.getTop()
- && y + scrollY < child.getBottom() && canScroll(child, true, dx, x + scrollX - child.getLeft(), y + scrollY - child.getTop())) {
- return true;
- }
- }
- }
- return checkV && ViewCompat.canScrollHorizontally(v, -dx);
- }
-
- @Override
- protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
- return new LayoutParams();
- }
-
- @Override
- protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
- return p instanceof MarginLayoutParams ? new LayoutParams((MarginLayoutParams) p) : new LayoutParams(p);
- }
-
- @Override
- protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
- return p instanceof LayoutParams && super.checkLayoutParams(p);
- }
-
- @Override
- public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {
- return new LayoutParams(getContext(), attrs);
- }
-
- @Override
- protected Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
-
- SavedState ss = new SavedState(superState);
- ss.isExpanded = isSlideable() ? isExpanded() : mPreservedExpandedState;
-
- return ss;
- }
-
- @Override
- protected void onRestoreInstanceState(Parcelable state) {
- SavedState ss = (SavedState) state;
- super.onRestoreInstanceState(ss.getSuperState());
-
- if (ss.isExpanded) {
- expandPane();
- } else {
- collapsePane();
- }
- mPreservedExpandedState = ss.isExpanded;
- }
-
- private class DragHelperCallback extends ViewDragHelper.Callback {
-
- @Override
- public boolean tryCaptureView(View child, int pointerId) {
- if (mIsUnableToDrag) {
- return false;
- }
-
- return ((LayoutParams) child.getLayoutParams()).slideable;
- }
-
- @Override
- public void onViewDragStateChanged(int state) {
- if (mDragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) {
- if (mSlideOffset == 0) {
- updateObscuredViewVisibility();
- dispatchOnPanelExpanded(mSlideableView);
- mPreservedExpandedState = true;
- } else if (isAnchored()) {
- updateObscuredViewVisibility();
- dispatchOnPanelAnchored(mSlideableView);
- mPreservedExpandedState = true;
- } else {
- dispatchOnPanelCollapsed(mSlideableView);
- mPreservedExpandedState = false;
- }
- }
- }
-
- @Override
- public void onViewCaptured(View capturedChild, int activePointerId) {
- // Make all child views visible in preparation for sliding things around
- setAllChildrenVisible();
- }
-
- @Override
- public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
- onPanelDragged(top);
- invalidate();
- }
-
- @Override
- public void onViewReleased(View releasedChild, float xvel, float yvel) {
- int top = getPaddingTop();
-
- if (mAnchorPoint != 0) {
- int anchoredTop = (int) (mAnchorPoint * mSlideRange);
- float anchorOffset = (float) anchoredTop / (float) mSlideRange;
-
- if (yvel > 0 || (yvel == 0 && mSlideOffset >= (1f + anchorOffset) / 2)) {
- top += mSlideRange;
- } else if (yvel == 0 && mSlideOffset < (1f + anchorOffset) / 2 && mSlideOffset >= anchorOffset / 2) {
- top += mSlideRange * mAnchorPoint;
- }
-
- } else if (yvel > 0 || (yvel == 0 && mSlideOffset > 0.5f)) {
- top += mSlideRange;
- }
-
- mDragHelper.settleCapturedViewAt(releasedChild.getLeft(), top);
- invalidate();
- }
-
- @Override
- public int getViewVerticalDragRange(View child) {
- return mSlideRange;
- }
-
- @Override
- public int clampViewPositionVertical(View child, int top, int dy) {
- final int topBound = getPaddingTop();
- final int bottomBound = topBound + mSlideRange;
-
- final int newLeft = Math.min(Math.max(top, topBound), bottomBound);
-
- return newLeft;
- }
-
- }
-
- public static class LayoutParams extends ViewGroup.MarginLayoutParams {
- private static final int[] ATTRS = new int[] { android.R.attr.layout_weight };
-
- /**
- * True if this pane is the slideable pane in the layout.
- */
- boolean slideable;
-
- /**
- * True if this view should be drawn dimmed when it's been offset from its default position.
- */
- boolean dimWhenOffset;
-
- Paint dimPaint;
-
- public LayoutParams() {
- super(MATCH_PARENT, MATCH_PARENT);
- }
-
- public LayoutParams(int width, int height) {
- super(width, height);
- }
-
- public LayoutParams(android.view.ViewGroup.LayoutParams source) {
- super(source);
- }
-
- public LayoutParams(MarginLayoutParams source) {
- super(source);
- }
-
- public LayoutParams(LayoutParams source) {
- super(source);
- }
-
- public LayoutParams(Context c, AttributeSet attrs) {
- super(c, attrs);
-
- final TypedArray a = c.obtainStyledAttributes(attrs, ATTRS);
- a.recycle();
- }
-
- }
-
- static class SavedState extends BaseSavedState {
- boolean isExpanded;
-
- SavedState(Parcelable superState) {
- super(superState);
- }
-
- private SavedState(Parcel in) {
- super(in);
- isExpanded = in.readInt() != 0;
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- super.writeToParcel(out, flags);
- out.writeInt(isExpanded ? 1 : 0);
- }
-
- public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-}
diff --git a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java
index 616c6ac30a2e729f506e2c431c0a83404580f6f4..3164c1a3fdfd1eeece313d94cb501185514a3e4b 100644
--- a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java
+++ b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2013 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
index 1700d443c8b4cadceff6cde87f10c99c91bd77a5..528956043f1c5674cfb167b1ba35021fb60cd074 100644
--- a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortCursorAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2013 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java
index 0bb976c8d33cf90386fa9586fd8e14a8b4f60b06..e34dd72c403dd4efa770c6a376d739abf2345be0 100644
--- a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java
+++ b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemView.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2013 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
index c4a176f39de4b68ea0cadaae749bb8ce79551b69..3ce0fa6cd723c5495e1c3f08967d2bf26ed8f2c6 100644
--- a/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
+++ b/ring-android/app/src/main/java/cx/ring/views/dragsortlv/DragSortItemViewCheckable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2013 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
@@ -22,7 +22,7 @@
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/jni/Android.mk b/ring-android/app/src/main/jni/Android.mk
index e2ac75b4998ee1d34fc6bc2564d02aea803b156d..7e190b6e9dc8e5f4218bf6d497596551cbf2eb8a 100644
--- a/ring-android/app/src/main/jni/Android.mk
+++ b/ring-android/app/src/main/jni/Android.mk
@@ -1,7 +1,7 @@
- # Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ # Copyright (C) 2004-2016 Savoir-faire Linux Inc.
#
# Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- # Adrien Beraud <adrien.beraud@gmail.com>
+ # Adrien Beraud <adrien.beraud@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,17 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- #
- # Additional permission under GNU GPL version 3 section 7:
- #
- # If you modify this program, or any covered work, by linking or
- # combining it with the OpenSSL project's OpenSSL library (or a
- # modified version of that library), containing parts covered by the
- # terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- # grants you additional permission to convey the resulting work.
- # Corresponding Source for a non-source form of such a combination
- # shall include the source code for the parts of OpenSSL used as well
- # as that of the covered work.
LOCAL_PATH:= $(call my-dir)
diff --git a/ring-android/app/src/main/jni/Application.mk b/ring-android/app/src/main/jni/Application.mk
index 030c692e04be70293baf694bd869d94599e7923f..a42e7454fea26c0cfe0947488c033989d58011f7 100644
--- a/ring-android/app/src/main/jni/Application.mk
+++ b/ring-android/app/src/main/jni/Application.mk
@@ -1,7 +1,7 @@
-# Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+# Copyright (C) 2004-2016 Savoir-faire Linux Inc.
#
# Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- # Adrien Beraud <adrien.beraud@gmail.com>
+ # Adrien Beraud <adrien.beraud@savoirfairelinux.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,20 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- #
- # Additional permission under GNU GPL version 3 section 7:
- #
- # If you modify this program, or any covered work, by linking or
- # combining it with the OpenSSL project's OpenSSL library (or a
- # modified version of that library), containing parts covered by the
- # terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- # grants you additional permission to convey the resulting work.
- # Corresponding Source for a non-source form of such a combination
- # shall include the source code for the parts of OpenSSL used as well
- # as that of the covered work.
-
-
-
APP_PLATFORM := android-16
APP_OPTIM := debug
diff --git a/ring-android/app/src/main/jni/callmanager.i b/ring-android/app/src/main/jni/callmanager.i
index 8efe4e047af49b6cd3d3e970aa671e661d01ae6e..e8b92e2bba97999a246aa8706eceddbd0853b7c0 100644
--- a/ring-android/app/src/main/jni/callmanager.i
+++ b/ring-android/app/src/main/jni/callmanager.i
@@ -1,7 +1,10 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+ *
* Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
* Alexandre Lision <alexnadre.L@savoirfairelinux.com>
+ * Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -15,17 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
%header %{
diff --git a/ring-android/app/src/main/jni/configurationmanager.i b/ring-android/app/src/main/jni/configurationmanager.i
index 146146058e0e557f620af6a00c86e2bd98901d62..004104ebbd7b9552211ad6de5854566ee5a9ee01 100644
--- a/ring-android/app/src/main/jni/configurationmanager.i
+++ b/ring-android/app/src/main/jni/configurationmanager.i
@@ -1,6 +1,9 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+ *
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -14,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
%header %{
diff --git a/ring-android/app/src/main/jni/jni_interface.i b/ring-android/app/src/main/jni/jni_interface.i
index 40cf101274cde336d6ff47caee668d3f959da1a1..556420f0bed39679fa08c63a6554f020839b60d6 100644
--- a/ring-android/app/src/main/jni/jni_interface.i
+++ b/ring-android/app/src/main/jni/jni_interface.i
@@ -1,6 +1,8 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+ *
* Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -14,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/* File : jni_interface.i */
diff --git a/ring-android/app/src/main/jni/managerimpl.i b/ring-android/app/src/main/jni/managerimpl.i
index 3e6409e4dd094ed8652c4ca35eb07d9e8bb4b75e..9c756745a209200faf904eca9b6bb834fff2aa01 100644
--- a/ring-android/app/src/main/jni/managerimpl.i
+++ b/ring-android/app/src/main/jni/managerimpl.i
@@ -1,6 +1,8 @@
/*
- * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+ *
* Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -14,17 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
/* %nodefaultctor ManagerImpl;
diff --git a/ring-android/app/src/main/res/layout/activity_call_layout.xml b/ring-android/app/src/main/res/layout/activity_call_layout.xml
index 6649ef3de432efc201237ffb4ca09a465f69e388..95a192e135ba76044b11473f3deb2567b89e790f 100644
--- a/ring-android/app/src/main/res/layout/activity_call_layout.xml
+++ b/ring-android/app/src/main/res/layout/activity_call_layout.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/ring-android/app/src/main/res/layout/activity_home.xml b/ring-android/app/src/main/res/layout/activity_home.xml
index fb90ccf90abd90382f74c1f38420d7234516ad74..597fd2a98756ce75c49f339c025904e928311488 100644
--- a/ring-android/app/src/main/res/layout/activity_home.xml
+++ b/ring-android/app/src/main/res/layout/activity_home.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml b/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml
index a45216ff9f14ec0eab8a68eb6dee1482170a4eea..935a72cd53fcae43c9c387e6c382a8a4c342b8ec 100644
--- a/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml
+++ b/ring-android/app/src/main/res/layout/activity_mgmt_accounts.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Savard <alexandre.savard@gmail.com>
Alexandre Lision <alexandre.lision@gmail.com>
@@ -18,17 +18,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/ring-android/app/src/main/res/layout/credentials_pref.xml b/ring-android/app/src/main/res/layout/credentials_pref.xml
index ddb141913fc6812dabf7d28171bb3c05615bf92f..6d8c9879108c3ef527bd8907f17b29634a9adac0 100644
--- a/ring-android/app/src/main/res/layout/credentials_pref.xml
+++ b/ring-android/app/src/main/res/layout/credentials_pref.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@gmail.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
diff --git a/ring-android/app/src/main/res/layout/frag_account_creation.xml b/ring-android/app/src/main/res/layout/frag_account_creation.xml
index f84488d52c47edccaff6642ed2b9c76842b615e5..96f3f13867d32f47448e2eab84b93a033250b41f 100644
--- a/ring-android/app/src/main/res/layout/frag_account_creation.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_creation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/frag_call_list.xml b/ring-android/app/src/main/res/layout/frag_call_list.xml
index a9d0a4c9eb6690465bc80ac87c7dd69e0285000e..c131bdc82b6a9c3caec958b72b6260a9c9c055a9 100644
--- a/ring-android/app/src/main/res/layout/frag_call_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_call_list.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list.xml b/ring-android/app/src/main/res/layout/frag_contact_list.xml
index db6be4eabf1883d9fb608b423c28aa75636bf3d4..538185699077e459281a50f208abfcec64517d05 100644
--- a/ring-android/app/src/main/res/layout/frag_contact_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_contact_list.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- Adrien Beraud <adrien.beraud@gmail.com>
+ Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/ring-android/app/src/main/res/layout/frag_dialing.xml b/ring-android/app/src/main/res/layout/frag_dialing.xml
index f0c6b9592114e554fc39a5acba1ee55def824ea5..6a6dcc8ffab18e3316a557ada9234122b5e275aa 100644
--- a/ring-android/app/src/main/res/layout/frag_dialing.xml
+++ b/ring-android/app/src/main/res/layout/frag_dialing.xml
@@ -1,4 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
diff --git a/ring-android/app/src/main/res/layout/item_calllist.xml b/ring-android/app/src/main/res/layout/item_calllist.xml
index 6eb5eba7d7b37b18cbbc42fdd3181a260b9dcd9b..c32e81e9996f7f31a0ee00e81765308ed6af938c 100644
--- a/ring-android/app/src/main/res/layout/item_calllist.xml
+++ b/ring-android/app/src/main/res/layout/item_calllist.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_codec.xml b/ring-android/app/src/main/res/layout/item_codec.xml
index 307ac0f3a6403e95dad4ea10434b4aa8441545e5..ab4c9e4fc5669090b178356794ed9e6f74fa563c 100644
--- a/ring-android/app/src/main/res/layout/item_codec.xml
+++ b/ring-android/app/src/main/res/layout/item_codec.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index 16ccf21fe998b9d2ed623acfa70815fb72b101b1..28bde0631e9e0f5d7a033685b0d489db7d93f53a 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Adrien Beraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_history.xml b/ring-android/app/src/main/res/layout/item_history.xml
index 1297873933d7e36db935b1778304d965acd4e836..01aba38a151e62669e271f862b185f5b93e00986 100644
--- a/ring-android/app/src/main/res/layout/item_history.xml
+++ b/ring-android/app/src/main/res/layout/item_history.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_history_call.xml b/ring-android/app/src/main/res/layout/item_history_call.xml
index 56ab5cc5ef62dc8cde710e954ef61bc4cf688dc6..fe8dbbac59e7efce474b53aed4438dde456d1f58 100644
--- a/ring-android/app/src/main/res/layout/item_history_call.xml
+++ b/ring-android/app/src/main/res/layout/item_history_call.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/ring-android/app/src/main/res/layout/item_number.xml b/ring-android/app/src/main/res/layout/item_number.xml
index 6b5295f9ff9626781c64bf5d5e4b0e811b032646..17bc481d65999aa52085ed8503e24cbcd33b51b0 100644
--- a/ring-android/app/src/main/res/layout/item_number.xml
+++ b/ring-android/app/src/main/res/layout/item_number.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_number_selected.xml b/ring-android/app/src/main/res/layout/item_number_selected.xml
index 4314742fb5b7573311a6ead0cbb5c02db178c319..cf4eb740bf8b0c71d80bd0c479a8331bfde497a8 100644
--- a/ring-android/app/src/main/res/layout/item_number_selected.xml
+++ b/ring-android/app/src/main/res/layout/item_number_selected.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/layout/item_textmsg.xml b/ring-android/app/src/main/res/layout/item_textmsg.xml
index f68d1d7901e14101d53adb69c2c2a3bff2dd28ad..0a9d8c27ee47e6cf785435d63279a5b23f700bd7 100644
--- a/ring-android/app/src/main/res/layout/item_textmsg.xml
+++ b/ring-android/app/src/main/res/layout/item_textmsg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/values-land/dimens.xml b/ring-android/app/src/main/res/values-land/dimens.xml
index 1431fe098824fd3bea60824640e5a869a35a177f..cc35b2106358c2c2a9ec1812a2d803a5754b6df4 100644
--- a/ring-android/app/src/main/res/values-land/dimens.xml
+++ b/ring-android/app/src/main/res/values-land/dimens.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<resources>
diff --git a/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml b/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml
index 970c31b550b193d1a0a3a530443376fc6bd6d5b8..0f76842c2aa700ed96a3cf05083104df41c8636f 100644
--- a/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml
+++ b/ring-android/app/src/main/res/values-sw600dp-xhdpi/dimens.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@gmail.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<!--
diff --git a/ring-android/app/src/main/res/values-sw600dp/dimens.xml b/ring-android/app/src/main/res/values-sw600dp/dimens.xml
index bcb3ccb03d2be30127869baf5af83a5714e067aa..5834a2fd0483d7ac2b2311aa1342ca529887ff51 100644
--- a/ring-android/app/src/main/res/values-sw600dp/dimens.xml
+++ b/ring-android/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<resources>
diff --git a/ring-android/app/src/main/res/values-v21/dimens.xml b/ring-android/app/src/main/res/values-v21/dimens.xml
index 7bed92d22afb692ec89d04b854523ff0720dcdd1..f796a4158b67908c274c46d5199f5967b9fc01fd 100644
--- a/ring-android/app/src/main/res/values-v21/dimens.xml
+++ b/ring-android/app/src/main/res/values-v21/dimens.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ Additional permission under GNU GPL version 3 section 7:
If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
grants you additional permission to convey the resulting work.
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
diff --git a/ring-android/app/src/main/res/values/arrays.xml b/ring-android/app/src/main/res/values/arrays.xml
index b7855f0561ad8f3e6fd937f0408e3a850caf27eb..7082798fc32261d3103ff9ea68cc732918adc7b7 100644
--- a/ring-android/app/src/main/res/values/arrays.xml
+++ b/ring-android/app/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<resources>
diff --git a/ring-android/app/src/main/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml
index 4c2f10754de6f48075784f5e082e124d0456a66e..d3ad6421a430f3319c7ae6268885397bef59cca7 100644
--- a/ring-android/app/src/main/res/values/dimens.xml
+++ b/ring-android/app/src/main/res/values/dimens.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<resources>
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index bc5487dcb8659bf7c04e5b4b3e351049b5b7c0c9..de0181d42b615f378d689884a6a6585bde1e8755 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index 100f020666ec735791e57a68b355d542f4749873..7647bb6b6823b0c6dfcf7c529862fa75f7f9dd07 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -1,5 +1,5 @@
<!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/xml/account_advanced_prefs.xml b/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
index a7ffb9e8205a413d19a9ce59d8249956b3c1e7a1..3fda3e297ebf9b0299eaa5ffc8fb486d5b73fed4 100644
--- a/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_advanced_prefs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/xml/account_audio_prefs.xml b/ring-android/app/src/main/res/xml/account_audio_prefs.xml
index 313dac6534fc9b7ef5d1c93acf0ef8c3e21ece88..c6e20b56896381342b6a6622e171ee2d6635a733 100644
--- a/ring-android/app/src/main/res/xml/account_audio_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_audio_prefs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/res/xml/account_credentials.xml b/ring-android/app/src/main/res/xml/account_credentials.xml
index bc59bac6984d598af4cc394f4fb5c6f490a9d8fc..eb72b2427ed7ba7c70d7e5d592a78f89690b1c26 100644
--- a/ring-android/app/src/main/res/xml/account_credentials.xml
+++ b/ring-android/app/src/main/res/xml/account_credentials.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
diff --git a/ring-android/app/src/main/res/xml/account_general_prefs.xml b/ring-android/app/src/main/res/xml/account_general_prefs.xml
index ddc86494de7af2df6c1c395b52a64fbb215bf4ac..09fd0a8d408d8c5a7bc2379f034c3e71066f9b0b 100644
--- a/ring-android/app/src/main/res/xml/account_general_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_general_prefs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Savard <alexandre.savard@gmail.com>
Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -18,17 +18,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
diff --git a/ring-android/app/src/main/res/xml/account_sdes.xml b/ring-android/app/src/main/res/xml/account_sdes.xml
index 01378b383630b0a275e37ea946c2747dafe74140..04aed4246eb31efbc82eb82ce503c77700772090 100644
--- a/ring-android/app/src/main/res/xml/account_sdes.xml
+++ b/ring-android/app/src/main/res/xml/account_sdes.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
diff --git a/ring-android/app/src/main/res/xml/account_security_prefs.xml b/ring-android/app/src/main/res/xml/account_security_prefs.xml
index a797e03ee8ee01f033662ece04e835c5db46761e..090d2dbd6394336ff0487e339164e3e793f45125 100644
--- a/ring-android/app/src/main/res/xml/account_security_prefs.xml
+++ b/ring-android/app/src/main/res/xml/account_security_prefs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/ring-android/app/src/main/res/xml/account_tls.xml b/ring-android/app/src/main/res/xml/account_tls.xml
index 7495b4b2d047a89d734579813ed647d83cf223fd..493aaac7147e34a6fc071bc67820f204274499cb 100644
--- a/ring-android/app/src/main/res/xml/account_tls.xml
+++ b/ring-android/app/src/main/res/xml/account_tls.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/ring-android/app/src/main/res/xml/account_zrtp.xml b/ring-android/app/src/main/res/xml/account_zrtp.xml
index 8aa4db8bca00caf290b341549c532f9d8b18d8fb..fb452c0036c0f8cb3c0f97bb45e00deb54cea2c7 100644
--- a/ring-android/app/src/main/res/xml/account_zrtp.xml
+++ b/ring-android/app/src/main/res/xml/account_zrtp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
@@ -17,17 +17,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >