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

add help link to the first login dialog

Browse source
This commit is contained in:
Jehan Monnier 2010-09-17 16:58:58 +02:00
parent 0fa3d7bad2
commit 89ea2f914a
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="1016" android:versionName="1.0.16"> android:versionCode="1016" android:versionName="1.0.16" android:installLocation="auto">
<uses-sdk android:minSdkVersion="3" /> <uses-sdk android:minSdkVersion="3" />
<application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57"> <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">

2
default.properties
View file

@ -10,4 +10,4 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-3 target=android-8

2
res/values/strings.xml
View file

@ -56,7 +56,7 @@
<string name="no">No</string> <string name="no">No</string>
<string name="never_remind">Never remind me</string> <string name="never_remind">Never remind me</string>
<string name="config_error">%s, do you want to go to the settings page ?</string> <string name="config_error">%s, do you want to go to the settings page ?</string>
<string name="initial_config_error">No SIP account has been configured yet, do you want to go to the settings page ?</string> <string name="initial_config_error">No SIP account has been configured yet, do you want to go to the settings page ?\n Need help ?\n http://www.linphone.org</string>
<string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string> <string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
<string name="tab_history">History</string> <string name="tab_history">History</string>
<string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string> <string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>

9
src/org/linphone/DialerActivity.java
View file

@ -374,7 +374,12 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
} catch (LinphoneConfigException ec) { } catch (LinphoneConfigException ec) {
Log.w(LinphoneService.TAG,"no valid settings found",ec); Log.w(LinphoneService.TAG,"no valid settings found",ec);
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.initial_config_error)) //builder.setMessage(getString(R.string.initial_config_error))
TextView lDialogTextView = new TextView(this);
lDialogTextView.setAutoLinkMask(0x0f/*all*/);
lDialogTextView.setPadding(10, 10, 10, 10);
lDialogTextView.setText(getString(R.string.initial_config_error));
builder.setCustomTitle(lDialogTextView)
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@ -538,7 +543,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
} }
public void onClick(View v) { public void onClick(View v) {
LinphoneCore lc = LinphoneService.instance().getLinphoneCore(); LinphoneCore lc = LinphoneService.instance().getLinphoneCore();
//stopDtmf(); stopDtmf();
if (lc.isIncall()) { if (lc.isIncall()) {
lc.sendDtmf(mKeyCode.charAt(0)); lc.sendDtmf(mKeyCode.charAt(0));
} else { } else {