* #31001: com.savoirfaire -> org.sflphone

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>

Makefile

@@ -13,7 +13,7 @@ install: $(APP)
 	adb install -r $^
 
 uninstall:
-	adb uninstall com.savoirfairelinux.sflphone
+	adb uninstall org.sflphone
 
 clean:
 	ant clean

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

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"

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>
+</org.sflphone.views.CallPaneLayout>
\ No newline at end of file

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

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"

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"

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"

src/com/savoirfairelinux/sflphone/service/ConfigurationManagerCallback.java

-/**
- * 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);
-    }
-
-}

src/com/savoirfairelinux/sflphone/account/AccountDetail.java → 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;

src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java → 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 {
 

src/com/savoirfairelinux/sflphone/account/AccountDetailBasic.java → 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 {
 

src/com/savoirfairelinux/sflphone/account/AccountDetailSrtp.java → 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{
 

src/com/savoirfairelinux/sflphone/account/AccountDetailTls.java → 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 {
 

src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java → src/org/sflphone/account/AccountDetailsHandler.java

 /**
- * 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";

src/com/savoirfairelinux/sflphone/account/AudioHandler.java → src/org/sflphone/account/AudioHandler.java

-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 {
 

src/com/savoirfairelinux/sflphone/account/CallDetailsHandler.java → 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 {
     

src/com/savoirfairelinux/sflphone/account/HistoryHandler.java → src/org/sflphone/account/HistoryHandler.java

-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();

src/com/savoirfairelinux/sflphone/adapters/AccountSelectionAdapter.java → src/org/sflphone/adapters/AccountSelectionAdapter.java

-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 {