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

add help uri to first login dialog

Browse source
This commit is contained in:
Jehan Monnier 2010-09-22 11:04:25 +02:00
parent 89ea2f914a
commit 9cf418d209
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

BIN
libs/armeabi/liblinphone.so
View file

Binary file not shown.

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 ?\n Need help ?\n http://www.linphone.org</string> <string name="initial_config_error">&lt;P ALIGN=CENTER&gt;No SIP account has been configured yet, do you want to go to the settings page ?&lt;br/&gt;&lt;br/&gt; Need help ?&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt;</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>

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

@ -37,6 +37,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.Html;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -197,7 +198,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
mInCallControlRow.setVisibility(View.GONE); mInCallControlRow.setVisibility(View.GONE);
mInCallAddressLayout.setVisibility(View.GONE); mInCallAddressLayout.setVisibility(View.GONE);
mDecline.setEnabled(false); mDecline.setEnabled(false);
if (LinphoneService.isready() && getIntent().getData() != null) { if (LinphoneService.isready() && getIntent().getData() != null && !LinphoneService.instance().getLinphoneCore().isIncall()) {
newOutgoingCall(getIntent().getData().toString().substring("tel://".length())); newOutgoingCall(getIntent().getData().toString().substring("tel://".length()));
getIntent().setData(null); getIntent().setData(null);
} }
@ -374,11 +375,10 @@ 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))
TextView lDialogTextView = new TextView(this); TextView lDialogTextView = new TextView(this);
lDialogTextView.setAutoLinkMask(0x0f/*all*/); lDialogTextView.setAutoLinkMask(0x0f/*all*/);
lDialogTextView.setPadding(10, 10, 10, 10); lDialogTextView.setPadding(10, 10, 10, 10);
lDialogTextView.setText(getString(R.string.initial_config_error)); lDialogTextView.setText(Html.fromHtml(getString(R.string.initial_config_error) ));
builder.setCustomTitle(lDialogTextView) builder.setCustomTitle(lDialogTextView)
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {

2
submodules/linphone

@ -1 +1 @@
Subproject commit a0044d9a6a3bfb25618ac5bd28e8687ae73e8fd3 Subproject commit 8210107a35463f30894027ad271ee0f66d79cb00