From 064e1e066e096dcfd5859a203f095bca901c3b8d Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Tue, 1 Oct 2013 16:18:42 -0400
Subject: [PATCH] * #31001: com.savoirfaire -> org.sflphone
---
AndroidManifest.xml | 26 ++---
Makefile | 2 +-
jenkins-sflphone-android.sh | 4 +-
make-swig.sh | 4 +-
res/layout/activity_call_layout.xml | 4 +-
res/layout/activity_sflphone_home.xml | 8 +-
res/layout/frag_call.xml | 2 +-
res/layout/frag_contact_list_header.xml | 2 +-
res/layout/frag_dialing.xml | 2 +-
.../sflphone/model/Conference.aidl | 4 -
.../sflphone/model/SipCall.aidl | 4 -
.../service/ConfigurationManagerCallback.java | 104 ------------------
.../sflphone/account/AccountDetail.java | 2 +-
.../account/AccountDetailAdvanced.java | 4 +-
.../sflphone/account/AccountDetailBasic.java | 4 +-
.../sflphone/account/AccountDetailSrtp.java | 4 +-
.../sflphone/account/AccountDetailTls.java | 4 +-
.../account/AccountDetailsHandler.java | 10 +-
.../sflphone/account/AudioHandler.java | 6 +-
.../sflphone/account/CallDetailsHandler.java | 8 +-
.../sflphone/account/HistoryHandler.java | 8 +-
.../adapters/AccountSelectionAdapter.java | 7 +-
.../sflphone/adapters/ContactPictureTask.java | 4 +-
.../sflphone/adapters/ContactsAdapter.java | 7 +-
.../sflphone/adapters/MenuAdapter.java | 6 +-
.../adapters/SectionsPagerAdapter.java | 11 +-
.../adapters/StarredContactsAdapter.java | 8 +-
.../client/AccountPreferenceActivity.java | 16 +--
.../sflphone/client/AccountWizard.java | 10 +-
.../sflphone/client/ActivityHolder.java | 10 +-
.../sflphone/client/CallActivity.java | 30 ++---
.../sflphone/client/SFLPhoneHomeActivity.java | 38 +++----
.../client/SFLPhonePreferenceActivity.java | 12 +-
.../sflphone/client/SFLphoneApplication.java | 11 +-
.../sflphone/fragments/AboutFragment.java | 6 +-
.../fragments/AccountCreationFragment.java | 16 +--
.../fragments/AccountManagementFragment.java | 30 ++---
.../fragments/AudioManagementFragment.java | 6 +-
.../sflphone/fragments/CallFragment.java | 20 ++--
.../sflphone/fragments/CallListFragment.java | 14 +--
.../fragments/ConferenceDFragment.java | 10 +-
.../fragments/ContactListFragment.java | 20 ++--
.../sflphone/fragments/DialingFragment.java | 13 +--
.../fragments/HelpGesturesFragment.java | 6 +-
.../sflphone/fragments/HistoryFragment.java | 16 +--
.../sflphone/fragments/HomeFragment.java | 20 ++--
.../sflphone/fragments/MenuFragment.java | 30 ++---
.../sflphone/fragments/TransferDFragment.java | 12 +-
.../interfaces/AccountsInterface.java | 2 +-
.../sflphone/interfaces/CallInterface.java | 2 +-
.../sflphone/loaders/AccountsLoader.java | 8 +-
.../sflphone/loaders/ContactsLoader.java | 6 +-
.../sflphone/loaders/HistoryLoader.java | 16 +--
.../sflphone/loaders/LoaderConstants.java | 2 +-
.../sflphone/model/Account.java | 12 +-
.../sflphone/model/Attractor.java | 2 +-
.../sflphone/model/Bubble.java | 7 +-
.../sflphone/model/BubbleModel.java | 2 +-
.../sflphone/model/BubblesView.java | 11 +-
.../sflphone/model/CallContact.java | 2 +-
.../sflphone/model/CallTimer.java | 2 +-
src/org/sflphone/model/Conference.aidl | 4 +
.../sflphone/model/Conference.java | 2 +-
.../sflphone/model/HistoryEntry.java | 4 +-
src/org/sflphone/model/SipCall.aidl | 4 +
.../sflphone/model/SipCall.java | 2 +-
.../sflphone/receivers/AccountsReceiver.java | 8 +-
.../sflphone/receivers/CallReceiver.java | 8 +-
.../receivers/ExternalCallReceiver.java | 2 +-
.../sflphone/receivers/IncomingReceiver.java | 19 ++--
.../sflphone/service/CallManagerCallBack.java | 2 +-
.../sflphone/service/ISipService.aidl | 6 +-
.../sflphone/service/ServiceConstants.java | 2 +-
.../sflphone/service/SipService.java | 24 ++--
.../sflphone/views/CallPaneLayout.java | 6 +-
.../sflphone/views/ClearableEditText.java | 6 +-
.../sflphone/views/CustomSlidingDrawer.java | 4 +-
.../views/SwipeListViewTouchListener.java | 2 +-
.../sflphone/views/TACGridView.java | 2 +-
79 files changed, 341 insertions(+), 445 deletions(-)
delete mode 100644 src/com/savoirfairelinux/sflphone/model/Conference.aidl
delete mode 100644 src/com/savoirfairelinux/sflphone/model/SipCall.aidl
delete mode 100644 src/com/savoirfairelinux/sflphone/service/ConfigurationManagerCallback.java
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetail.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetailAdvanced.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetailBasic.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetailSrtp.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetailTls.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AccountDetailsHandler.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/account/AudioHandler.java (84%)
rename src/{com/savoirfairelinux => org}/sflphone/account/CallDetailsHandler.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/account/HistoryHandler.java (90%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/AccountSelectionAdapter.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/ContactPictureTask.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/ContactsAdapter.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/MenuAdapter.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/SectionsPagerAdapter.java (90%)
rename src/{com/savoirfairelinux => org}/sflphone/adapters/StarredContactsAdapter.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/client/AccountPreferenceActivity.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/client/AccountWizard.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/client/ActivityHolder.java (92%)
rename src/{com/savoirfairelinux => org}/sflphone/client/CallActivity.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/client/SFLPhoneHomeActivity.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/client/SFLPhonePreferenceActivity.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/client/SFLphoneApplication.java (85%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/AboutFragment.java (91%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/AccountCreationFragment.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/AccountManagementFragment.java (94%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/AudioManagementFragment.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/CallFragment.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/CallListFragment.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/ConferenceDFragment.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/ContactListFragment.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/DialingFragment.java (95%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/HelpGesturesFragment.java (83%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/HistoryFragment.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/HomeFragment.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/MenuFragment.java (91%)
rename src/{com/savoirfairelinux => org}/sflphone/fragments/TransferDFragment.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/interfaces/AccountsInterface.java (77%)
rename src/{com/savoirfairelinux => org}/sflphone/interfaces/CallInterface.java (88%)
rename src/{com/savoirfairelinux => org}/sflphone/loaders/AccountsLoader.java (89%)
rename src/{com/savoirfairelinux => org}/sflphone/loaders/ContactsLoader.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/loaders/HistoryLoader.java (91%)
rename src/{com/savoirfairelinux => org}/sflphone/loaders/LoaderConstants.java (79%)
rename src/{com/savoirfairelinux => org}/sflphone/model/Account.java (94%)
rename src/{com/savoirfairelinux => org}/sflphone/model/Attractor.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/model/Bubble.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/model/BubbleModel.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/model/BubblesView.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/model/CallContact.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/model/CallTimer.java (93%)
create mode 100644 src/org/sflphone/model/Conference.aidl
rename src/{com/savoirfairelinux => org}/sflphone/model/Conference.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/model/HistoryEntry.java (97%)
create mode 100644 src/org/sflphone/model/SipCall.aidl
rename src/{com/savoirfairelinux => org}/sflphone/model/SipCall.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/receivers/AccountsReceiver.java (82%)
rename src/{com/savoirfairelinux => org}/sflphone/receivers/CallReceiver.java (94%)
rename src/{com/savoirfairelinux => org}/sflphone/receivers/ExternalCallReceiver.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/receivers/IncomingReceiver.java (96%)
rename src/{com/savoirfairelinux => org}/sflphone/service/CallManagerCallBack.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/service/ISipService.aidl (93%)
rename src/{com/savoirfairelinux => org}/sflphone/service/ServiceConstants.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/service/SipService.java (98%)
rename src/{com/savoirfairelinux => org}/sflphone/views/CallPaneLayout.java (89%)
rename src/{com/savoirfairelinux => org}/sflphone/views/ClearableEditText.java (97%)
rename src/{com/savoirfairelinux => org}/sflphone/views/CustomSlidingDrawer.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/views/SwipeListViewTouchListener.java (99%)
rename src/{com/savoirfairelinux => org}/sflphone/views/TACGridView.java (93%)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af1532d0e..4a083bb11 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,8 +31,8 @@ shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.savoirfairelinux.sflphone"
- android:versionCode="1"
+ package="org.sflphone"
+ android:versionCode="2"
android:versionName="1.0" >
<uses-sdk
@@ -52,13 +52,13 @@ as that of the covered work.
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
- android:name="com.savoirfairelinux.sflphone.client.SFLphoneApplication"
+ android:name="org.sflphone.client.SFLphoneApplication"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
- android:name="com.savoirfairelinux.sflphone.client.SFLPhoneHomeActivity"
+ android:name="org.sflphone.client.SFLPhoneHomeActivity"
android:label="@string/title_activity_sflphone_home"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"
@@ -70,25 +70,25 @@ as that of the covered work.
</intent-filter>
</activity>
<activity
- android:name="com.savoirfairelinux.sflphone.client.SFLPhonePreferenceActivity"
+ android:name="org.sflphone.client.SFLPhonePreferenceActivity"
android:screenOrientation="portrait" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="com.savoirfairelinux.sflphone.client.SFLPhoneHome" />
+ android:value="org.sflphone.client.SFLPhoneHome" />
</activity>
<activity
- android:name="com.savoirfairelinux.sflphone.client.AccountWizard"
+ android:name="org.sflphone.client.AccountWizard"
android:screenOrientation="portrait" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="com.savoirfairelinux.sflphone.client.SFLPhoneHome" />
+ android:value="org.sflphone.client.SFLPhoneHome" />
</activity>
<activity
- android:name="com.savoirfairelinux.sflphone.client.AccountPreferenceActivity"
+ android:name="org.sflphone.client.AccountPreferenceActivity"
android:label="@string/app_name"
android:screenOrientation="portrait" />
<activity
- android:name="com.savoirfairelinux.sflphone.client.CallActivity"
+ android:name="org.sflphone.client.CallActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan" >
@@ -102,7 +102,7 @@ as that of the covered work.
</activity>
<!-- <receiver -->
- <!-- android:name="com.savoirfairelinux.sflphone.receivers.ExternalCallReceiver" -->
+ <!-- android:name="org.sflphone.receivers.ExternalCallReceiver" -->
<!-- android:exported="true" > -->
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.NEW_OUTGOING_CALL" /> -->
@@ -113,7 +113,7 @@ as that of the covered work.
<!-- </receiver> -->
<service
- android:name="com.savoirfairelinux.sflphone.service.SipService"
+ android:name="org.sflphone.service.SipService"
android:exported="false" >
<intent-filter>
<action android:name=".service.SipService" />
@@ -121,7 +121,7 @@ as that of the covered work.
</service>
<activity
- android:name="com.savoirfairelinux.sflphone.client.ActivityHolder"
+ android:name="org.sflphone.client.ActivityHolder"
android:label="@string/title_activity_sflphone_home" >
</activity>
</application>
diff --git a/Makefile b/Makefile
index 9311d737a..2fb9f3c30 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ install: $(APP)
adb install -r $^
uninstall:
- adb uninstall com.savoirfairelinux.sflphone
+ adb uninstall org.sflphone
clean:
ant clean
diff --git a/jenkins-sflphone-android.sh b/jenkins-sflphone-android.sh
index 366eceaa2..04fcdc1b9 100755
--- a/jenkins-sflphone-android.sh
+++ b/jenkins-sflphone-android.sh
@@ -64,7 +64,7 @@ ANDROID_PROJECT_PATH=$HOME/sflphone/sflphone-android
ANDROID_SFLPHONE_BIN=bin/SFLPhoneHome-debug.apk
ANDROID_SFLPHONE_TEST_SUITE=tests/bin/sflphoneTest-debug.apk
-ANDROID_TEST_PACKAGE=com.savoirfairelinux.sflphone.tests
+ANDROID_TEST_PACKAGE=org.sflphone.tests
ANDROID_TEST_RUNNNER=android.test.InstrumentationTestRunner
print_help() {
@@ -161,7 +161,7 @@ build_sflphone_test_suite() {
}
run_test_suite() {
- adb shell am instrument -w com.savoirfairelinux.sflphone.tests/android.test.InstrumentationTestRunner
+ adb shell am instrument -w org.sflphone.tests/android.test.InstrumentationTestRunner
}
if [ "$#" -eq 0 ]; then
diff --git a/make-swig.sh b/make-swig.sh
index 54ea4a3f1..9a41cca81 100755
--- a/make-swig.sh
+++ b/make-swig.sh
@@ -40,8 +40,8 @@
SRCDIR=jni/sflphone/daemon/src
NATIVE=client/android
NATIVEDIR=$SRCDIR/$NATIVE
-PACKAGE=com.savoirfairelinux.sflphone.service
-PACKAGEDIR=src/com/savoirfairelinux/sflphone/service
+PACKAGE=org.sflphone.service
+PACKAGEDIR=src/org/sflphone/service
ROOT=`pwd`
echo "in $ROOT"
diff --git a/res/layout/activity_call_layout.xml b/res/layout/activity_call_layout.xml
index 52201989a..c6ed179d4 100644
--- a/res/layout/activity_call_layout.xml
+++ b/res/layout/activity_call_layout.xml
@@ -30,7 +30,7 @@ shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
-->
-<com.savoirfairelinux.sflphone.views.CallPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sflphone.views.CallPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -52,4 +52,4 @@ as that of the covered work.
android:layout_centerInParent="true" />
</RelativeLayout>
-</com.savoirfairelinux.sflphone.views.CallPaneLayout>
\ No newline at end of file
+</org.sflphone.views.CallPaneLayout>
\ No newline at end of file
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index e1ca45569..7fcec311d 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -31,14 +31,14 @@ as that of the covered work.
-->
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.savoirfairelinux.sflphone"
+ xmlns:app="http://schemas.android.com/apk/res/org.sflphone"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.savoirfairelinux.sflphone"
+ xmlns:app="http://schemas.android.com/apk/res/org.sflphone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
@@ -56,7 +56,7 @@ as that of the covered work.
android:layout_height="wrap_content" />
</android.support.v4.view.ViewPager>
- <com.savoirfairelinux.sflphone.views.CustomSlidingDrawer
+ <org.sflphone.views.CustomSlidingDrawer
android:id="@+id/custom_sliding_drawer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -112,7 +112,7 @@ as that of the covered work.
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/lighter_gray" />
- </com.savoirfairelinux.sflphone.views.CustomSlidingDrawer>
+ </org.sflphone.views.CustomSlidingDrawer>
</RelativeLayout>
<FrameLayout
diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml
index 6f79ef4d0..5a77b33c9 100644
--- a/res/layout/frag_call.xml
+++ b/res/layout/frag_call.xml
@@ -40,7 +40,7 @@
android:src="@drawable/device_access_dial_pad" />
</RelativeLayout>
- <com.savoirfairelinux.sflphone.model.BubblesView
+ <org.sflphone.model.BubblesView
android:id="@+id/main_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/frag_contact_list_header.xml b/res/layout/frag_contact_list_header.xml
index f1dbe5eba..3c2dea2d9 100644
--- a/res/layout/frag_contact_list_header.xml
+++ b/res/layout/frag_contact_list_header.xml
@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:orientation="vertical" >
- <com.savoirfairelinux.sflphone.views.TACGridView
+ <org.sflphone.views.TACGridView
android:id="@+id/favorites_grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index 4f5b9c58d..0b8ae82f3 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -6,7 +6,7 @@
android:background="@color/lighter_gray"
android:padding="5dp" >
- <com.savoirfairelinux.sflphone.views.ClearableEditText
+ <org.sflphone.views.ClearableEditText
android:id="@+id/textField"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/src/com/savoirfairelinux/sflphone/model/Conference.aidl b/src/com/savoirfairelinux/sflphone/model/Conference.aidl
deleted file mode 100644
index a959fe35f..000000000
--- a/src/com/savoirfairelinux/sflphone/model/Conference.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.savoirfairelinux.sflphone.model;
-
-
-parcelable Conference;
\ No newline at end of file
diff --git a/src/com/savoirfairelinux/sflphone/model/SipCall.aidl b/src/com/savoirfairelinux/sflphone/model/SipCall.aidl
deleted file mode 100644
index e1e7264f9..000000000
--- a/src/com/savoirfairelinux/sflphone/model/SipCall.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.savoirfairelinux.sflphone.model;
-
-
-parcelable SipCall;
\ No newline at end of file
diff --git a/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerCallback.java b/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerCallback.java
deleted file mode 100644
index 4b96ae146..000000000
--- a/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerCallback.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr)
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Savard <alexandre.savard@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.
- * If you own a pjsip commercial license you can also redistribute it
- * and/or modify it under the terms of the GNU Lesser General Public License
- * as an android library.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-package com.savoirfairelinux.sflphone.service;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
-
-public class ConfigurationManagerCallback extends ConfigurationCallback {
-// private static final String TAG = "ConfigurationManagerCallback";
- private Context mContext;
-
- static public final String SIGNAL_NAME = "signal-name";
- static public final String ACCOUNTS_CHANGED = "accounts-changed";
- static public final String ACCOUNT_STATE_CHANGED = "account-state-changed";
-
- public ConfigurationManagerCallback(Context context) {
- mContext = context;
- }
-
- @Override
- public void on_accounts_changed() {
- sendAccountsChangedMessage();
- }
-
- @Override
- public void on_account_state_changed(String accoundID, int state) {
- String strState = "";
- switch (state){
- case 0:
- strState = "UNREGISTERED";
- break;
- case 1:
- strState = "TRYING";
- break;
- case 2:
- strState = "REGISTERED";
- break;
- case 3:
- strState = "ERROR_GENERIC";
- break;
- case 4:
- strState = "ERROR_AUTH";
- break;
- case 5:
- strState = "ERROR_NETWORK";
- break;
- case 6:
- strState = "ERROR_HOST";
- break;
- case 7:
- strState = "ERROR_EXIST_STUN";
- break;
- case 8:
- strState = "ERROR_NOT_ACCEPTABLE";
- break;
- case 9:
- strState = "NUMBER_OF_STATES";
- break;
- }
-
-
- sendAccountsStateChangedMessage(accoundID, strState, 0);
- }
-
- @Override
- public void on_account_state_changed_with_code(String accoundID, String state, int code) {
- sendAccountsStateChangedMessage(accoundID, state, code);
- }
-
- private void sendAccountsStateChangedMessage(String accoundID, String state, int code) {
- Intent intent = new Intent(ACCOUNT_STATE_CHANGED);
- intent.putExtra("Account", accoundID);
- intent.putExtra("state", state);
- intent.putExtra("code", code);
- LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
- }
-
- private void sendAccountsChangedMessage() {
- Intent intent = new Intent(ACCOUNTS_CHANGED);
- LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
- }
-
-}
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetail.java b/src/org/sflphone/account/AccountDetail.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetail.java
rename to src/org/sflphone/account/AccountDetail.java
index 957079fdb..3678a0b6c 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetail.java
+++ b/src/org/sflphone/account/AccountDetail.java
@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java b/src/org/sflphone/account/AccountDetailAdvanced.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java
rename to src/org/sflphone/account/AccountDetailAdvanced.java
index 56269b580..e02c22ee0 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java
+++ b/src/org/sflphone/account/AccountDetailAdvanced.java
@@ -19,14 +19,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
public class AccountDetailAdvanced implements AccountDetail {
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailBasic.java b/src/org/sflphone/account/AccountDetailBasic.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetailBasic.java
rename to src/org/sflphone/account/AccountDetailBasic.java
index b2766edb3..7b5022052 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailBasic.java
+++ b/src/org/sflphone/account/AccountDetailBasic.java
@@ -19,14 +19,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
public class AccountDetailBasic implements AccountDetail {
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailSrtp.java b/src/org/sflphone/account/AccountDetailSrtp.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetailSrtp.java
rename to src/org/sflphone/account/AccountDetailSrtp.java
index 7b82d7248..c362097bc 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailSrtp.java
+++ b/src/org/sflphone/account/AccountDetailSrtp.java
@@ -19,14 +19,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
public class AccountDetailSrtp implements AccountDetail{
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailTls.java b/src/org/sflphone/account/AccountDetailTls.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetailTls.java
rename to src/org/sflphone/account/AccountDetailTls.java
index 8d535f702..7a13c08be 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailTls.java
+++ b/src/org/sflphone/account/AccountDetailTls.java
@@ -19,14 +19,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
public class AccountDetailTls implements AccountDetail {
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java b/src/org/sflphone/account/AccountDetailsHandler.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java
rename to src/org/sflphone/account/AccountDetailsHandler.java
index 0596beee8..2dcff63e1 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java
+++ b/src/org/sflphone/account/AccountDetailsHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -19,15 +19,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
-import android.util.Log;
-
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.service.StringMap;
+import org.sflphone.R;
+import org.sflphone.service.StringMap;
public class AccountDetailsHandler {
// private static final String TAG = "AccountDetailsHandler";
diff --git a/src/com/savoirfairelinux/sflphone/account/AudioHandler.java b/src/org/sflphone/account/AudioHandler.java
similarity index 84%
rename from src/com/savoirfairelinux/sflphone/account/AudioHandler.java
rename to src/org/sflphone/account/AudioHandler.java
index 589d7d883..b05a6bd10 100644
--- a/src/com/savoirfairelinux/sflphone/account/AudioHandler.java
+++ b/src/org/sflphone/account/AudioHandler.java
@@ -1,10 +1,10 @@
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
-import android.util.Log;
+import org.sflphone.service.IntVect;
-import com.savoirfairelinux.sflphone.service.IntVect;
+import android.util.Log;
public class AudioHandler {
diff --git a/src/com/savoirfairelinux/sflphone/account/CallDetailsHandler.java b/src/org/sflphone/account/CallDetailsHandler.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/account/CallDetailsHandler.java
rename to src/org/sflphone/account/CallDetailsHandler.java
index 76ff36b63..a950ea2d0 100644
--- a/src/com/savoirfairelinux/sflphone/account/CallDetailsHandler.java
+++ b/src/org/sflphone/account/CallDetailsHandler.java
@@ -29,14 +29,14 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.HashMap;
-import android.util.Log;
+import org.sflphone.service.ServiceConstants;
+import org.sflphone.service.StringMap;
-import com.savoirfairelinux.sflphone.service.ServiceConstants;
-import com.savoirfairelinux.sflphone.service.StringMap;
+import android.util.Log;
public class CallDetailsHandler {
diff --git a/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java b/src/org/sflphone/account/HistoryHandler.java
similarity index 90%
rename from src/com/savoirfairelinux/sflphone/account/HistoryHandler.java
rename to src/org/sflphone/account/HistoryHandler.java
index 993b0b5df..3427c74f7 100644
--- a/src/com/savoirfairelinux/sflphone/account/HistoryHandler.java
+++ b/src/org/sflphone/account/HistoryHandler.java
@@ -1,11 +1,11 @@
-package com.savoirfairelinux.sflphone.account;
+package org.sflphone.account;
import java.util.ArrayList;
import java.util.HashMap;
-import com.savoirfairelinux.sflphone.service.ServiceConstants;
-import com.savoirfairelinux.sflphone.service.StringMap;
-import com.savoirfairelinux.sflphone.service.VectMap;
+import org.sflphone.service.ServiceConstants;
+import org.sflphone.service.StringMap;
+import org.sflphone.service.VectMap;
public class HistoryHandler {
// private static final String TAG = HistoryHandler.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/adapters/AccountSelectionAdapter.java b/src/org/sflphone/adapters/AccountSelectionAdapter.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/adapters/AccountSelectionAdapter.java
rename to src/org/sflphone/adapters/AccountSelectionAdapter.java
index ae5d8a586..a15517d05 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/AccountSelectionAdapter.java
+++ b/src/org/sflphone/adapters/AccountSelectionAdapter.java
@@ -1,7 +1,9 @@
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.util.ArrayList;
+import org.sflphone.model.Account;
+
import android.content.Context;
import android.content.Intent;
import android.util.Log;
@@ -12,8 +14,7 @@ import android.widget.BaseAdapter;
import android.widget.RadioButton;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.model.Account;
+import org.sflphone.R;
public class AccountSelectionAdapter extends BaseAdapter {
diff --git a/src/com/savoirfairelinux/sflphone/adapters/ContactPictureTask.java b/src/org/sflphone/adapters/ContactPictureTask.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/adapters/ContactPictureTask.java
rename to src/org/sflphone/adapters/ContactPictureTask.java
index d1d5f6bb7..ade8e1951 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/ContactPictureTask.java
+++ b/src/org/sflphone/adapters/ContactPictureTask.java
@@ -29,7 +29,7 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.io.InputStream;
@@ -48,7 +48,7 @@ import android.net.Uri;
import android.provider.ContactsContract;
import android.widget.ImageView;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
public class ContactPictureTask implements Runnable {
private ImageView view;
diff --git a/src/com/savoirfairelinux/sflphone/adapters/ContactsAdapter.java b/src/org/sflphone/adapters/ContactsAdapter.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/adapters/ContactsAdapter.java
rename to src/org/sflphone/adapters/ContactsAdapter.java
index a47b20af1..3342c5af1 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/ContactsAdapter.java
+++ b/src/org/sflphone/adapters/ContactsAdapter.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.util.ArrayList;
import java.util.Collections;
@@ -8,6 +8,8 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.sflphone.model.CallContact;
+
import android.content.Context;
import android.util.SparseArray;
import android.view.LayoutInflater;
@@ -18,8 +20,7 @@ import android.widget.ImageView;
import android.widget.SectionIndexer;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.model.CallContact;
+import org.sflphone.R;
public class ContactsAdapter extends BaseAdapter implements SectionIndexer {
diff --git a/src/com/savoirfairelinux/sflphone/adapters/MenuAdapter.java b/src/org/sflphone/adapters/MenuAdapter.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/adapters/MenuAdapter.java
rename to src/org/sflphone/adapters/MenuAdapter.java
index bf4a80793..2823b0176 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/MenuAdapter.java
+++ b/src/org/sflphone/adapters/MenuAdapter.java
@@ -1,8 +1,10 @@
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.sflphone.R;
+
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
@@ -10,8 +12,6 @@ import android.widget.Adapter;
import android.widget.ArrayAdapter;
import android.widget.BaseAdapter;
-import com.savoirfairelinux.sflphone.R;
-
public class MenuAdapter extends BaseAdapter {
public final Map<String, Adapter> sections = new LinkedHashMap<String, Adapter>();
public final ArrayAdapter<String> headers;
diff --git a/src/com/savoirfairelinux/sflphone/adapters/SectionsPagerAdapter.java b/src/org/sflphone/adapters/SectionsPagerAdapter.java
similarity index 90%
rename from src/com/savoirfairelinux/sflphone/adapters/SectionsPagerAdapter.java
rename to src/org/sflphone/adapters/SectionsPagerAdapter.java
index 903eac62f..c9d933747 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/SectionsPagerAdapter.java
+++ b/src/org/sflphone/adapters/SectionsPagerAdapter.java
@@ -1,8 +1,12 @@
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.util.ArrayList;
import java.util.Locale;
+import org.sflphone.fragments.DialingFragment;
+import org.sflphone.fragments.HistoryFragment;
+import org.sflphone.fragments.HomeFragment;
+
import android.app.Fragment;
import android.app.FragmentManager;
import android.content.Context;
@@ -10,10 +14,7 @@ import android.os.RemoteException;
import android.support.v13.app.FragmentStatePagerAdapter;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.DialingFragment;
-import com.savoirfairelinux.sflphone.fragments.HistoryFragment;
-import com.savoirfairelinux.sflphone.fragments.HomeFragment;
+import org.sflphone.R;
public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
diff --git a/src/com/savoirfairelinux/sflphone/adapters/StarredContactsAdapter.java b/src/org/sflphone/adapters/StarredContactsAdapter.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/adapters/StarredContactsAdapter.java
rename to src/org/sflphone/adapters/StarredContactsAdapter.java
index 70ac20eec..6a010bc61 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/StarredContactsAdapter.java
+++ b/src/org/sflphone/adapters/StarredContactsAdapter.java
@@ -29,12 +29,15 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.adapters;
+package org.sflphone.adapters;
import java.util.ArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.sflphone.R;
+import org.sflphone.model.CallContact;
+
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
@@ -43,9 +46,6 @@ import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.model.CallContact;
-
public class StarredContactsAdapter extends BaseAdapter {
private ExecutorService infos_fetcher = Executors.newCachedThreadPool();
diff --git a/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java b/src/org/sflphone/client/AccountPreferenceActivity.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java
rename to src/org/sflphone/client/AccountPreferenceActivity.java
index 2a9944895..eec6f6497 100644
--- a/src/com/savoirfairelinux/sflphone/client/AccountPreferenceActivity.java
+++ b/src/org/sflphone/client/AccountPreferenceActivity.java
@@ -29,7 +29,7 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
import java.net.NetworkInterface;
import java.net.SocketException;
@@ -37,6 +37,13 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import org.sflphone.R;
+import org.sflphone.account.AccountDetail;
+import org.sflphone.account.AccountDetailAdvanced;
+import org.sflphone.account.AccountDetailBasic;
+import org.sflphone.account.AccountDetailSrtp;
+import org.sflphone.account.AccountDetailTls;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -55,13 +62,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.account.AccountDetail;
-import com.savoirfairelinux.sflphone.account.AccountDetailAdvanced;
-import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
-import com.savoirfairelinux.sflphone.account.AccountDetailSrtp;
-import com.savoirfairelinux.sflphone.account.AccountDetailTls;
-
public class AccountPreferenceActivity extends PreferenceActivity {
private static final String TAG = "AccoutPreferenceActivity";
diff --git a/src/com/savoirfairelinux/sflphone/client/AccountWizard.java b/src/org/sflphone/client/AccountWizard.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/client/AccountWizard.java
rename to src/org/sflphone/client/AccountWizard.java
index 129a6bf95..1faaaf924 100644
--- a/src/com/savoirfairelinux/sflphone/client/AccountWizard.java
+++ b/src/org/sflphone/client/AccountWizard.java
@@ -29,11 +29,15 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
import java.util.ArrayList;
import java.util.Locale;
+import org.sflphone.R;
+import org.sflphone.fragments.AccountCreationFragment;
+import org.sflphone.interfaces.AccountsInterface;
+
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
@@ -45,10 +49,6 @@ import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.MenuItem;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.AccountCreationFragment;
-import com.savoirfairelinux.sflphone.interfaces.AccountsInterface;
-
public class AccountWizard extends Activity implements AccountsInterface {
static final String TAG = "AccountWizard";
diff --git a/src/com/savoirfairelinux/sflphone/client/ActivityHolder.java b/src/org/sflphone/client/ActivityHolder.java
similarity index 92%
rename from src/com/savoirfairelinux/sflphone/client/ActivityHolder.java
rename to src/org/sflphone/client/ActivityHolder.java
index 63e1748b6..34d167e47 100644
--- a/src/com/savoirfairelinux/sflphone/client/ActivityHolder.java
+++ b/src/org/sflphone/client/ActivityHolder.java
@@ -29,17 +29,17 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
+
+import org.sflphone.R;
+import org.sflphone.fragments.AboutFragment;
+import org.sflphone.fragments.HelpGesturesFragment;
import android.app.Activity;
import android.app.FragmentTransaction;
import android.os.Bundle;
import android.view.MenuItem;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.AboutFragment;
-import com.savoirfairelinux.sflphone.fragments.HelpGesturesFragment;
-
/**
* This Activity holds some conex fragments not requiring a lot of interaction: HelpGesturesFragment, LegalFragment, ContributeFragment
* @author lisional
diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/org/sflphone/client/CallActivity.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/client/CallActivity.java
rename to src/org/sflphone/client/CallActivity.java
index 79717b0ba..71632c47c 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/org/sflphone/client/CallActivity.java
@@ -31,10 +31,24 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
import java.util.HashMap;
+import org.sflphone.R;
+import org.sflphone.fragments.CallFragment;
+import org.sflphone.fragments.CallListFragment;
+import org.sflphone.interfaces.CallInterface;
+import org.sflphone.model.CallContact;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.model.SipCall.state;
+import org.sflphone.receivers.CallReceiver;
+import org.sflphone.service.CallManagerCallBack;
+import org.sflphone.service.ISipService;
+import org.sflphone.service.SipService;
+import org.sflphone.views.CallPaneLayout;
+
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
@@ -55,20 +69,6 @@ import android.view.View;
import android.view.Window;
import android.widget.Toast;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.CallFragment;
-import com.savoirfairelinux.sflphone.fragments.CallListFragment;
-import com.savoirfairelinux.sflphone.interfaces.CallInterface;
-import com.savoirfairelinux.sflphone.model.CallContact;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.model.SipCall.state;
-import com.savoirfairelinux.sflphone.receivers.CallReceiver;
-import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.SipService;
-import com.savoirfairelinux.sflphone.views.CallPaneLayout;
-
public class CallActivity extends Activity implements CallInterface, CallFragment.Callbacks, CallListFragment.Callbacks {
static final String TAG = "CallActivity";
private ISipService service;
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java b/src/org/sflphone/client/SFLPhoneHomeActivity.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
rename to src/org/sflphone/client/SFLPhoneHomeActivity.java
index 01ba2a5e9..96333bc37 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
+++ b/src/org/sflphone/client/SFLPhoneHomeActivity.java
@@ -29,11 +29,29 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
import java.util.Timer;
import java.util.TimerTask;
+import org.sflphone.R;
+import org.sflphone.adapters.SectionsPagerAdapter;
+import org.sflphone.fragments.ContactListFragment;
+import org.sflphone.fragments.DialingFragment;
+import org.sflphone.fragments.HistoryFragment;
+import org.sflphone.fragments.HomeFragment;
+import org.sflphone.fragments.MenuFragment;
+import org.sflphone.interfaces.CallInterface;
+import org.sflphone.loaders.LoaderConstants;
+import org.sflphone.model.CallContact;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.receivers.CallReceiver;
+import org.sflphone.service.CallManagerCallBack;
+import org.sflphone.service.ISipService;
+import org.sflphone.service.SipService;
+import org.sflphone.views.CustomSlidingDrawer;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ComponentName;
@@ -61,24 +79,6 @@ import android.view.View;
import android.widget.RelativeLayout;
import android.widget.Toast;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.adapters.SectionsPagerAdapter;
-import com.savoirfairelinux.sflphone.fragments.ContactListFragment;
-import com.savoirfairelinux.sflphone.fragments.DialingFragment;
-import com.savoirfairelinux.sflphone.fragments.HistoryFragment;
-import com.savoirfairelinux.sflphone.fragments.HomeFragment;
-import com.savoirfairelinux.sflphone.fragments.MenuFragment;
-import com.savoirfairelinux.sflphone.interfaces.CallInterface;
-import com.savoirfairelinux.sflphone.loaders.LoaderConstants;
-import com.savoirfairelinux.sflphone.model.CallContact;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.receivers.CallReceiver;
-import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.SipService;
-import com.savoirfairelinux.sflphone.views.CustomSlidingDrawer;
-
public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Callbacks, ContactListFragment.Callbacks, HomeFragment.Callbacks,
HistoryFragment.Callbacks, CallInterface, MenuFragment.Callbacks {
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java b/src/org/sflphone/client/SFLPhonePreferenceActivity.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
rename to src/org/sflphone/client/SFLPhonePreferenceActivity.java
index 86f21fc4c..205258ebf 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
+++ b/src/org/sflphone/client/SFLPhonePreferenceActivity.java
@@ -29,10 +29,15 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
import java.util.Locale;
+import org.sflphone.R;
+import org.sflphone.fragments.AccountManagementFragment;
+import org.sflphone.service.ISipService;
+import org.sflphone.service.SipService;
+
import android.app.ActionBar;
import android.app.Activity;
import android.app.Fragment;
@@ -49,11 +54,6 @@ import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.MenuItem;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.AccountManagementFragment;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.SipService;
-
public class SFLPhonePreferenceActivity extends Activity implements ActionBar.TabListener {
static final int NUM_PAGES = 1;
static final String TAG = SFLPhonePreferenceActivity.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java b/src/org/sflphone/client/SFLphoneApplication.java
similarity index 85%
rename from src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java
rename to src/org/sflphone/client/SFLphoneApplication.java
index bc3d7c812..57d9497b1 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java
+++ b/src/org/sflphone/client/SFLphoneApplication.java
@@ -1,16 +1,13 @@
-package com.savoirfairelinux.sflphone.client;
+package org.sflphone.client;
+
+import org.sflphone.service.ISipService;
+import org.sflphone.service.SipService;
import android.app.AlertDialog;
import android.app.Application;
import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.util.Log;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.SipService;
-
public class SFLphoneApplication extends Application
{
static final String TAG = "SFLphoneApplication";
diff --git a/src/com/savoirfairelinux/sflphone/fragments/AboutFragment.java b/src/org/sflphone/fragments/AboutFragment.java
similarity index 91%
rename from src/com/savoirfairelinux/sflphone/fragments/AboutFragment.java
rename to src/org/sflphone/fragments/AboutFragment.java
index acbe4400b..32bf95732 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/AboutFragment.java
+++ b/src/org/sflphone/fragments/AboutFragment.java
@@ -1,4 +1,6 @@
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
+
+import org.sflphone.R;
import android.app.Fragment;
import android.os.Bundle;
@@ -9,8 +11,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-
public class AboutFragment extends Fragment {
@Override
diff --git a/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java b/src/org/sflphone/fragments/AccountCreationFragment.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java
rename to src/org/sflphone/fragments/AccountCreationFragment.java
index 425c984b8..774180db6 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java
+++ b/src/org/sflphone/fragments/AccountCreationFragment.java
@@ -1,7 +1,14 @@
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.HashMap;
+import org.sflphone.R;
+import org.sflphone.account.AccountDetail;
+import org.sflphone.account.AccountDetailAdvanced;
+import org.sflphone.account.AccountDetailBasic;
+import org.sflphone.account.AccountDetailSrtp;
+import org.sflphone.account.AccountDetailTls;
+
import android.app.Activity;
import android.app.Fragment;
import android.content.Intent;
@@ -12,13 +19,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.account.AccountDetail;
-import com.savoirfairelinux.sflphone.account.AccountDetailAdvanced;
-import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
-import com.savoirfairelinux.sflphone.account.AccountDetailSrtp;
-import com.savoirfairelinux.sflphone.account.AccountDetailTls;
-
public class AccountCreationFragment extends Fragment {
// Values for email and password at the time of the login attempt.
diff --git a/src/com/savoirfairelinux/sflphone/fragments/AccountManagementFragment.java b/src/org/sflphone/fragments/AccountManagementFragment.java
similarity index 94%
rename from src/com/savoirfairelinux/sflphone/fragments/AccountManagementFragment.java
rename to src/org/sflphone/fragments/AccountManagementFragment.java
index c3c692abf..947d1bfd6 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/AccountManagementFragment.java
+++ b/src/org/sflphone/fragments/AccountManagementFragment.java
@@ -30,12 +30,26 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
+import org.sflphone.R;
+import org.sflphone.account.AccountDetail;
+import org.sflphone.account.AccountDetailAdvanced;
+import org.sflphone.account.AccountDetailBasic;
+import org.sflphone.account.AccountDetailSrtp;
+import org.sflphone.account.AccountDetailTls;
+import org.sflphone.client.AccountPreferenceActivity;
+import org.sflphone.client.AccountWizard;
+import org.sflphone.client.SFLPhonePreferenceActivity;
+import org.sflphone.client.SFLphoneApplication;
+import org.sflphone.model.Account;
+import org.sflphone.service.ConfigurationManagerCallback;
+import org.sflphone.service.ISipService;
+
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -52,20 +66,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.account.AccountDetail;
-import com.savoirfairelinux.sflphone.account.AccountDetailAdvanced;
-import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
-import com.savoirfairelinux.sflphone.account.AccountDetailSrtp;
-import com.savoirfairelinux.sflphone.account.AccountDetailTls;
-import com.savoirfairelinux.sflphone.client.AccountPreferenceActivity;
-import com.savoirfairelinux.sflphone.client.AccountWizard;
-import com.savoirfairelinux.sflphone.client.SFLPhonePreferenceActivity;
-import com.savoirfairelinux.sflphone.client.SFLphoneApplication;
-import com.savoirfairelinux.sflphone.model.Account;
-import com.savoirfairelinux.sflphone.service.ConfigurationManagerCallback;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class AccountManagementFragment extends PreferenceFragment {
static final String TAG = "AccountManagementFragment";
static final String DEFAULT_ACCOUNT_ID = "IP2IP";
diff --git a/src/com/savoirfairelinux/sflphone/fragments/AudioManagementFragment.java b/src/org/sflphone/fragments/AudioManagementFragment.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/fragments/AudioManagementFragment.java
rename to src/org/sflphone/fragments/AudioManagementFragment.java
index 32b7db45f..eb96fea2e 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/AudioManagementFragment.java
+++ b/src/org/sflphone/fragments/AudioManagementFragment.java
@@ -30,7 +30,9 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
+
+import org.sflphone.R;
import android.app.Activity;
import android.content.Context;
@@ -50,8 +52,6 @@ import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-
public class AudioManagementFragment extends PreferenceFragment
{
static final String TAG = "PrefManagementFragment";
diff --git a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java b/src/org/sflphone/fragments/CallFragment.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
rename to src/org/sflphone/fragments/CallFragment.java
index 9c04440d3..6c25b153c 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
+++ b/src/org/sflphone/fragments/CallFragment.java
@@ -29,11 +29,20 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
import java.util.Locale;
+import org.sflphone.R;
+import org.sflphone.model.Attractor;
+import org.sflphone.model.Bubble;
+import org.sflphone.model.BubbleModel;
+import org.sflphone.model.BubblesView;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.service.ISipService;
+
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
@@ -61,15 +70,6 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.ImageButton;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.model.Attractor;
-import com.savoirfairelinux.sflphone.model.Bubble;
-import com.savoirfairelinux.sflphone.model.BubbleModel;
-import com.savoirfairelinux.sflphone.model.BubblesView;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class CallFragment extends Fragment implements Callback, SensorEventListener {
static final String TAG = "CallFragment";
diff --git a/src/com/savoirfairelinux/sflphone/fragments/CallListFragment.java b/src/org/sflphone/fragments/CallListFragment.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/fragments/CallListFragment.java
rename to src/org/sflphone/fragments/CallListFragment.java
index 1c3f2031a..b4752ba4f 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/CallListFragment.java
+++ b/src/org/sflphone/fragments/CallListFragment.java
@@ -29,11 +29,17 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
import java.util.HashMap;
+import org.sflphone.R;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.service.ISipService;
+import org.sflphone.views.SwipeListViewTouchListener;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -65,12 +71,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.views.SwipeListViewTouchListener;
-
public class CallListFragment extends Fragment {
static final String TAG = CallListFragment.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/fragments/ConferenceDFragment.java b/src/org/sflphone/fragments/ConferenceDFragment.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/fragments/ConferenceDFragment.java
rename to src/org/sflphone/fragments/ConferenceDFragment.java
index 6f4cabda7..c7ebb17d2 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/ConferenceDFragment.java
+++ b/src/org/sflphone/fragments/ConferenceDFragment.java
@@ -1,7 +1,11 @@
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
+import org.sflphone.R;
+import org.sflphone.loaders.ContactsLoader;
+import org.sflphone.model.Conference;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
@@ -22,10 +26,6 @@ import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.loaders.ContactsLoader;
-import com.savoirfairelinux.sflphone.model.Conference;
-
public class ConferenceDFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Bundle> {
diff --git a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java b/src/org/sflphone/fragments/ContactListFragment.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
rename to src/org/sflphone/fragments/ContactListFragment.java
index b988a4b27..3b04166c4 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
+++ b/src/org/sflphone/fragments/ContactListFragment.java
@@ -29,10 +29,19 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
+import org.sflphone.R;
+import org.sflphone.adapters.ContactsAdapter;
+import org.sflphone.adapters.StarredContactsAdapter;
+import org.sflphone.loaders.ContactsLoader;
+import org.sflphone.loaders.LoaderConstants;
+import org.sflphone.model.CallContact;
+import org.sflphone.service.ISipService;
+import org.sflphone.views.TACGridView;
+
import android.animation.LayoutTransition;
import android.app.Activity;
import android.app.Fragment;
@@ -61,15 +70,6 @@ import android.widget.RelativeLayout;
import android.widget.SearchView;
import android.widget.SearchView.OnQueryTextListener;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.adapters.ContactsAdapter;
-import com.savoirfairelinux.sflphone.adapters.StarredContactsAdapter;
-import com.savoirfairelinux.sflphone.loaders.ContactsLoader;
-import com.savoirfairelinux.sflphone.loaders.LoaderConstants;
-import com.savoirfairelinux.sflphone.model.CallContact;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.views.TACGridView;
-
public class ContactListFragment extends Fragment implements OnQueryTextListener, LoaderManager.LoaderCallbacks<Bundle> {
private static final String TAG = "ContactListFragment";
ContactsAdapter mListAdapter;
diff --git a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java b/src/org/sflphone/fragments/DialingFragment.java
similarity index 95%
rename from src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
rename to src/org/sflphone/fragments/DialingFragment.java
index a446a3a1c..9994e2acb 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
+++ b/src/org/sflphone/fragments/DialingFragment.java
@@ -29,10 +29,14 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.Locale;
+import org.sflphone.R;
+import org.sflphone.service.ISipService;
+import org.sflphone.views.ClearableEditText;
+
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
@@ -40,13 +44,10 @@ import android.os.Bundle;
import android.os.RemoteException;
import android.text.Editable;
import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
import android.view.View.OnTouchListener;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
@@ -54,10 +55,6 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.ImageButton;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.views.ClearableEditText;
-
public class DialingFragment extends Fragment implements OnTouchListener {
private static final String TAG = DialingFragment.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/fragments/HelpGesturesFragment.java b/src/org/sflphone/fragments/HelpGesturesFragment.java
similarity index 83%
rename from src/com/savoirfairelinux/sflphone/fragments/HelpGesturesFragment.java
rename to src/org/sflphone/fragments/HelpGesturesFragment.java
index fb0735d52..81977befb 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HelpGesturesFragment.java
+++ b/src/org/sflphone/fragments/HelpGesturesFragment.java
@@ -1,4 +1,6 @@
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
+
+import org.sflphone.R;
import android.app.Fragment;
import android.os.Bundle;
@@ -6,8 +8,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import com.savoirfairelinux.sflphone.R;
-
public class HelpGesturesFragment extends Fragment {
@Override
diff --git a/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java b/src/org/sflphone/fragments/HistoryFragment.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java
rename to src/org/sflphone/fragments/HistoryFragment.java
index 1b8b04ac7..060285930 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java
+++ b/src/org/sflphone/fragments/HistoryFragment.java
@@ -28,13 +28,20 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.sflphone.R;
+import org.sflphone.adapters.ContactPictureTask;
+import org.sflphone.loaders.HistoryLoader;
+import org.sflphone.loaders.LoaderConstants;
+import org.sflphone.model.HistoryEntry;
+import org.sflphone.service.ISipService;
+
import android.app.Activity;
import android.app.ListFragment;
import android.app.LoaderManager.LoaderCallbacks;
@@ -55,13 +62,6 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.adapters.ContactPictureTask;
-import com.savoirfairelinux.sflphone.loaders.HistoryLoader;
-import com.savoirfairelinux.sflphone.loaders.LoaderConstants;
-import com.savoirfairelinux.sflphone.model.HistoryEntry;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class HistoryFragment extends ListFragment implements LoaderCallbacks<ArrayList<HistoryEntry>> {
private static final String TAG = HistoryFragment.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java b/src/org/sflphone/fragments/HomeFragment.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
rename to src/org/sflphone/fragments/HomeFragment.java
index 257137272..3a8780556 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HomeFragment.java
+++ b/src/org/sflphone/fragments/HomeFragment.java
@@ -28,19 +28,26 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Observable;
import java.util.Observer;
+import org.sflphone.R;
+import org.sflphone.fragments.CallListFragment.DropActionsChoice;
+import org.sflphone.model.CallTimer;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.service.ISipService;
+
import android.app.Activity;
import android.app.Fragment;
import android.content.ClipData;
+import android.content.ClipData.Item;
import android.content.Context;
import android.content.Intent;
-import android.content.ClipData.Item;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
@@ -53,9 +60,9 @@ import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.DragShadowBuilder;
import android.view.View.OnDragListener;
+import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener;
@@ -64,13 +71,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.fragments.CallListFragment.DropActionsChoice;
-import com.savoirfairelinux.sflphone.model.CallTimer;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class HomeFragment extends Fragment {
private static final String TAG = HomeFragment.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java b/src/org/sflphone/fragments/MenuFragment.java
similarity index 91%
rename from src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java
rename to src/org/sflphone/fragments/MenuFragment.java
index 62f111357..49e817922 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/MenuFragment.java
+++ b/src/org/sflphone/fragments/MenuFragment.java
@@ -28,10 +28,24 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.util.ArrayList;
+import org.sflphone.R;
+import org.sflphone.adapters.AccountSelectionAdapter;
+import org.sflphone.adapters.MenuAdapter;
+import org.sflphone.client.ActivityHolder;
+import org.sflphone.client.SFLPhoneHomeActivity;
+import org.sflphone.client.SFLPhonePreferenceActivity;
+import org.sflphone.interfaces.AccountsInterface;
+import org.sflphone.loaders.AccountsLoader;
+import org.sflphone.loaders.LoaderConstants;
+import org.sflphone.model.Account;
+import org.sflphone.receivers.AccountsReceiver;
+import org.sflphone.service.ConfigurationManagerCallback;
+import org.sflphone.service.ISipService;
+
import android.app.Activity;
import android.app.Fragment;
import android.app.LoaderManager.LoaderCallbacks;
@@ -52,20 +66,6 @@ import android.widget.ListView;
import android.widget.RadioButton;
import android.widget.Spinner;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.adapters.AccountSelectionAdapter;
-import com.savoirfairelinux.sflphone.adapters.MenuAdapter;
-import com.savoirfairelinux.sflphone.client.ActivityHolder;
-import com.savoirfairelinux.sflphone.client.SFLPhoneHomeActivity;
-import com.savoirfairelinux.sflphone.client.SFLPhonePreferenceActivity;
-import com.savoirfairelinux.sflphone.interfaces.AccountsInterface;
-import com.savoirfairelinux.sflphone.loaders.AccountsLoader;
-import com.savoirfairelinux.sflphone.loaders.LoaderConstants;
-import com.savoirfairelinux.sflphone.model.Account;
-import com.savoirfairelinux.sflphone.receivers.AccountsReceiver;
-import com.savoirfairelinux.sflphone.service.ConfigurationManagerCallback;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class MenuFragment extends Fragment implements LoaderCallbacks<ArrayList<Account>>, AccountsInterface {
private static final String TAG = MenuFragment.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java b/src/org/sflphone/fragments/TransferDFragment.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java
rename to src/org/sflphone/fragments/TransferDFragment.java
index 6a83aa998..a9e73c4d6 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java
+++ b/src/org/sflphone/fragments/TransferDFragment.java
@@ -29,12 +29,17 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.fragments;
+package org.sflphone.fragments;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.sflphone.R;
+import org.sflphone.loaders.ContactsLoader;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -65,11 +70,6 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.loaders.ContactsLoader;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-
public class TransferDFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Bundle> {
public static final int RESULT_TRANSFER_CONF = Activity.RESULT_FIRST_USER + 1;
public static final int RESULT_TRANSFER_NUMBER = Activity.RESULT_FIRST_USER + 2;
diff --git a/src/com/savoirfairelinux/sflphone/interfaces/AccountsInterface.java b/src/org/sflphone/interfaces/AccountsInterface.java
similarity index 77%
rename from src/com/savoirfairelinux/sflphone/interfaces/AccountsInterface.java
rename to src/org/sflphone/interfaces/AccountsInterface.java
index 69fff1c3d..bcfef66fd 100644
--- a/src/com/savoirfairelinux/sflphone/interfaces/AccountsInterface.java
+++ b/src/org/sflphone/interfaces/AccountsInterface.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.interfaces;
+package org.sflphone.interfaces;
import android.content.Intent;
diff --git a/src/com/savoirfairelinux/sflphone/interfaces/CallInterface.java b/src/org/sflphone/interfaces/CallInterface.java
similarity index 88%
rename from src/com/savoirfairelinux/sflphone/interfaces/CallInterface.java
rename to src/org/sflphone/interfaces/CallInterface.java
index 4c708218a..5d140c13e 100644
--- a/src/com/savoirfairelinux/sflphone/interfaces/CallInterface.java
+++ b/src/org/sflphone/interfaces/CallInterface.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.interfaces;
+package org.sflphone.interfaces;
import android.content.Intent;
diff --git a/src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java b/src/org/sflphone/loaders/AccountsLoader.java
similarity index 89%
rename from src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java
rename to src/org/sflphone/loaders/AccountsLoader.java
index 40af29279..65a0f3881 100644
--- a/src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java
+++ b/src/org/sflphone/loaders/AccountsLoader.java
@@ -1,16 +1,16 @@
-package com.savoirfairelinux.sflphone.loaders;
+package org.sflphone.loaders;
import java.util.ArrayList;
import java.util.HashMap;
+import org.sflphone.model.Account;
+import org.sflphone.service.ISipService;
+
import android.content.AsyncTaskLoader;
import android.content.Context;
import android.os.RemoteException;
import android.util.Log;
-import com.savoirfairelinux.sflphone.model.Account;
-import com.savoirfairelinux.sflphone.service.ISipService;
-
public class AccountsLoader extends AsyncTaskLoader<ArrayList<Account>> {
private static final String TAG = AccountsLoader.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java b/src/org/sflphone/loaders/ContactsLoader.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java
rename to src/org/sflphone/loaders/ContactsLoader.java
index de15e6ba7..de0dd51a2 100644
--- a/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java
+++ b/src/org/sflphone/loaders/ContactsLoader.java
@@ -1,7 +1,9 @@
-package com.savoirfairelinux.sflphone.loaders;
+package org.sflphone.loaders;
import java.util.ArrayList;
+import org.sflphone.model.CallContact;
+
import android.content.AsyncTaskLoader;
import android.content.Context;
import android.database.Cursor;
@@ -11,8 +13,6 @@ import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.Contacts;
-import com.savoirfairelinux.sflphone.model.CallContact;
-
public class ContactsLoader extends AsyncTaskLoader<Bundle> {
// private static final String TAG = ContactsLoader.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/loaders/HistoryLoader.java b/src/org/sflphone/loaders/HistoryLoader.java
similarity index 91%
rename from src/com/savoirfairelinux/sflphone/loaders/HistoryLoader.java
rename to src/org/sflphone/loaders/HistoryLoader.java
index f0b48d1ed..6e4673d59 100644
--- a/src/com/savoirfairelinux/sflphone/loaders/HistoryLoader.java
+++ b/src/org/sflphone/loaders/HistoryLoader.java
@@ -1,10 +1,17 @@
-package com.savoirfairelinux.sflphone.loaders;
+package org.sflphone.loaders;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.sflphone.model.CallContact;
+import org.sflphone.model.CallContact.ContactBuilder;
+import org.sflphone.model.HistoryEntry;
+import org.sflphone.model.HistoryEntry.HistoryCall;
+import org.sflphone.service.ISipService;
+import org.sflphone.service.ServiceConstants;
+
import android.content.AsyncTaskLoader;
import android.content.Context;
import android.database.Cursor;
@@ -13,13 +20,6 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.util.Log;
-import com.savoirfairelinux.sflphone.model.CallContact;
-import com.savoirfairelinux.sflphone.model.CallContact.ContactBuilder;
-import com.savoirfairelinux.sflphone.model.HistoryEntry;
-import com.savoirfairelinux.sflphone.model.HistoryEntry.HistoryCall;
-import com.savoirfairelinux.sflphone.service.ISipService;
-import com.savoirfairelinux.sflphone.service.ServiceConstants;
-
public class HistoryLoader extends AsyncTaskLoader<ArrayList<HistoryEntry>> {
private static final String TAG = HistoryLoader.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/loaders/LoaderConstants.java b/src/org/sflphone/loaders/LoaderConstants.java
similarity index 79%
rename from src/com/savoirfairelinux/sflphone/loaders/LoaderConstants.java
rename to src/org/sflphone/loaders/LoaderConstants.java
index 3fd27ee47..ced535e1c 100644
--- a/src/com/savoirfairelinux/sflphone/loaders/LoaderConstants.java
+++ b/src/org/sflphone/loaders/LoaderConstants.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.loaders;
+package org.sflphone.loaders;
public class LoaderConstants {
diff --git a/src/com/savoirfairelinux/sflphone/model/Account.java b/src/org/sflphone/model/Account.java
similarity index 94%
rename from src/com/savoirfairelinux/sflphone/model/Account.java
rename to src/org/sflphone/model/Account.java
index 2f76d29ee..dcc4b3754 100644
--- a/src/com/savoirfairelinux/sflphone/model/Account.java
+++ b/src/org/sflphone/model/Account.java
@@ -29,18 +29,18 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.HashMap;
+import org.sflphone.account.AccountDetailAdvanced;
+import org.sflphone.account.AccountDetailBasic;
+import org.sflphone.account.AccountDetailSrtp;
+import org.sflphone.account.AccountDetailTls;
+
import android.os.Parcel;
import android.os.Parcelable;
-import com.savoirfairelinux.sflphone.account.AccountDetailAdvanced;
-import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
-import com.savoirfairelinux.sflphone.account.AccountDetailSrtp;
-import com.savoirfairelinux.sflphone.account.AccountDetailTls;
-
public class Account implements Parcelable {
String accountID;
diff --git a/src/com/savoirfairelinux/sflphone/model/Attractor.java b/src/org/sflphone/model/Attractor.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/model/Attractor.java
rename to src/org/sflphone/model/Attractor.java
index fed2690fe..162aa19da 100644
--- a/src/com/savoirfairelinux/sflphone/model/Attractor.java
+++ b/src/org/sflphone/model/Attractor.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import android.content.Context;
import android.graphics.Bitmap;
diff --git a/src/com/savoirfairelinux/sflphone/model/Bubble.java b/src/org/sflphone/model/Bubble.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/model/Bubble.java
rename to src/org/sflphone/model/Bubble.java
index 05229c9cc..ecbc10821 100644
--- a/src/com/savoirfairelinux/sflphone/model/Bubble.java
+++ b/src/org/sflphone/model/Bubble.java
@@ -1,4 +1,6 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
+
+import org.sflphone.adapters.ContactPictureTask;
import android.content.Context;
import android.graphics.Bitmap;
@@ -12,8 +14,7 @@ import android.graphics.PorterDuffXfermode;
import android.graphics.RectF;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.adapters.ContactPictureTask;
+import org.sflphone.R;
public class Bubble {
diff --git a/src/com/savoirfairelinux/sflphone/model/BubbleModel.java b/src/org/sflphone/model/BubbleModel.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/model/BubbleModel.java
rename to src/org/sflphone/model/BubbleModel.java
index 9ca9bb638..5880fd75f 100644
--- a/src/com/savoirfairelinux/sflphone/model/BubbleModel.java
+++ b/src/org/sflphone/model/BubbleModel.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/savoirfairelinux/sflphone/model/BubblesView.java b/src/org/sflphone/model/BubblesView.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/model/BubblesView.java
rename to src/org/sflphone/model/BubblesView.java
index 6184d2387..fb4a92df4 100644
--- a/src/com/savoirfairelinux/sflphone/model/BubblesView.java
+++ b/src/org/sflphone/model/BubblesView.java
@@ -30,10 +30,14 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.List;
+import org.sflphone.R;
+import org.sflphone.client.CallActivity;
+import org.sflphone.fragments.CallFragment;
+
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -52,11 +56,6 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
import android.view.View.OnTouchListener;
-import android.widget.Toast;
-
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.client.CallActivity;
-import com.savoirfairelinux.sflphone.fragments.CallFragment;
public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, OnTouchListener {
private static final String TAG = BubblesView.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/model/CallContact.java b/src/org/sflphone/model/CallContact.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/model/CallContact.java
rename to src/org/sflphone/model/CallContact.java
index 6f7b83449..757db4032 100644
--- a/src/com/savoirfairelinux/sflphone/model/CallContact.java
+++ b/src/org/sflphone/model/CallContact.java
@@ -28,7 +28,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.ArrayList;
diff --git a/src/com/savoirfairelinux/sflphone/model/CallTimer.java b/src/org/sflphone/model/CallTimer.java
similarity index 93%
rename from src/com/savoirfairelinux/sflphone/model/CallTimer.java
rename to src/org/sflphone/model/CallTimer.java
index 047147156..1cdc12ff2 100644
--- a/src/com/savoirfairelinux/sflphone/model/CallTimer.java
+++ b/src/org/sflphone/model/CallTimer.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.Observable;
diff --git a/src/org/sflphone/model/Conference.aidl b/src/org/sflphone/model/Conference.aidl
new file mode 100644
index 000000000..3c4096255
--- /dev/null
+++ b/src/org/sflphone/model/Conference.aidl
@@ -0,0 +1,4 @@
+package org.sflphone.model;
+
+
+parcelable Conference;
\ No newline at end of file
diff --git a/src/com/savoirfairelinux/sflphone/model/Conference.java b/src/org/sflphone/model/Conference.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/model/Conference.java
rename to src/org/sflphone/model/Conference.java
index 3278c188c..08cb8503e 100644
--- a/src/com/savoirfairelinux/sflphone/model/Conference.java
+++ b/src/org/sflphone/model/Conference.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.ArrayList;
diff --git a/src/com/savoirfairelinux/sflphone/model/HistoryEntry.java b/src/org/sflphone/model/HistoryEntry.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/model/HistoryEntry.java
rename to src/org/sflphone/model/HistoryEntry.java
index bc1c0de06..7f7c82360 100644
--- a/src/com/savoirfairelinux/sflphone/model/HistoryEntry.java
+++ b/src/org/sflphone/model/HistoryEntry.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -8,7 +8,7 @@ import java.util.NavigableMap;
import java.util.TimeZone;
import java.util.TreeMap;
-import com.savoirfairelinux.sflphone.service.ServiceConstants;
+import org.sflphone.service.ServiceConstants;
public class HistoryEntry {
diff --git a/src/org/sflphone/model/SipCall.aidl b/src/org/sflphone/model/SipCall.aidl
new file mode 100644
index 000000000..b631a9a96
--- /dev/null
+++ b/src/org/sflphone/model/SipCall.aidl
@@ -0,0 +1,4 @@
+package org.sflphone.model;
+
+
+parcelable SipCall;
\ No newline at end of file
diff --git a/src/com/savoirfairelinux/sflphone/model/SipCall.java b/src/org/sflphone/model/SipCall.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/model/SipCall.java
rename to src/org/sflphone/model/SipCall.java
index 7fa44db39..d69999b30 100644
--- a/src/com/savoirfairelinux/sflphone/model/SipCall.java
+++ b/src/org/sflphone/model/SipCall.java
@@ -28,7 +28,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.model;
+package org.sflphone.model;
import java.util.ArrayList;
import java.util.Random;
diff --git a/src/com/savoirfairelinux/sflphone/receivers/AccountsReceiver.java b/src/org/sflphone/receivers/AccountsReceiver.java
similarity index 82%
rename from src/com/savoirfairelinux/sflphone/receivers/AccountsReceiver.java
rename to src/org/sflphone/receivers/AccountsReceiver.java
index 98a409b5a..0abb29041 100644
--- a/src/com/savoirfairelinux/sflphone/receivers/AccountsReceiver.java
+++ b/src/org/sflphone/receivers/AccountsReceiver.java
@@ -1,13 +1,13 @@
-package com.savoirfairelinux.sflphone.receivers;
+package org.sflphone.receivers;
+
+import org.sflphone.interfaces.AccountsInterface;
+import org.sflphone.service.ConfigurationManagerCallback;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
-import com.savoirfairelinux.sflphone.interfaces.AccountsInterface;
-import com.savoirfairelinux.sflphone.service.ConfigurationManagerCallback;
-
public class AccountsReceiver extends BroadcastReceiver {
static final String TAG = AccountsReceiver.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/receivers/CallReceiver.java b/src/org/sflphone/receivers/CallReceiver.java
similarity index 94%
rename from src/com/savoirfairelinux/sflphone/receivers/CallReceiver.java
rename to src/org/sflphone/receivers/CallReceiver.java
index f025212c4..8a456599e 100644
--- a/src/com/savoirfairelinux/sflphone/receivers/CallReceiver.java
+++ b/src/org/sflphone/receivers/CallReceiver.java
@@ -28,16 +28,16 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.receivers;
+package org.sflphone.receivers;
+
+import org.sflphone.interfaces.CallInterface;
+import org.sflphone.service.CallManagerCallBack;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
-import com.savoirfairelinux.sflphone.interfaces.CallInterface;
-import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
-
public class CallReceiver extends BroadcastReceiver {
static final String TAG = CallReceiver.class.getSimpleName();
diff --git a/src/com/savoirfairelinux/sflphone/receivers/ExternalCallReceiver.java b/src/org/sflphone/receivers/ExternalCallReceiver.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/receivers/ExternalCallReceiver.java
rename to src/org/sflphone/receivers/ExternalCallReceiver.java
index 57a30ce1f..c4f7527c7 100644
--- a/src/com/savoirfairelinux/sflphone/receivers/ExternalCallReceiver.java
+++ b/src/org/sflphone/receivers/ExternalCallReceiver.java
@@ -29,7 +29,7 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.receivers;
+package org.sflphone.receivers;
import android.content.BroadcastReceiver;
diff --git a/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java b/src/org/sflphone/receivers/IncomingReceiver.java
similarity index 96%
rename from src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java
rename to src/org/sflphone/receivers/IncomingReceiver.java
index 362ddb886..b55da8de4 100644
--- a/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java
+++ b/src/org/sflphone/receivers/IncomingReceiver.java
@@ -1,10 +1,18 @@
-package com.savoirfairelinux.sflphone.receivers;
+package org.sflphone.receivers;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
+import org.sflphone.model.CallContact;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.service.CallManagerCallBack;
+import org.sflphone.service.ConfigurationManagerCallback;
+import org.sflphone.service.ServiceConstants;
+import org.sflphone.service.SipService;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -12,14 +20,7 @@ import android.os.Bundle;
import android.os.RemoteException;
import android.util.Log;
-import com.savoirfairelinux.sflphone.model.CallContact;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
-import com.savoirfairelinux.sflphone.service.ConfigurationManagerCallback;
-import com.savoirfairelinux.sflphone.service.ISipService.Stub;
-import com.savoirfairelinux.sflphone.service.ServiceConstants;
-import com.savoirfairelinux.sflphone.service.SipService;
+import org.sflphone.service.ISipService.Stub;
public class IncomingReceiver extends BroadcastReceiver {
diff --git a/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java b/src/org/sflphone/service/CallManagerCallBack.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java
rename to src/org/sflphone/service/CallManagerCallBack.java
index 965d2b80b..06e213d41 100644
--- a/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java
+++ b/src/org/sflphone/service/CallManagerCallBack.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.service;
+package org.sflphone.service;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/savoirfairelinux/sflphone/service/ISipService.aidl b/src/org/sflphone/service/ISipService.aidl
similarity index 93%
rename from src/com/savoirfairelinux/sflphone/service/ISipService.aidl
rename to src/org/sflphone/service/ISipService.aidl
index 54834f55c..d4952cb8b 100644
--- a/src/com/savoirfairelinux/sflphone/service/ISipService.aidl
+++ b/src/org/sflphone/service/ISipService.aidl
@@ -1,7 +1,7 @@
-package com.savoirfairelinux.sflphone.service;
+package org.sflphone.service;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.model.Conference;
interface ISipService {
diff --git a/src/com/savoirfairelinux/sflphone/service/ServiceConstants.java b/src/org/sflphone/service/ServiceConstants.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/service/ServiceConstants.java
rename to src/org/sflphone/service/ServiceConstants.java
index 0641f8716..94d820589 100644
--- a/src/com/savoirfairelinux/sflphone/service/ServiceConstants.java
+++ b/src/org/sflphone/service/ServiceConstants.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.service;
+package org.sflphone.service;
public final class ServiceConstants {
diff --git a/src/com/savoirfairelinux/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/service/SipService.java
rename to src/org/sflphone/service/SipService.java
index 2dc2fb41f..66a102c38 100644
--- a/src/com/savoirfairelinux/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package com.savoirfairelinux.sflphone.service;
+package org.sflphone.service;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -33,6 +33,16 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
+import org.sflphone.account.AccountDetailBasic;
+import org.sflphone.account.AccountDetailsHandler;
+import org.sflphone.account.CallDetailsHandler;
+import org.sflphone.account.HistoryHandler;
+import org.sflphone.client.SFLPhoneHomeActivity;
+import org.sflphone.client.SFLphoneApplication;
+import org.sflphone.model.Conference;
+import org.sflphone.model.SipCall;
+import org.sflphone.receivers.IncomingReceiver;
+
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -51,16 +61,8 @@ import android.support.v4.app.NotificationCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
-import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
-import com.savoirfairelinux.sflphone.account.AccountDetailsHandler;
-import com.savoirfairelinux.sflphone.account.CallDetailsHandler;
-import com.savoirfairelinux.sflphone.account.HistoryHandler;
-import com.savoirfairelinux.sflphone.client.SFLPhoneHomeActivity;
-import com.savoirfairelinux.sflphone.client.SFLphoneApplication;
-import com.savoirfairelinux.sflphone.model.Conference;
-import com.savoirfairelinux.sflphone.model.SipCall;
-import com.savoirfairelinux.sflphone.receivers.IncomingReceiver;
+import org.sflphone.R;
+import org.sflphone.service.ISipService;
public class SipService extends Service {
diff --git a/src/com/savoirfairelinux/sflphone/views/CallPaneLayout.java b/src/org/sflphone/views/CallPaneLayout.java
similarity index 89%
rename from src/com/savoirfairelinux/sflphone/views/CallPaneLayout.java
rename to src/org/sflphone/views/CallPaneLayout.java
index e12d5b7d0..21c6b35ba 100644
--- a/src/com/savoirfairelinux/sflphone/views/CallPaneLayout.java
+++ b/src/org/sflphone/views/CallPaneLayout.java
@@ -1,12 +1,12 @@
-package com.savoirfairelinux.sflphone.views;
+package org.sflphone.views;
+
+import org.sflphone.fragments.CallFragment;
import android.content.Context;
import android.support.v4.widget.SlidingPaneLayout;
import android.util.AttributeSet;
import android.view.MotionEvent;
-import com.savoirfairelinux.sflphone.fragments.CallFragment;
-
public class CallPaneLayout extends SlidingPaneLayout
{
private CallFragment curFragment = null;
diff --git a/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java b/src/org/sflphone/views/ClearableEditText.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/views/ClearableEditText.java
rename to src/org/sflphone/views/ClearableEditText.java
index be070ffff..44aa2b47b 100644
--- a/src/com/savoirfairelinux/sflphone/views/ClearableEditText.java
+++ b/src/org/sflphone/views/ClearableEditText.java
@@ -1,4 +1,6 @@
-package com.savoirfairelinux.sflphone.views;
+package org.sflphone.views;
+
+import org.sflphone.R;
import android.content.Context;
import android.text.Editable;
@@ -13,7 +15,7 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.RelativeLayout;
-import com.savoirfairelinux.sflphone.R;
+
public class ClearableEditText extends RelativeLayout {
LayoutInflater inflater = null;
diff --git a/src/com/savoirfairelinux/sflphone/views/CustomSlidingDrawer.java b/src/org/sflphone/views/CustomSlidingDrawer.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/views/CustomSlidingDrawer.java
rename to src/org/sflphone/views/CustomSlidingDrawer.java
index 2ca5112cc..cd812e211 100644
--- a/src/com/savoirfairelinux/sflphone/views/CustomSlidingDrawer.java
+++ b/src/org/sflphone/views/CustomSlidingDrawer.java
@@ -29,7 +29,7 @@
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.views;
+package org.sflphone.views;
import java.lang.ref.WeakReference;
@@ -52,7 +52,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
-import com.savoirfairelinux.sflphone.R;
+import org.sflphone.R;
/**
* SlidingDrawer hides content out of the screen and allows the user to drag a handle to bring the content on screen. SlidingDrawer can be used
diff --git a/src/com/savoirfairelinux/sflphone/views/SwipeListViewTouchListener.java b/src/org/sflphone/views/SwipeListViewTouchListener.java
similarity index 99%
rename from src/com/savoirfairelinux/sflphone/views/SwipeListViewTouchListener.java
rename to src/org/sflphone/views/SwipeListViewTouchListener.java
index 96e65b795..179082ba4 100644
--- a/src/com/savoirfairelinux/sflphone/views/SwipeListViewTouchListener.java
+++ b/src/org/sflphone/views/SwipeListViewTouchListener.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.views;
+package org.sflphone.views;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/savoirfairelinux/sflphone/views/TACGridView.java b/src/org/sflphone/views/TACGridView.java
similarity index 93%
rename from src/com/savoirfairelinux/sflphone/views/TACGridView.java
rename to src/org/sflphone/views/TACGridView.java
index 85a1e3afd..6098bd239 100644
--- a/src/com/savoirfairelinux/sflphone/views/TACGridView.java
+++ b/src/org/sflphone/views/TACGridView.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.views;
+package org.sflphone.views;
import android.content.Context;
import android.util.AttributeSet;
--
GitLab