Eric House
4e1a382f1e
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2015-08-11 07:42:05 -07:00
Eric House
be9b8977e5
turn off email invite attachments
2015-08-11 07:30:34 -07:00
Eric House
4a28da1348
Show specific notification on receipt of chat, not rehash of last move
...
played.
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -07:00
Eric House
5853b0c5c6
Show specific notification on receipt of chat, not rehash of last move
...
played.
2015-08-11 06:47:10 -07:00
Eric House
265ac48b88
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4-dbg/AndroidManifest.xml
xwords4/android/XWords4-dbg/res/layout/.gitignore
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
2015-08-10 07:37:03 -07:00
Eric House
00e6a80fb0
fix permission and other constants that need to be different in variant
2015-08-10 07:07:33 -07:00
Eric House
1d14d4cc65
ignore new files
2015-08-10 06:52:31 -07:00
Eric House
c3aeefe706
bring over changes for permissions etc
2015-08-10 06:52:19 -07:00
Eric House
2ef407320e
pick package based on location
2015-08-10 06:43:19 -07:00
Eric House
517cfe6fda
bring over saved file format change from relay_conn branch so builds
...
from each will be able to open each other's files.
2015-08-10 06:24:40 -07:00
Eric House
87e3108296
cleanup: make work based on location if target not specified
2015-08-10 06:23:24 -07:00
Eric House
c99decaf32
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
2015-08-07 07:55:26 -07:00
Eric House
134ef851f6
generate local.properties if running for first time
2015-08-06 21:01:15 -07:00
Eric House
8b90f211ed
progress: compares english and other languages use of format
...
specifiers, but I think is missing mismatches in plurals still.
2015-08-05 07:19:39 -07:00
Eric House
ec581d1dbd
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/jni/Android.mk
xwords4/android/XWords4/jni/xwjni.c
xwords4/android/XWords4/res/values/common_rsrc.xml
2015-08-04 20:17:56 -07:00
Eric House
97ebdd0d63
copy changes over from android_translate branch
2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1
name change
2015-08-04 20:15:00 -07:00
Eric House
debe424c8a
copy over from android_translate branch
2015-08-04 20:13:19 -07:00
Eric House
a45b698ea9
don't crash when first run without network connection
2015-08-03 05:25:35 -07:00
Eric House
bcd620a4f9
clean up to make cherry-picked changes work
2015-08-03 05:07:49 -07:00
Eric House
cfa101350a
add logdf, logging for DEBUG builds only
2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6
fix variant crashes: had forgotten PKG_PATH on new method
2015-08-03 04:59:15 -07:00
Eric House
97bf616db1
Problem: NBS port is being ignored by dispatcher to broadcast
...
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-03 04:58:46 -07:00
Eric House
c83d3368ad
allow using script for any project with an AndroidManifest.xml
2015-08-03 04:58:34 -07:00
Eric House
1e7f51a88d
move last-pressed button to bottom of screen where it's natural to look for it
2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d
different logging TAG for different variants
2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-03 04:55:59 -07:00
Eric House
1959ff3b2d
fix NPE reported by crittercism
2015-08-03 04:54:42 -07:00
Eric House
b500a4646d
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-08-03 04:50:56 -07:00
Eric House
b56924b030
fix off-by-one error that probably had me slowly leaking local obj
...
references for the last few years.
2015-08-02 16:43:52 -07:00
Eric House
a148680e44
catch up: it's been a few commits since I included this.
2015-08-02 16:43:23 -07:00
Eric House
a349ab4bee
add commented-out getClassName() in case it's useful in the future.
2015-08-02 16:41:28 -07:00
Eric House
b3ca4ee223
fix off-by-one error that probably had me slowly leaking local obj
...
references for the last few years.
2015-08-02 16:29:53 -07:00
Eric House
56082d2f7b
fix variant crashes: had forgotten PKG_PATH on new method
2015-08-02 16:15:32 -07:00
Eric House
a26e642c8e
Problem: NBS port is being ignored by dispatcher to broadcast
...
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-02 14:35:05 -07:00
Eric House
7875d34757
allow using script for any project with an AndroidManifest.xml
2015-08-02 14:15:14 -07:00
Eric House
1fb55c8a78
move last-pressed button to bottom of screen where it's natural to look for it
2015-08-02 14:14:19 -07:00
Eric House
af8c6d618d
different logging TAG for different variants
2015-08-02 10:29:17 -07:00
Eric House
8182fc7822
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:40:24 -07:00
Eric House
0425df7a5e
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:39:00 -07:00
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
