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

Fix bugs crash nullPointer

Browse source
This commit is contained in:
Margaux Clerc 2015-05-11 15:19:47 +02:00
parent 2f512441f0
commit 8bf79e4e13
3 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
res/layout-small/setup_wizard.xml
View file

@ -79,35 +79,51 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" /> android:background="@drawable/setup_field_background" />
<EditText <ImageView
android:textCursorDrawable="@null" android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_password_confirm" android:id="@+id/setup_password_ok"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/setup_password" android:paddingRight="5dp"
android:hint="@string/setup_password_confirm_hint" android:layout_alignParentRight="true"
android:singleLine="true" android:layout_centerVertical="true"
android:lines="1" android:src="@drawable/wizard_notok"/>
android:maxLines="1"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:ellipsize="end"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:textCursorDrawable="@null"
android:id="@+id/setup_password_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/setup_password_confirm_hint"
android:singleLine="true"
android:lines="1"
android:maxLines="1"
android:inputType="textPassword"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:ellipsize="end"
android:textColor="@android:color/black"
android:background="@drawable/setup_field_background" />
<ImageView
android:contentDescription="@string/content_description_setup_ok"
android:id="@+id/setup_confirm_password_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/wizard_notok"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -160,12 +176,6 @@
</RelativeLayout> </RelativeLayout>
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="10dp"
android:paddingRight="10dp" />
</LinearLayout>
</LinearLayout> </LinearLayout>

3
src/org/linphone/ContactsManager.java
View file

@ -593,9 +593,8 @@ public class ContactsManager {
c.close(); c.close();
return address; return address;
} }
c.close();
} }
c.close();
return null; return null;
} }

2
src/org/linphone/ui/Digit.java
View file

@ -155,8 +155,8 @@ public class Digit extends Button implements AddressAware {
if(id == R.id.Digit1 && lc.getCalls().length == 0){ if(id == R.id.Digit1 && lc.getCalls().length == 0){
String voiceMail = LinphonePreferences.instance().getVoiceMailUri(); String voiceMail = LinphonePreferences.instance().getVoiceMailUri();
mAddress.getEditableText().clear(); mAddress.getEditableText().clear();
mAddress.getEditableText().append(voiceMail);
if(voiceMail != null){ if(voiceMail != null){
mAddress.getEditableText().append(voiceMail);
LinphoneManager.getInstance().newOutgoingCall(mAddress); LinphoneManager.getInstance().newOutgoingCall(mAddress);
} }
return true; return true;