Widget sample: don't crash if Send button is activated before session…

… connected Apparently some phones/devices/platforms do this when the activity is started.
zielmicha · May 15, 2012 · cb7b980 · cb7b980
1 parent 2274fa8
commit cb7b980
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java b/examples/widget/src/jackpal/androidterm/sample/telnet/TermActivity.java
@@ -53,10 +53,16 @@ public boolean onEditorAction(TextView v, int action, KeyEvent ev) {
                 if (ev != null && ev.getAction() == KeyEvent.ACTION_UP) {
                     return false;
                 }
+                // Don't try to send something if we're not connected yet
+                TermSession session = mSession;
+                if (mSession == null) {
+                    return true;
+                }
+
                 Editable e = (Editable) v.getText();
                 // Write to the terminal session
-                mSession.write(e.toString());
-                mSession.write('\r');
+                session.write(e.toString());
+                session.write('\r');
                 TextKeyListener.clear(e);
                 return true;
             }
@@ -67,8 +73,13 @@ public boolean onEditorAction(TextView v, int action, KeyEvent ev) {
         Button sendButton = (Button) findViewById(R.id.term_entry_send);
         sendButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
+                // Don't try to send something if we're not connected yet
+                TermSession session = mSession;
+                if (mSession == null) {
+                    return;
+                }
                 Editable e = (Editable) mEntry.getText();
-                mSession.write(e.toString());
+                session.write(e.toString());
                 TextKeyListener.clear(e);
             }
         });