Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix NPE crashes reported on market

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-21 12:05:15 +01:00
parent c97c24b5f6
commit 3860136d94
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/ContactFragment.java
View file

@ -85,7 +85,7 @@ public class ContactFragment extends Fragment implements OnClickListener {
private void displayContact(LayoutInflater inflater, View view) { private void displayContact(LayoutInflater inflater, View view) {
AvatarWithShadow contactPicture = (AvatarWithShadow) view.findViewById(R.id.contactPicture); AvatarWithShadow contactPicture = (AvatarWithShadow) view.findViewById(R.id.contactPicture);
if (contact.getPhotoUri() != null) { if (contact.getPhotoUri() != null) {
InputStream input = Compatibility.getContactPictureInputStream(getActivity().getContentResolver(), contact.getID()); InputStream input = Compatibility.getContactPictureInputStream(LinphoneActivity.instance().getContentResolver(), contact.getID());
contactPicture.setImageBitmap(BitmapFactory.decodeStream(input)); contactPicture.setImageBitmap(BitmapFactory.decodeStream(input));
} else { } else {
contactPicture.setImageResource(R.drawable.unknown_small); contactPicture.setImageResource(R.drawable.unknown_small);

8
src/org/linphone/setup/WizardFragment.java
View file

@ -20,8 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import java.net.URL; import java.net.URL;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphoneService;
import org.linphone.R; import org.linphone.R;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@ -160,8 +162,10 @@ public class WizardFragment extends Fragment {
} }
}; };
final Context context = SetupActivity.instance() == null ? LinphoneService.instance().getApplicationContext() : SetupActivity.instance();
try { try {
XMLRPCClient client = new XMLRPCClient(new URL(getString(R.string.wizard_url))); XMLRPCClient client = new XMLRPCClient(new URL(context.getString(R.string.wizard_url)));
XMLRPCCallback listener = new XMLRPCCallback() { XMLRPCCallback listener = new XMLRPCCallback() {
Runnable runNotOk = new Runnable() { Runnable runNotOk = new Runnable() {
@ -172,7 +176,7 @@ public class WizardFragment extends Fragment {
Runnable runOk = new Runnable() { Runnable runOk = new Runnable() {
public void run() { public void run() {
SetupActivity.instance().saveCreatedAccount(username, password, getString(R.string.default_domain)); SetupActivity.instance().saveCreatedAccount(username, password, context.getString(R.string.default_domain));
SetupActivity.instance().displayWizardConfirm(username); SetupActivity.instance().displayWizardConfirm(username);
} }
}; };