Eric House
8aef67dba4
fix NPE reported by crittercism
2015-08-01 22:17:13 -07:00
Eric House
0a95bc0f42
drop messages using comms methods (e.g. SMS) for which comms hasn't
...
been set up. Fixes assertion firing when SMS messages go to wrong app
(normal vs CrossDbg), though the right fix is to have the two apps
using different ports so they don't get each other's messages.
2015-07-31 22:15:57 -07:00
Eric House
6c863155ef
clean up BT UUID assignment, replacing runtime strcmp with compile
...
time macro magic
2015-07-31 07:35:44 -07:00
Eric House
81834bcbfa
provide app name in variant too to fix empty substitution errors
...
(e.g. About menutem)
2015-07-31 07:14:11 -07:00
Eric House
36adf7f86c
get rid of About menuitem in board -- in main view is enough
2015-07-31 07:14:04 -07:00
Eric House
d9bc713b7b
get rid of About menuitem in board -- in main view is enough
2015-07-31 07:12:27 -07:00
Eric House
f368eb0283
provide app name in variant too to fix empty substitution errors
...
(e.g. About menutem)
2015-07-31 07:10:19 -07:00
Eric House
f45cafad29
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-07-31 07:05:39 -07:00
Eric House
4a580eabda
handle maintenance messages from relay
2015-07-31 06:36:35 -07:00
Eric House
2dc536dfeb
change button text to Wait (per Kati)
2015-07-30 06:36:47 -07:00
Eric House
65606607ab
use different uuid for dbg variant so it's not cross-sending BT
...
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-07-29 19:48:56 -07:00
Eric House
3732321825
fix so -Wundef can be passed -- except that android's headers don't
...
compile then :-)
2015-07-29 19:36:17 -07:00
Eric House
8acba7e092
add only phones and computers to list of possible BT opponent devices
2015-07-29 06:39:03 -07:00
Eric House
dfc3ca5289
Merge branch 'android_branch' into relay_noconn
2015-07-29 05:54:10 -07:00
Eric House
cb7b8660dc
bring in Catalan changes from android_translate branch, and fix a
...
couple of typos
2015-07-29 05:47:08 -07:00
Eric House
6b5596590e
catch NumberFormatException: strings come from users (if this feature
...
ships) so this can happen.
2015-07-28 21:10:40 -07:00
Eric House
a2705ca821
uninstall dbg variant too
2015-07-28 21:01:46 -07:00
Eric House
f6aa4e6d3c
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-07-28 06:28:01 -07:00
Eric House
2ec2972b9b
invalidate menubar when minimizing group. (Thanks Aidan.)
2015-07-28 06:26:25 -07:00
Eric House
aa78ec2701
echo name of new .apk for easier scping
2015-07-27 07:29:09 -07:00
Eric House
82f1406df7
incorporate git rev number in name of debug .apk
2015-07-27 07:28:58 -07:00
Eric House
fc904af928
echo name of new .apk for easier scping
2015-07-27 07:26:32 -07:00
Eric House
85bd8ec2d4
merge
2015-07-27 07:16:28 -07:00
Eric House
7cc58de6e5
Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
...
Conflicts:
xwords4/android/scripts/info.py
2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5
update to not notify of debug build updates when version matches what's installed
2015-07-27 07:12:44 -07:00
Eric House
037cc73f3e
add rematch menu item shown whenever the game's finished (but not
...
shown for games with > 2 players.
2015-07-27 06:26:28 -07:00
Eric House
0b9e53df96
Fix misspelling. Thanks Frank. :-)
2015-07-26 22:24:16 -07:00
Eric House
684c7ff3e3
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
2015-07-26 13:22:45 -07:00
Eric House
75cd6c6693
fix logic behind "unable to find move" alert
2015-07-26 13:17:59 -07:00
Eric House
3c58267d4e
goes with cherrypick
2015-07-26 12:09:51 -07:00
Eric House
0bb51e8b93
show a toast when hint can't find anything, on the principle that user
...
should see some response to every action.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
3ea8102e1e
Revert "add app package name to params to update check script (info.py) which"
...
This reverts part of commit 3579256ef9
2015-07-25 22:10:53 -07:00
Eric House
2e6154e920
Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
...
Conflicts:
xwords4/android/scripts/info.py
2015-07-25 22:03:05 -07:00
Eric House
fe91c9e04e
update to serve newest debug as well as release builds, and to know about variants
2015-07-25 21:56:48 -07:00
Eric House
ca71118c8d
incorporate git rev number in name of debug .apk
2015-07-25 20:54:07 -07:00
Eric House
3579256ef9
add app package name to params to update check script (info.py) which
...
can then decide what variant to look for.
2015-07-25 09:10:16 -07:00
Eric House
7c8c6bb55b
move app name into resource that's not copied to fix dbg variant
...
having empty name (though it didn't before)
2015-07-25 08:52:33 -07:00
Eric House
d67245282b
merge in a year's worth of changes
2015-07-25 08:45:28 -07:00
Eric House
48e019f216
upgrade crittercism jar
2015-07-25 08:44:46 -07:00
Eric House
e62993f60e
ignore all the new files being copied over
2015-07-25 08:23:12 -07:00
Eric House
59ab1736ca
include res_src in set of directories copied for -dbg variant
2015-07-25 08:21:44 -07:00
Eric House
1484a27daf
add option to send/receive invite data in binary/common form (as relay invites do)
2015-07-24 22:37:41 -07:00
Eric House
ed8d2ba0f6
fix NPE and remove assertion: moving from anon to GCM-based relayID is
...
common
2015-07-24 06:39:39 -07:00
Eric House
3c2a56166c
move static final to where it can be private
2015-07-24 06:10:26 -07:00
Eric House
04c263fe28
for testing relay switch, add optional override of hostname
2015-07-23 07:46:46 -07:00
Eric House
d4e5c9dfdf
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
2015-07-23 07:03:47 -07:00
Eric House
fa00eef151
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00
Eric House
b48f83ace4
fix NPE on clean install
2015-07-22 07:56:34 -07:00
Eric House
1d5249f139
respect game dict and language in rematch! NOTE: this doesn't handle
...
the case where players have different dicts.
2015-07-22 07:32:36 -07:00
Eric House
f8acd68e09
remove unused constants
2015-07-22 07:31:26 -07:00
