Skip to content
Snippets Groups Projects
Commit 839995ba authored by Alexandre Lision's avatar Alexandre Lision
Browse files

cosmetics: remove dead code, target android-20, SFLphone -> Ring

parent 74bd0fcf
No related branches found
No related tags found
No related merge requests found
......@@ -45,7 +45,7 @@ as that of the covered work.
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="19" />
android:targetSdkVersion="20" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
......@@ -87,7 +87,6 @@ as that of the covered work.
<application
android:allowBackup="true"
android:debuggable="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<activity
......
......@@ -72,14 +72,10 @@ namespace std {
%}
/* parsed by SWIG to generate all the glue */
/* %include "../managerimpl.h" */
/* %include <client/callmanager.h> */
//%constant struct sflph_call_ev_handlers* WRAPPER_CALLMANAGERCALLBACK_STRUCT = &wrapper_callback_struct;
//%constant struct sflph_config_ev_handlers* WRAPPER_CONFIGCALLBACK_STRUCT = &wrapper_configurationcallback_struct;
%include "managerimpl.i"
%include "callmanager.i"
%include "configurationmanager.i"
......
......@@ -32,14 +32,14 @@ as that of the covered work.
<resources>
<string name="app_name">SFLphone</string>
<string name="app_name">Ring</string>
<!-- SFLPhoneActivity -->
<string name="close_msg">Appuyer de nouveau pour quitter</string>
<string name="title_section0">Numéroter</string>
<string name="title_section1">Appeler</string>
<string name="title_section2">Historique</string>
<string name="title_activity_sflphone_home">SFLphone</string>
<string name="title_activity_sflphone_home">Ring</string>
<string name="create_new_account_dialog_title">Aucun compte SIP enregistré</string>
<string name="create_new_account_dialog">Voulez-vous enregistrer un compte maintenant?</string>
<string name="cannot_pass_sipcall_title">Compte SIP indisponible</string>
......
......@@ -32,14 +32,14 @@ as that of the covered work.
<resources>
<string name="app_name">SFLphone</string>
<string name="app_name">Ring</string>
<!-- SFLPhoneActivity -->
<string name="close_msg">Press back again to leave</string>
<string name="title_section0">Dial</string>
<string name="title_section1">Call</string>
<string name="title_section2">History</string>
<string name="title_activity_sflphone_home">SFLphone</string>
<string name="title_activity_sflphone_home">Ring</string>
<string name="create_new_account_dialog_title">No Account Registered</string>
<string name="create_new_account_dialog">Would you like to register an account now?</string>
<string name="cannot_pass_sipcall_title">SIP account not available</string>
......
/*
* Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
package org.sflphone.model;
import java.util.Observable;
import android.util.Log;
public class CallTimer extends Observable implements Runnable {
boolean stop = false;
private static final String TAG = CallTimer.class.getSimpleName();
@Override
public void run() {
while (!stop) {
try {
synchronized (this) {
this.wait(1000);
}
} catch (InterruptedException e) {
e.printStackTrace();
}
Log.i(TAG, "update!");
notifyObservers();
}
}
@Override
public boolean hasChanged() {
return true;
}
}
......@@ -69,7 +69,7 @@ public abstract class OpenSlParams {
public int getBufferSize() {
return bufferSize;
}
};
}
// Default factory for Jelly Bean or older.
private static class DefaultOpenSlParams extends OpenSlParams {
......
......@@ -69,14 +69,11 @@ public class SwigNativeConverter {
ArrayList<HashMap<String, String>> todecode = (ArrayList<HashMap<String, String>>) creds;
VectMap toReturn = new VectMap();
HashMap<String, String> nativeEntry;
for (int i = 0; i < todecode.size(); ++i) {
nativeEntry = todecode.get(i);
for (HashMap<String, String> aTodecode : todecode) {
StringMap entry = new StringMap();
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD, nativeEntry.get(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD));
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME, nativeEntry.get(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME));
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_REALM, nativeEntry.get(AccountDetailBasic.CONFIG_ACCOUNT_REALM));
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD, aTodecode.get(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD));
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME, aTodecode.get(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME));
entry.set(AccountDetailBasic.CONFIG_ACCOUNT_REALM, aTodecode.get(AccountDetailBasic.CONFIG_ACCOUNT_REALM));
toReturn.add(entry);
}
return toReturn;
......@@ -174,7 +171,7 @@ public class SwigNativeConverter {
ArrayList<HashMap<String, String>> toReturn = new ArrayList<HashMap<String, String>>();
for (int i = 0; i < map.size(); ++i) {
StringMap entry = new StringMap();
StringMap entry;
HashMap<String, String> nativeEntry = new HashMap<String, String>();
entry = map.get(i);
nativeEntry.put(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD, entry.get(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD));
......
......@@ -44,10 +44,7 @@ public class BluetoothUtils14 extends BluetoothWrapper {
@Override
public boolean isBTHeadsetConnected() {
if(bluetoothAdapter != null) {
return (bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET) == BluetoothAdapter.STATE_CONNECTED);
}
return false;
return bluetoothAdapter != null && (bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET) == BluetoothAdapter.STATE_CONNECTED);
}
......
......@@ -39,15 +39,14 @@ public abstract class BluetoothWrapper {
public static BluetoothWrapper getInstance(Context context) {
if (instance == null) {
instance = new BluetoothUtils14();
if(instance != null) {
instance.setContext(context);
}
}
return instance;
}
protected BluetoothWrapper() {}
protected BluetoothWrapper() {
}
protected void setContext(Context ctxt) {
context = ctxt;
......@@ -58,9 +57,14 @@ public abstract class BluetoothWrapper {
}
public abstract boolean canBluetooth();
public abstract void setBluetoothOn(boolean on);
public abstract boolean isBluetoothOn();
public abstract void register();
public abstract void unregister();
public abstract boolean isBTHeadsetConnected();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment