From 808e342cd4d74057a23ae63d009f3f3e4064442e Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 24 Apr 2014 19:58:18 -0700 Subject: [PATCH] clean up --- .../eehouse/android/xw4/BoardActivity.java | 51 ------------------- .../org/eehouse/android/xw4/ChatDelegate.java | 2 +- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index 6ba2dc2c2..396d5b90c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -21,68 +21,17 @@ package org.eehouse.android.xw4; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; -import android.app.ProgressDialog; - -import android.content.DialogInterface.OnDismissListener; -import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.content.res.Configuration; - -import android.graphics.Bitmap; -import android.graphics.Rect; - import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; - import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.view.View; -import android.view.Window; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageButton; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashSet; -import java.util.concurrent.Semaphore; -import junit.framework.Assert; - -import org.eehouse.android.xw4.DlgDelegate.Action; -import org.eehouse.android.xw4.jni.*; -import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; -import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; -import org.eehouse.android.xw4.jni.JNIThread.*; - public class BoardActivity extends Activity { - public static final String INTENT_KEY_CHAT = "chat"; - - private static final int CHAT_REQUEST = 1; - private static final int BT_INVITE_RESULT = 2; - private static final int SMS_INVITE_RESULT = 3; - - private static final int SCREEN_ON_TIME = 10 * 60 * 1000; // 10 mins - - private static final String DLG_TITLE = "DLG_TITLE"; - private static final String DLG_TITLESTR = "DLG_TITLESTR"; - private static final String DLG_BYTES = "DLG_BYTES"; - private static final String ROOM = "ROOM"; - private static final String PWDNAME = "PWDNAME"; - private static final String TOASTSTR = "TOASTSTR"; - private static final String WORDS = "WORDS"; - private static final String GETDICT = "GETDICT"; - private BoardDelegate m_dlgt; @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java index aa07e2e8f..d8a54fc37 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java @@ -104,7 +104,7 @@ public class ChatDelegate extends DelegateBase DBUtils.appendChatHistory( m_activity, m_rowid, text, true ); Intent result = new Intent(); - result.putExtra( BoardActivity.INTENT_KEY_CHAT, text ); + result.putExtra( BoardDelegate.INTENT_KEY_CHAT, text ); m_activity.setResult( Activity.RESULT_OK, result ); } m_activity.finish();