From c7c2b93c89209d5994c11ff778fb7fb876a4127c Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 7 Dec 2010 10:32:52 +0100 Subject: [PATCH] Simplify registration tutorial. --- .../TutorialRegistrationActivity.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java b/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java index d87446140..6da10f3d6 100644 --- a/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java +++ b/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java @@ -42,6 +42,7 @@ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { private TutorialRegistration tutorial; private Button buttonCall; private Handler mHandler = new Handler(); + private TextView outputText; @Override @@ -55,7 +56,7 @@ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { sipPasswordWidget.setText(defaultSipPassword); // Output text to the outputText widget - final TextView outputText = (TextView) findViewById(R.id.OutputText); + outputText = (TextView) findViewById(R.id.OutputText); final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText); @@ -66,6 +67,7 @@ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { // Assign call action to call button buttonCall = (Button) findViewById(R.id.CallButton); + buttonCall.setText("Register"); buttonCall.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { TutorialLaunchingThread thread = new TutorialLaunchingThread(); @@ -74,13 +76,9 @@ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { } }); - // Assign stop action to stop button + // Hide stop button Button buttonStop = (Button) findViewById(R.id.ButtonStop); - buttonStop.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - tutorial.stopMainLoop(); - } - }); + buttonStop.setVisibility(View.GONE); } @@ -92,13 +90,9 @@ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { tutorial.launchTutorial( sipAddressWidget.getText().toString(), sipPasswordWidget.getText().toString()); - mHandler.post(new Runnable() { - public void run() { - buttonCall.setEnabled(true); - } - }); } catch (LinphoneCoreException e) { e.printStackTrace(); + outputText.setText(e.getMessage() +"\n"+outputText.getText()); } } }