Skip to content
Snippets Groups Projects
Commit cc0785a7 authored by Emeric Vigier's avatar Emeric Vigier
Browse files

#17220: fix app crash when device rotates 

Conflicts:

	src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
parent 0dcdf683
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 79 additions and 44 deletions
src/com/savoirfairelinux/sflphone/client/CallElementList.java
+ 1
− 0
View file @ cc0785a7
......@@ -97,6 +97,7 @@ public class CallElementList extends ListFragment implements LoaderManager.Loade
super.onAttach(activity);
sflphoneHome = (SFLPhoneHome) activity;
service = ((SFLphoneApplication) sflphoneHome.getApplication()).getSipService();
mAccountList = ((SFLphoneApplication) sflphoneHome.getApplication()).getAccountList();
Log.i(TAG, "onAttach() service " + service);
}
......
src/com/savoirfairelinux/sflphone/client/ContactListFragment.java
+ 6
− 9
View file @ cc0785a7
......@@ -86,7 +86,7 @@ public class ContactListFragment extends ListFragment implements OnQueryTextList
{
final String TAG = "ContactListFragment";
ContactElementAdapter mAdapter;
Context mContext;
Activity mContext;
String mCurFilter;
private SFLPhoneHome sflphoneHome;
private ISipService service;
......@@ -104,7 +104,9 @@ public class ContactListFragment extends ListFragment implements OnQueryTextList
super.onAttach(activity);
sflphoneHome = (SFLPhoneHome) activity;
service = ((SFLphoneApplication) sflphoneHome.getApplication()).getSipService();
Log.i(TAG, "onAttach() service " + service);
mAccountList = ((SFLphoneApplication)sflphoneHome.getApplication()).getAccountList();
Log.i(TAG, "onAttach() service=" + service + ", mAccountList=" + mAccountList);
}
public static class InfosLoader implements Runnable
......@@ -200,10 +202,6 @@ public class ContactListFragment extends ListFragment implements OnQueryTextList
super();
}
public void setAccountList(AccountList accountList) {
mAccountList = accountList;
}
@Override
public void onActivityCreated(Bundle savedInstanceState)
{
......@@ -213,12 +211,11 @@ public class ContactListFragment extends ListFragment implements OnQueryTextList
// In order to onCreateOptionsMenu be called
setHasOptionsMenu(true);
mAdapter = new ContactElementAdapter(getActivity(), null);
mAdapter = new ContactElementAdapter(mContext, null);
setListAdapter(mAdapter);
getLoaderManager().initLoader(0, null, this);
final Context context = getActivity();
ListView lv = getListView();
lv.setOnItemLongClickListener(new OnItemLongClickListener() {
@Override
......@@ -231,7 +228,7 @@ public class ContactListFragment extends ListFragment implements OnQueryTextList
// TODO getCallInstnace should be implemented in SipCallList
// final SipCall call = SipCall.getCallInstance(info);
final SipCall call = new SipCall(info);
AlertDialog.Builder builder = new AlertDialog.Builder(context);
AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
builder.setTitle("Action to perform with " + call.mCallInfo.mDisplayName)
.setCancelable(true)
.setItems(items, new DialogInterface.OnClickListener() {
......
src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
+ 28
− 32
View file @ cc0785a7
......@@ -87,7 +87,7 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
CallElementList mCallElementList;
private boolean mBound = false;
private ISipService service;
public AccountList mAccountList = new AccountList();
public AccountList mAccountList;
public CallList mCallList = new CallList(this);
private SFLphoneApplication mApplication;
......@@ -111,11 +111,6 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
mApplication = (SFLphoneApplication) getApplication();
if (!mApplication.isServiceRunning()) {
Log.i(TAG, "starting SipService");
startSipService();
}
// Bind to LocalService
if (!mBound) {
Log.i(TAG, "onStart: Binding service...");
......@@ -176,6 +171,8 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
LocalBroadcastManager.getInstance(this).registerReceiver(mCallList, new IntentFilter("call-state-changed"));
LocalBroadcastManager.getInstance(this).registerReceiver(mCallList, new IntentFilter("incoming-call"));
mAccountList = mApplication.getAccountList();
LocalBroadcastManager.getInstance(this).registerReceiver(mAccountList, new IntentFilter("accounts-changed"));
LocalBroadcastManager.getInstance(this).registerReceiver(mAccountList, new IntentFilter("account-state-changed"));
......@@ -222,9 +219,9 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
unbindService(mConnection);
mBound = false;
}
Log.i(TAG, "onDestroy: stopping SipService...");
stopService(new Intent(this, SipService.class));
mApplication.setServiceRunning(false);
// Log.i(TAG, "onDestroy: stopping SipService...");
// stopService(new Intent(this, SipService.class));
// mApplication.setServiceRunning(false);
/* unregister broadcast receiver */
LocalBroadcastManager.getInstance(this).unregisterReceiver(mCallList);
......@@ -232,7 +229,7 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
super.onDestroy();
}
/** Defines callbacks for service binding, passed to bindService() */
private ServiceConnection mConnection = new ServiceConnection() {
......@@ -243,36 +240,36 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
mApplication.setSipService(service);
mBound = true;
mAccountList.setSipService(service);
Log.d(TAG, "Service connected");
Log.d(TAG, "Service connected service=" + service);
}
@Override
public void onServiceDisconnected(ComponentName arg0) {
mApplication.setSipService(null);
mBound = false;
Log.d(TAG, "Service disconnected");
Log.w(TAG, "Service disconnected service=" + service);
}
};
private void startSipService() {
Thread thread = new Thread("StartSFLphoneService") {
public void run() {
Intent sipServiceIntent = new Intent(SFLPhoneHome.this, SipService.class);
//sipServiceIntent.putExtra(ServiceConstants.EXTRA_OUTGOING_ACTIVITY, new ComponentName(SFLPhoneHome.this, SFLPhoneHome.class));
startService(sipServiceIntent);
mApplication.setServiceRunning(true);
};
};
try {
thread.start();
} catch (IllegalThreadStateException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("Cannot start SFLPhone SipService!");
AlertDialog alert = builder.create();
alert.show();
finish();
}
}
// private void startSipService() {
// Thread thread = new Thread("StartSFLphoneService") {
// public void run() {
// Intent sipServiceIntent = new Intent(SFLPhoneHome.this, SipService.class);
// //sipServiceIntent.putExtra(ServiceConstants.EXTRA_OUTGOING_ACTIVITY, new ComponentName(SFLPhoneHome.this, SFLPhoneHome.class));
// startService(sipServiceIntent);
// mApplication.setServiceRunning(true);
// };
// };
// try {
// thread.start();
// } catch (IllegalThreadStateException e) {
// AlertDialog.Builder builder = new AlertDialog.Builder(this);
// builder.setMessage("Cannot start SFLPhone SipService!");
// AlertDialog alert = builder.create();
// alert.show();
// finish();
// }
// }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
......@@ -364,7 +361,6 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
switch (i) {
case 0:
mContactListFragment = new ContactListFragment();
mContactListFragment.setAccountList(mAccountList);
fragment = mContactListFragment;
break;
case 1:
......
src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java
+ 42
− 1
View file @ cc0785a7
package com.savoirfairelinux.sflphone.client;
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;
import com.savoirfairelinux.sflphone.utils.AccountList;
public class SFLphoneApplication extends Application {
static final String TAG = "SFLphoneApplication";
private boolean serviceRunning;
private boolean serviceRunning = false;
private ISipService sipService;
private AccountList accountList = new AccountList();
private void startSipService() {
Thread thread = new Thread("StartSFLphoneService") {
public void run() {
Log.i(TAG, "SipService launching thread");
Intent sipServiceIntent = new Intent(SFLphoneApplication.this, SipService.class);
//sipServiceIntent.putExtra(ServiceConstants.EXTRA_OUTGOING_ACTIVITY, new ComponentName(SFLPhoneHome.this, SFLPhoneHome.class));
startService(sipServiceIntent);
serviceRunning = true;
};
};
try {
thread.start();
} catch (IllegalThreadStateException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("Cannot start SFLPhone SipService!");
AlertDialog alert = builder.create();
alert.show();
//TODO exit application
}
}
@Override
public void onCreate() {
super.onCreate();
Log.i(TAG, "onCreate");
if (!serviceRunning) {
Log.i(TAG, "starting SipService");
startSipService();
}
}
@Override
public void onTerminate() {
super.onTerminate();
Log.i(TAG, "onTerminate");
if (serviceRunning) {
Log.i(TAG, "onDestroy: stopping SipService...");
stopService(new Intent(this, SipService.class));
serviceRunning = false;
}
}
public boolean isServiceRunning() {
......@@ -42,6 +79,10 @@ public class SFLphoneApplication extends Application {
sipService = service;
}
public AccountList getAccountList() {
return accountList;
}
public String getAppPath() {
PackageManager pkgMng = getPackageManager();
String pkgName = getPackageName();
......
src/com/savoirfairelinux/sflphone/utils/AccountList.java
+ 2
− 1
View file @ cc0785a7
......@@ -44,11 +44,12 @@ import com.savoirfairelinux.sflphone.service.ISipService;
public class AccountList extends BroadcastReceiver
{
private static final long serialVersionUID = -9178386308804218835L;
static final String TAG = "AccountList";
private String currentAccountID = "";
private ArrayList<String> mList = new ArrayList<String>();
private ArrayList<AccountManagementUI> mUserInterfaceList = new ArrayList<AccountManagementUI>();
private ISipService mService;
private static ISipService mService = null;
// private HashMap<String, AccountPreferenceScreen> mAccountList = new HashMap<String, AccountPreferenceScreen>();
public static final String DEFAULT_ACCOUNT_ID = "IP2IP";
......
src/com/savoirfairelinux/sflphone/utils/AccountSelectionButton.java
+ 0
− 1
View file @ cc0785a7
......@@ -45,7 +45,6 @@ import java.util.ArrayList;
public class AccountSelectionButton extends Button implements AccountManagementUI
{
private static final String TAG = "AccountSelectionButton";
private ISipService mService;
private Context mContext;
private ArrayList<String> mList = new ArrayList<String>();
private AccountList mAccountList = null;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment