Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
10134 commits 21 branches 243 tags 33 MiB
Commit graph

10028 commits

Author SHA1 Message Date
Eric House
1c59f1e002 replace window title when pane goes away 
Add new parameterless setTitle() method on delegates, and call it when a
fragment is removed so the new right-most pane can restore a title that
makes sense. So far only board and gameconfig delegates implement this
new method.
 2016-08-12 11:00:51 -07:00
Eric House
76a7aeb93c fix dupeGame for dual-pane case 
Current GameLock implementation means you can't get a lock for an open
game, so try getting one from an existing JNIThread instance
first. Which is a hack that's start to appear in lots of places.... Also
fix so just in case we are unable to lock a game we drop the rematch
process rather than crash in an assert later. The test case: rematch a
solo game that's currently open in the right pane.
 2016-08-12 08:55:54 -07:00
Eric House
16a622d22c cleanup: rename method 2016-08-12 08:50:26 -07:00
Eric House
dfe79a2d97 move game loading into GameLock 
Fixed race conditions revealed by dual-pane mode where GameLock could be
instantiated and then attempts made to reference its game (jni calls)
before it had been loaded. So now loading happens inside the same
synchronized methods as opening or creating a game.
 2016-08-12 08:33:36 -07:00
Eric House
90e7cbd2ed cleanup: use constants 2016-08-12 08:08:53 -07:00
Eric House
8e399ef9b7 assert from java that jni code has an env 
Rare crashes are happening inside the jni, in game_dispose(), when a
game's double-disposed. Adding a jni call to check if the thread about
to do a game_dispose() will fail then asserting its result in java
allows useful stack traces to come via Crittercism. Or should.
 2016-08-11 16:42:18 -07:00
Eric House
5d9423f317 fix rematch crash: don't call finish() 
There was a race condition between finish() and the popping of fragments
that happens inside dispatchNewIntent(). If dispatchNewIntent() won then
later finish() would pop the GamesListFragment and we'd crash. Ideally
finish() would pass a fragment to finishFragment() which would then do
nothing if that fragment wasn't on the stack. Later....
 2016-08-11 16:33:12 -07:00
Eric House
457970b2d2 gtk: the tiniest bit of cleanup 
Trying and failing to get just the content area of the tree view to
scroll, whether by putting it in its own container or hooking into the
scrollable interface tree view allegedly supports.
 2016-08-10 14:53:44 -07:00
Eric House
06fb4ef0ee improve experience switching dualpane mode 
better strings, and explain when pref changed that user must restart for
it to take effect. Actually restarting from inside prefs delegate is
hard enough I'm not doing it for what should be advanced users.
 2016-08-10 11:56:05 -07:00
Eric House
01d45df3ae use WeakReference to prevent "leak" of static member 2016-08-10 11:46:38 -07:00
Eric House
bece9183f9 remove restart notification on start 2016-08-10 11:32:23 -07:00
Eric House
43b76d24cc add commented out thread assertion 
I want to use ReentrantLock instead of my implementation but I'm
breaking its rule that the thread that locks a lock must be the one to
unlock it. Add commented-out assertion for some later time when I might
want to fix this. No change for now.
 2016-08-10 09:42:19 -07:00
Eric House
1029bb78a0 Merge branch 'android_branch' into android_translate 2016-08-07 13:08:13 -07:00
Eric House
dddfa2e269 keep INVITE alert up for rematch game 
Game created for rematch was coming up unconnected and without
explanation if recipient of invitation hadn't responded. Don't dismiss
the INVITE alert in that case.
 2016-08-07 11:54:45 -07:00
Eric House
9909750605 don't show the loading view except the first time 2016-08-06 09:32:13 -07:00
Eric House
3140df2f37 wrap loading and loaded views in FrameLayout 
This to prevent the game list item from resizing (and so reflowing the
whole list) when it's reloading game info. Better would be to set a
timer and only show the reloading view if it seems likely to take a
minute.
 2016-08-06 09:27:11 -07:00
Eric House
c2305dafff let android studio "optimize imports" 2016-08-05 22:16:04 -07:00
Eric House
b9bb1e2684 cleanup: use new board_drawSnapshot on existing game 2016-08-05 22:04:30 -07:00
Eric House
bf7a38da08 copy more state into board being used for snapshot 2016-08-05 21:19:49 -07:00
Eric House
a275730824 gtk: fix crash when hit rematch button 
Not all games have a draw context. Check!
 2016-08-05 18:37:35 -07:00
Eric House
012b015f82 gtk: save games list window size and position 2016-08-05 18:31:17 -07:00
Eric House
25723bbb0f put main games window in a scrolling container 2016-08-05 12:02:05 -07:00
Eric House
8b142e4a56 use new board_drawSnapshot() from android 
BoardCanvas wouldn't render anything without an associated dict via
dictChanged()
 2016-08-05 11:51:47 -07:00
Eric House
7f513313b0 fix crash loading new game before snapshot exists 2016-08-05 10:37:42 -07:00
Eric House
0c6283ea63 add board_drawSnapshot 
Toward something that should work with android: pass a potentially
unique draw context into new method that creates a new board just for
the draw and makes its scoreboard and tray disappear.
 2016-08-05 10:23:39 -07:00
Eric House
3c0a128266 produce, store and display actual snapshot 
Done in a way that won't work for Android just to try out the gtk
way. Tweaks and reuses the existing draw context and board, which is
precisely what the android version can't easily do.
 2016-08-05 09:42:55 -07:00
Eric House
aeee2d801a toward snapshots in gtk version 
Add new "snap" blob to db and pixbuf column to games display table, and
add code to store and retrieve from db. What's stored now is a
hard-coded file, so next up is generating an actual snapshot from the
game.
 2016-08-05 08:29:25 -07:00
Eric House
b4393d5965 fix cursor-hiliting of player in scoreboard 2016-08-04 16:13:54 -07:00
Eric House
df6c1e0d3a make beginDraw return a boolean so can abort 
When a gtk3 window's shutting down it appears we can't get a cairo_t*
for it. This change makes it possible to turn that fact into aborting
the whole draw operation.
 2016-08-04 15:12:05 -07:00
Eric House
3c7af0023e fix curses drawtable fallback 2016-08-04 14:16:52 -07:00
Eric House
80f894b869 fix remaining gtk dialogs 2016-08-04 12:43:33 -07:00
Eric House
66e26c1489 hook up draw signal 
Whenver we get the draw signal, invalidate the whole board and draw
it. This is resulting in a lot of wasted effort that might be mitigated
if I figured out how to get the invalid region out of the cairo_t*
that's passed in, but this is a test app and my machine's pleny fast. So
go with it for now.
 2016-08-04 11:41:43 -07:00
Eric House
33f904fa1e provide no-op implementations of new draw methods 2016-08-04 07:07:52 -07:00
Eric House
aad97c7c23 grab the GameLock in synchronized code 
I'm seeing unreproducible crashes trying to double-dispose jni game
instances and think it's a race condition involving JNIThread. Forcing
it to hold the lock in the constructor, access to which is synchronized,
is an improvement and may well fix it.
 2016-08-04 06:48:39 -07:00
Eric House
d2edbaff37 log more about jni thread mapping 2016-08-04 06:46:34 -07:00
Eric House
1892d24317 get all layouts from the same place 2016-08-03 17:56:38 -07:00
Eric House
9521b71be9 fix remtext rendering 2016-08-03 17:35:44 -07:00
Eric House
670f0034af fix a bunch of color setting 2016-08-03 16:54:45 -07:00
Eric House
eb6fb508bf fix crash dragging tiles 
Add new begin() and end() methods around all drawing and get/destroy
cairo context there.
 2016-08-03 15:50:17 -07:00
Eric House
b57e50a255 snapshot toward building with gtk3 
Board renders, but only when touched. Tray and scoreboard skipped for
now. Lots of changed still to go, and some asserts added where I didn't
want to stop to solve a compile problem.
 2016-08-03 15:19:12 -07:00
Eric House
2ade75158b gtk: update constants 2016-08-03 08:20:05 -07:00
Eric House
799e89fdc1 gtk: use accessors instead of peeking at structs 2016-08-03 08:09:47 -07:00
Eric House
cb97ceab82 oops: don't show upgrade changelist on every boot 2016-08-03 07:24:16 -07:00
Eric House
bd8e829a06 replace deprecated gtk symbols (lightly tested) 2016-08-03 07:11:02 -07:00
Eric House
2ff7582688 enforce and follow new gtk header rules 2016-08-03 06:15:49 -07:00
Eric House
08269c8962 offer to turn on dual-pane mode for upgraders 
When a device is a tablet and not a first-time install, put up an offer
to enable dual-pane mode. Change confirm-alerts to include
do-not-show-again box, and use that. Add menu item, hidden when not in
dual-pane mode, to turn it back off. Exit app after posting a
notification and a toast on changing that preference so it'll take
effect.
 2016-08-02 21:49:17 -07:00
Eric House
f56869b9ea cleanup; synchronize calling start() 
Hash comparison is clearly working, so no need to keep the whole data
array any longer.
 2016-08-02 11:59:57 -07:00
Eric House
98eeb60f24 move sound notification preference 
It's about robot games too now so move out of network into general prefs.
 2016-08-02 11:30:33 -07:00
Eric House
e1cac237ab fix gradle build: remove thumbnail stuff 2016-07-30 17:48:47 -07:00
Eric House
1addd34e95 Merge branch 'android_branch' into android_translate 
# 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.
 2016-07-29 08:51:16 -07:00
Eric House
141fb29c81 fix occasional NPE 
I can't reproduce it, but occasionally fail to get Loc info for a
wordlist while opening. Drop the open rather than crash.
 2016-07-29 08:17:31 -07:00
Eric House
fa7de741eb fix NPE: PrefsActivity needs to delegate onStart() too 2016-07-29 08:03:14 -07:00
Eric House
5fc6ae5591 only log what's there 2016-07-29 08:02:00 -07:00
Eric House
ec96a00b46 remove compile-time enabling of chat: it's not coming out 2016-07-29 07:32:50 -07:00
Eric House
36f127fb18 log fragment IDs for now while still debugging this stuff 2016-07-29 07:20:14 -07:00
Eric House
e4c7b7ab40 handle intents on startup via a post() 
When app's launched via a move-made intent that will lead to opening
the board, let the GamesList fragment get fully in place before
opening the board. To open two at the same time confuses my fragment
code (OS kills it with a fatal exception.)
 2016-07-29 07:19:54 -07:00
Eric House
2b3ddcb431 cleanup thread->env mapping code 2016-07-28 08:52:11 -07:00
Eric House
39cafc2dcf remove unused imports and be explicit that LinearLayout.LayoutParams are being passed to FrameLayout instance. 2016-07-27 15:06:49 -07:00
Eric House
524a288999 change adb utility scripts so they work with more than just one set of apps. 2016-07-26 22:08:29 -07:00
Eric House
d6dd851349 fix NPE: ringtone can be null on older OS 2016-07-26 11:49:08 -07:00
Eric House
73fdb4a578 open chat later, via post(new Runnable()) 
When during onResume() of BoardDelegate we notice an undisplayed chat
message, don't add add a Chat fragment because (perhaps due to a bug
in my code) it'll come up blank. Instead use post() to open it via a
Runnable() that'll run after onResume() and the rest of current
fragment setup have completed.
 2016-07-26 09:34:32 -07:00
Eric House
bc9b8466f5 check for existing JNIThread first 
When loading gamelistitems in dual-pane mode there will often be an
open game. Don't hold up the whole process by first waiting 1 second
to get a lock that's unavailable. Instead check if there's a JNIThread
instance available and if so use its lock to get the summary. Required
fixing JNIThread to not crash trying to save when released too early.
 2016-07-26 07:44:21 -07:00
Eric House
272f8a3960 don't bother saving if no data loaded yet 
Fixes, or at least makes extremely unlikely, race condition where one
thread makes use of an existing JNIThread instance then releases it
before the thread that created it has had a chance to call configure()
to actually load the game.
 2016-07-26 07:27:13 -07:00
Eric House
9d95630654 make capture of thumbnail part of save 
Problem was that changes to games didn't show up in the thumbnail
until the game was closed. Simply using existing snapshot didn't work
because it changes the board layout in order to "draw" to
ThumbnailCanvas and that change isn't easily reversed. So copy
existing code to open a new JNI object with just-saved game data
and use it to create a thumbnail bitmap.
 2016-07-25 15:57:48 -07:00
Sylvia van Os
719d23f77b Translated using Weblate (Dutch) 
Currently translated at 98.5% (728 of 739 strings)
 2016-07-26 00:44:26 +02:00
Eric House
6fcd340e07 add some commented-out logging 2016-07-25 15:44:22 -07:00
Eric House
2faf9c5334 bug: update lastturn timestamp for single-player games too 2016-07-25 08:38:24 -07:00
Eric House
53e40be2e3 add lastMoveTime to summary table (gtk version) 2016-07-25 08:28:37 -07:00
Eric House
dd779597d8 remove compile-time option for thumbnails: they're not going away 2016-07-23 16:25:06 -07:00
Eric House
a1de8cdd01 disable reset for options menu too (same as delete) 2016-07-22 16:35:46 -07:00
Eric House
7a865f279b disable reset context menu too when game selected 2016-07-22 16:26:37 -07:00
Eric House
4d24fd38f5 disable delete context menuitem when game open 2016-07-22 16:11:27 -07:00
Eric House
cfbd06927a fix long-tap menus in dual-pane mode 
The DualpaneDelegate needed to handle (delegate) the necessary
methods.
 2016-07-22 16:11:01 -07:00
Eric House
2105c43987 fix problems recently introduced to GameConfig 2016-07-22 16:10:45 -07:00
Eric House
d6b4070905 hang onto DelegateBase instance until replaced via an onStart() call. 
They're often needed when the fragment isn't frontmost, i.e. when
onPause() has been called. My caching instances fix is feeling a bit
fragile, but I think it's better than nothing. Alternative is probably
to go with DialogFragments, a big change that might not be easy to
make work back to oldest Android.
 2016-07-22 16:10:23 -07:00
Eric House
7634c425ef stop referring to this in AlertDialog buttons 
There's a problem in dual-pane mode where activites outlive
DelegateBase instances that are tied to fragments. AlertDialogs, being
bound to the MainActivity, can sometimes outlive the delegates that
create them, meaning the 'this' referred to from closures bound to
onClick() handlers can come to be invalid (e.g. referencing a removed
fragment). So add a global registry of current DelegateBase instances
by class, and from onClick() handlers fetch and use the current
instance instead of the 'this' that's bound.
 2016-07-22 16:09:36 -07:00
Eric House
aef95ae498 dispatch onActivityResult() from DualpaneDelegate 
Inviting didn't work because it's done by a separate activity whose
onActivityResult() was dropped because DualpaneDelegate was the
recipient. That now handles it by asking MainActivity to sent it to a
contained Delegate. Currently will go only to the top (rightmost) one.
 2016-07-21 08:47:03 -07:00
Eric House
176820aac9 start game later so UI's ready 
Was opening game in init(), but in dual-pane case there's no
onWindowFocusChanged() call from which to check state, so open it
instead from onResume(), at which point things are already in place to
handle callbacks immediately. That is, post() will work.
 2016-07-21 08:41:21 -07:00
Eric House
0ea181687e add constant controlling id logging 2016-07-21 07:05:35 -07:00
Eric House
a8b2c09491 fix startFragmentForResult 
use s/getTargetFragment(), but there's still the hack of capturing
state in setResult() and then invoking fragment.onActivityResult()
blindly the next time the backstack is popped.
 2016-07-21 07:03:44 -07:00
Eric House
c57b5a232f cleanup: chat delegate no longer "returns" a result 2016-07-20 09:30:01 -07:00
Eric House
5b4e04bc5a fix fragment exception launching after dict download 
create queue of Runnables to be run only when Delegate is
visible (onResume() has been called and onPause() hasn't.)  When
missing dict finishes downloading, rather than immediately opening its
game, post a Runnable to do it that will be run only after the main
activity is ready to have fragment transactions committing again.
 2016-07-20 08:58:34 -07:00
Eric House
d3bd8047b1 cleanup 2016-07-20 08:51:31 -07:00
Eric House
c0bef59aad don't hide commit-trade menuitem when not player's turn 2016-07-20 07:25:12 -07:00
Eric House
5dee7080a0 fix so when left pane launches a fragment it replaces the right 
Required passing parent into constructors so it's available for
matching against the left pane later.
 2016-07-19 17:38:50 -07:00
Eric House
2b58072524 cleanup: don't test for what can't happen 2016-07-19 17:35:20 -07:00
Eric House
d6ffd4dc25 get game lock and ptr from jnithread if available 
When the game's already opened references must be obtained this
way. This may not be necessary however once game config is opened on
top of games list instead of on top of the game as it should be.
 2016-07-19 09:30:08 -07:00
Eric House
98e3cd4281 remove unused code 2016-07-19 09:27:08 -07:00
Eric House
9a1a4f989f ignore new files 2016-07-18 13:26:14 -07:00
Eric House
e2a3e622af generate project.properties file 
For some reason the 'clean-debug' cycle stopped working because the
file was nuked then not regenerated. Rather than figure out why, just
add a target to generate it every time.
 2016-07-18 13:25:55 -07:00
Eric House
d26a215f34 add and use fragment for dicts list view 2016-07-18 13:08:06 -07:00
Eric House
1ed9dc7c9d fix onResult stuff, at least for game config 2016-07-18 12:54:52 -07:00
Eric House
5bb707fc57 fix unnecessary crashes launching prefs activity 2016-07-18 12:03:56 -07:00
Eric House
d0b64f8f51 Merge branch 'android_108_release' into android_branch 2016-07-18 10:17:44 -07:00
Eric House
4f067edece up version code (since already uploaded as a beta) 2016-07-18 09:31:41 -07:00
Eric House
01ffdb8b87 up changes log to include new fix 2016-07-18 09:27:33 -07:00
Eric House
959b2aec33 don't dismiss alert when about to post it again 
On 4.2 and 4.3 at least, the dimiss comes after the second post
causing that to be dismissed, leaving no alert and the app in some
weird state where not even the back button works. It's been this way
on those older versions since I redid invitations for beta 98.
 2016-07-18 09:23:14 -07:00
Eric House
5f8e5dc343 don't dismiss alert when about to post it again 
On 4.2 and 4.3 at least, the dimiss comes after the second post
causing that to be dismissed, leaving no alert and the app in some
weird state where not even the back button works. It's been this way
on those older versions since I redid invitations for beta 98.
 2016-07-18 09:19:09 -07:00
Eric House
b5afc25ead catch up with generated changes: there's a new localized language now 2016-07-18 08:49:57 -07:00
Eric House
e3c5028b83 make script actually work 2016-07-18 08:49:36 -07:00
Eric House
f91e5f68c7 don't save state we won't need 2016-07-18 08:49:15 -07:00
Eric House
5a0304904f sdk's generating an additional comment for German strings 2016-07-14 07:37:59 -07:00
Eric House
db0fb8e2f1 cleanup: remove EOL whitespace from java files 
New diff tool is complaining about it, and sed is so easy...
 2016-07-14 07:37:11 -07:00
Eric House
15256ac2ad cleanup 2016-07-14 07:01:02 -07:00
Eric House
dcb4968ed9 fix NPE 
I think I'm in a bad state when this happens, but no point in
crashing regardless.
 2016-07-13 17:08:39 -07:00
Eric House
472a173297 disable delete if selected game is currently open 2016-07-13 17:03:18 -07:00
Eric House
1be2d514f0 Don't call executePendingTransactions(). 
Not doing so no longer crashes on when handling notifications, and is
causing runtime exceptions from the OS when board opening chat causes
it to be called recursively.
 2016-07-13 16:42:58 -07:00
Eric House
7b2392842e handle orientation changes at least as well as the old dualpane stuff 
did. Only obvious problem is that the board doesn't always lay itself
out optimally for its half of the board when orientation changes.
 2016-07-13 15:50:48 -07:00
Eric House
325304d83d fix finish() to not exit whole activity in dualpane mode 2016-07-13 13:35:31 -07:00
Eric House
a7013f3ede Setting FLAG_ACTIVITY_SINGLE_TOP for notification intents fixes 
display problems with GamesList in dual-pane mode, I think because it
prevents stacked activities. Need to figure out if it introduces
problems elsewhere.
 2016-07-13 12:35:54 -07:00
Eric House
9cfed0be8b add, disabled, some logging/notification posting stuff useful for debugging 2016-07-13 12:29:42 -07:00
Eric House
54e5e61e4d dispatch backPressed to the right-most fragment before, if still 
unhandled, letting super interpret it as a pop-fragment action.
 2016-07-13 12:23:36 -07:00
Eric House
4fc2dd97b3 handle notification intents: each delegate gets a chance to handle 
them (only GamesListDelegate does), and MainActivity pops
fragments/delegates until one's exposed that does.
 2016-07-13 11:13:04 -07:00
Eric House
0c4c1af926 call executePendingTransactions() to fix crash on opening 
notification. Not sure why I had it commented out before.
 2016-07-13 09:14:30 -07:00
Eric House
a375aed0fa use class.getSimpleName() rather than getName for logging 2016-07-13 09:07:48 -07:00
Eric House
dd96c1a5c2 cleanup: change map key type 2016-07-11 12:31:42 -07:00
Eric House
91c561f6aa fix NPEs by using existing mechanism for finding the right DlgDelegate 
instance.
 2016-07-11 11:52:55 -07:00
Eric House
a2b7c71fc1 convert remaining delegate launches to work, to varying degrees (but 
as they did before), in dual pane mode.
 2016-07-10 15:01:19 -07:00
Eric House
76404258a3 launch chat next to board. Works to send, but crash when opening the 
notification that results.
 2016-07-10 14:21:18 -07:00
Eric House
b8b73cc321 change how games are launched: works to show next to games list! But 
there seems to be something wrong with how alerts are being posted.
 2016-07-10 14:16:01 -07:00
Eric House
9865c0c68c load new dualpane delegate when enabled. It does nothing so far, not 
even allowing you to disable it again.
 2016-07-10 13:26:09 -07:00
Eric House
377ac269c9 Turn enable-dualpane prefs back on. Ignored so far. 2016-07-10 13:12:29 -07:00
Eric House
12b1f3e38b rename GamesListActivity -> MainActivity 2016-07-10 13:09:20 -07:00
Roland Illig
38d9b06d47 Translated using Weblate (German) 
Currently translated at 10.0% (74 of 739 strings)
 2016-07-08 21:44:42 +02:00
Eric House
c3817ef452 change version strings for new release 2016-07-08 06:18:07 -07:00
Eric House
c11c1f4a64 save and restore chat text selection 2016-07-07 06:37:33 -07:00
Eric House
91a58ab041 position caret at end of restored chat pending text 2016-07-06 21:39:55 -07:00
Bernard Massot
2ecc5add42 Translated using Weblate (French) 
Currently translated at 98.7% (730 of 739 strings)
 2016-07-07 00:44:29 +02:00
Eric House
a86ff8b7b0 revert change that broke board updating on 2.3.7. Yay for git 
bisect!!!!
 2016-07-05 20:17:55 -07:00
naofum
e20d11666a Translated using Weblate (Japanese) 
Currently translated at 100.0% (739 of 739 strings)
 2016-07-04 17:23:00 +02:00
Eric House
9dc50c9aa8 preserve unsent chats across activity reload. Use pairs table rather 
than creating a new one.
 2016-07-03 12:32:32 -07:00
Eric House
f05375273c add send button to right of chat entry field for devices that don't 
have action bar.
 2016-07-02 12:54:04 -07:00
Eric House
68df61daa8 fix crash on old device by using new API conditionally 2016-07-02 12:29:16 -07:00
Eric House
88d8e61620 cleanup; tweak string 2016-07-02 12:28:57 -07:00
Eric House
1a6f5842c6 wait for dismissal of one alert before posting another. There really 
needs to be some sort of queuing built into DlgDelegate, but for now
just handle in this one place.
 2016-06-30 08:01:58 -07:00
Eric House
446663ea86 update to new gradle plugin as recommended/generated by AS 2016-06-30 07:15:21 -07:00
Eric House
624ec870f2 clean up .gitignore files for localization stuff 2016-06-30 07:01:30 -07:00
Eric House
2f71119eea add ability to skip including localization resources on per-language, 
per-variant basis. Just in case German isn't ready yet.
 2016-06-30 06:54:36 -07:00
Eric House
a243b19fd0 fix NPE when relay's re-added to a game 2016-06-30 06:21:12 -07:00
Eric House
03492b97e8 fix doubled response to alert button: dismiss != negative 2016-06-29 07:01:08 -07:00
Eric House
f66fa5f75a cleanup: remove commented out code etc. 2016-06-28 06:05:31 -07:00
Eric House
3bc60c59d0 Add option to remove relay from a game once it's been turned off. 2016-06-26 15:53:26 -07:00
Eric House
3d682c425f remove Main activity 2016-06-26 15:41:15 -07:00
Eric House
94dadd4ca3 fix for single-device case 2016-06-26 14:54:01 -07:00
Eric House
3651137016 Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch 
# 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.
 2016-06-26 14:38:50 -07:00
Eric House
e703ae7ec5 get rid of Main activity. Next release I need to find a way at launch 
time to choose between dual-pane and regular mode that doesn't mess
up sending Intents and make it harder to prevent there being
multiple instances of activities that are supposed to be single-top.
 2016-06-26 14:28:17 -07:00
Eric House
6c5b5489ad cleanup: Remove some commented-out code 2016-06-26 13:53:59 -07:00
Eric House
61ea4b01e1 ignore files 2016-06-24 22:40:35 -07:00
Eric House
89a0426521 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2016-06-24 22:37:24 -07:00
Eric House
372b0c2f1e when user tries to turn on the preference disabling relay play and has 
relay games in play, warn, and only disable if confirmed.
 2016-06-24 21:19:30 -07:00
Eric House
aab779f258 duh: we're storing whether it's disabled, so reverse boolean 2016-06-23 06:27:01 -07:00
Eric House
7d47098947 start/stop relay service when pref changed; warn user when opens 
relay-connected game and relay is disabled.
 2016-06-22 07:20:23 -07:00
Eric House
6ef9c60cb9 add some generated .gitignore files 2016-06-22 06:53:02 -07:00
Eric House
aef5e5e046 add preference, off by default, to disable relay play. This is for 
people who use the app for standalone play only and don't like the
battery implications of it hitting the network (which it does too
often right now.)
 2016-06-21 06:08:25 -07:00
Eric House
a4ab8658fb something's adding line in a different format to .gitignore files; go 
with it.
 2016-06-20 07:25:32 -07:00
Eric House
bd08b0cfee cleanup: remove unneeded imports (from one old file) 2016-06-17 07:14:45 -07:00
Eric House
dc92007811 add grep: start process of having this script add value 2016-06-14 06:05:05 -07:00
Eric House
bba16c481e improve game query script to filter on connnames and clarify filter param 2016-06-12 18:30:19 -07:00
Eric House
03efa3a7e6 toward being able to do release builds of CrossDbg 2016-06-09 21:30:04 -07:00
Eric House
777b1a7aab turn off dualpane option. It's broken: makes it too easy to get lots 
of instances of the games list and board views stacked on top of each
other.
 2016-06-08 21:36:33 -07:00
Eric House
44c4d50051 Add config.xml file and use to enable dualpane option for CrossDbg builds 2016-06-07 04:31:31 -07:00
Eric House
032d073d6f cleanup: there's no solo network status any more 2016-05-31 06:28:48 -07:00
Roland Illig
16cbbc5bee Translated using Weblate (German) 
Currently translated at 8.4% (62 of 730 strings)
 2016-05-31 03:44:40 +02:00
Eric House
d3318f6631 fix chat edittext to expand vertically when there's more than one line 
of text in it.
 2016-05-30 15:14:52 -07:00
Eric House
124c85a2e9 fix gradle builds too to use combined constants files 2016-05-30 13:13:01 -07:00
Eric House
49e7abd23d Combine the two generated constants files 2016-05-30 13:10:20 -07:00
Bernard Massot
6e16ec69c1 Translated using Weblate (French) 
Currently translated at 100.0% (730 of 730 strings)
 2016-05-29 18:46:59 +02:00
Roland Illig
75f14a985a Added translation using Weblate (German) 2016-05-29 02:34:06 +02:00
naofum
48ddd271dc Translated using Weblate (Japanese) 
Currently translated at 100.0% (730 of 730 strings)
 2016-05-28 13:01:01 +02:00
Weblate
b14c6b5003 Merge remote-tracking branch 'origin/android_translate' into android_translate 2016-05-28 08:43:40 +02:00
Eric House
06ef079af1 fix. seems to do gradle builds correctly, though those builds need a 
lot of work still.
 2016-05-23 08:39:51 -07:00
Eric House
8082a1e0dc add files generated as a result of earlier change 2016-05-23 08:39:05 -07:00
Eric House
28a7d425cd remove gradle build files from a directory where, AFAIK,they don't belong 2016-05-23 08:37:50 -07:00
Eric House
73598462b8 don't include carriage return in generated file name 2016-05-23 07:42:43 -07:00
Eric House
f8cfb9cc44 change string and enum name to indicate Bluetooth is where the connect 
failure is.
 2016-05-21 14:35:53 -07:00
Eric House
f001455589 fix so tablets are found in BT scans: they're considered computers, not phones 2016-05-21 14:25:54 -07:00
Eric House
f51565839a no need to set summary to null when pausing. 2016-05-21 14:05:47 -07:00
Eric House
e127c8a3aa fix to uninstall (by default) based on directory invoked from 2016-05-21 13:36:56 -07:00
Eric House
17945b2dc0 turn on auto-capitalization of sentences in chat 2016-05-17 22:21:11 -07:00
Eric House
4791ccaca8 commented out code to add notification used to duplicate the bug 
addresses by the previous commit.
 2016-05-17 21:09:32 -07:00
Eric House
80ebcff4c9 Handle case where we want to open a game that's already open (likely 
in the process of being closed.) If we're successful in getting a
JNIThread object that's already initialized, re-use it, closing only
the JNI part (which probably can't be cleanly re-used with a different
Context.) I worry about the case where the thread's event queue isn't
empty, so there's an assert to catch that case.
 2016-05-17 21:08:03 -07:00
Eric House
79efbd2076 upgrade gradle (recommended by AS) 2016-05-17 20:56:31 -07:00
Eric House
253c0d7496 turn off saving logs for now; move capture of title to where it's more 
likely to succeed, and assert that it is. I think this will fix the
title-not-reverting problem I've been seeing.
 2016-05-10 06:40:23 -07:00
Eric House
608533d189 Merge branch 'from_android_beta_106' into android_branch 2016-05-03 06:44:39 -07:00
Eric House
c013c152d7 up version strings for release 107 (f-droid only is the plan) 2016-05-02 21:56:11 -07:00
Eric House
f0dc295bde break gradle release builds with an error message that will, with 
luck, communicate to the f-droid maintainer that ant it still the way
to build. Should stop the flood of error reports from f-droid users.
 2016-05-02 21:45:53 -07:00
Eric House
1cb75bd970 turn off an especially oft-occurring log message 2016-04-22 21:14:58 -07:00
Eric House
d376679d00 add new database table for persisting logs. DEBUG builds only for 
now. Keep the most recent 5K worth of messages. TODO: add a display
activity and the ability to email them.
 2016-04-22 21:14:36 -07:00
Eric House
1216ec49d7 cleanup: move method 2016-04-22 07:08:13 -07:00
Eric House
bf871a20fb test for null to avoid NPE. I'm not sure how it gets here -- race 
condition on opening maybe -- but not showing the one menuitem in this
case is harmless.
 2016-04-21 06:35:42 -07:00
Eric House
18503f2237 If we get an intent and can't open the game it names, that's probably because GamesListActivity has been relauched on top of itself. So exit with a (temporary) Toast message. 2016-04-20 21:50:09 -07:00
Eric House
c9a1f00a43 catch up with non-dbg changes, esp. enabling dual-pane mode (though 
it's off now thanks to a compile-time constant)
 2016-04-18 06:21:49 -07:00
Eric House
406eb77f54 post notification (rather than just play sound) when turn comes into 
boarddelegate but it's not visible
 2016-04-14 22:16:18 -07:00
Eric House
c860773234 still learning magit: check preference before playing sound 2016-04-14 21:50:18 -07:00
Eric House
99effcac89 looks like I missed a hunk in previous commit 2016-04-14 21:42:22 -07:00
Eric House
e239430260 play notification sound when a move or chat is added to the board or 
chat view. Still TODO: post a notification when that view isn't visible.
 2016-04-14 21:39:23 -07:00
Eric House
994672667c gitignore some stuff 2016-04-14 21:07:12 -07:00
Eric House
33225f3bc5 refactor message receiving/distributing code into superclass. 2016-04-11 06:01:25 -07:00
Eric House
f288fe2860 use malloc to allocate storate for hci_inquiry instead of the 
stack. That *seems* to fix it always returning 0, something that
changed with newer version of linux or libbluetooth or who knows
what. BT still doesn't work from linux, but this is a necessary start.
 2016-04-09 15:49:11 -07:00
Eric House
a0ae117e35 fix invitations breakage introduced when JNIThread because self-initing. 2016-04-09 14:47:48 -07:00
Eric House
27b3004b43 exclude computers from BT paried devices scan -- since doesn't work on 
ubuntu right now.
 2016-04-09 13:57:16 -07:00
Eric House
baee084a90 add assert to catch case where exception may otherwise be thrown 2016-04-09 13:34:13 -07:00
Eric House
57dcbabab6 use a constant 2016-04-09 13:10:04 -07:00
Eric House
04a697b260 fix NPE: put back setReceiver() call lost when JNIThread became 
self-initing.
 2016-04-09 12:42:47 -07:00
Eric House
3dd69d90d9 This stuff has to be done before content gets added. Move into 
Activity for now, though this may not work in dual-pane mode.
 2016-04-09 12:23:26 -07:00
Eric House
8c9e3ce14c use pthreads mutex to synchronize alloc and free operations in (debug 
only) mpool. I'm getting assertions about failure to free now that
multiple threads are accessing open games, but I think they're bogus:
due to multiple threads modifying the leak-detection counters. This
seems to fix the assertions I was seeing in mpool_destroy().
 2016-04-09 11:54:08 -07:00
Eric House
f876c49cd6 don't require that ant be run before install 2016-04-09 11:51:48 -07:00
Eric House
1c6e97e164 AS-generated changes adapting to the 2.0 release 2016-04-07 12:34:58 -07:00
Eric House
589535cdbc Make JNIThread responsible for opening/owning game and other objects 
whose lifespan matches its, e.g. the gameptr and gi. This is a big
change, and there are still some bugs/crashes, but it's worth
committing this snapshot.
 2016-04-07 12:23:13 -07:00
Eric House
160d69640a log refcount changes 2016-04-07 09:48:23 -07:00
Eric House
b2c4bd9e23 better chat text hint 2016-04-07 09:30:29 -07:00
Eric House
14bdde7ff0 save game whenever refcount is released. Works around BoardDelegate 
reloading the game every time it resumes. Better fix would be to have
JNIThread() own loading the game and only do so when first created.
 2016-04-07 09:27:00 -07:00
Eric House
d541c976bf add PENDING comment 2016-04-07 09:23:07 -07:00
Eric House
9f05d45e05 sometimes when return from background ChatDelegate is the first to try 
to reference JNIThread. Until I can make that work, just finish() --
to avoid crashes.
 2016-04-07 09:22:41 -07:00
Eric House
049c25f16d save when exiting to prevent data loss opening chat window. 2016-04-06 21:41:48 -07:00
Eric House
a55e17cd41 cleanup; log rowid in release() and retain() 2016-04-06 21:40:46 -07:00
Eric House
a90ec29ff0 fix delete game problem: delete first using lock we already have. 2016-04-06 18:42:37 -07:00
Eric House
3a368a8efd toward working better in background: log and print stack when doing 
nothing because jnithread is null. Pass incoming chat messages to
ChatDelegate if it's up, and otherwise launch it as before.
 2016-04-06 11:16:51 -07:00
Eric House
919e44f21e first cut at accepting input when running. Won't work when whole app is in background. 2016-04-06 11:08:27 -07:00
Eric House
347ff60434 toward working in background: log when called on null thread rather than crashing 2016-04-06 11:07:30 -07:00
Eric House
70c0db6504 chat: add hint string, and make textfield full width 2016-04-06 11:06:10 -07:00
Eric House
4bb16e88ef better logging 2016-04-06 11:03:18 -07:00
Eric House
7b045fb413 add constant to disable dualpane on debug builds too 2016-04-06 11:03:02 -07:00
Eric House
f6cbe2ec61 Toward launching fragment for result. Fires an assert on returning 
since that's not done yet.
 2016-04-05 09:37:17 -07:00
Eric House
b68775b620 oops -- fix compilation error 2016-04-05 09:17:03 -07:00
Eric House
b3f6e1b0a3 Make config work as a fragment, and clean up all the fragment 
subclasses: only one method needs to be overridden.
 2016-04-05 08:56:33 -07:00
Eric House
8cb2cecc18 add logging toward catching board layout problems; throw exception 
when can't unlock game (possible fix to multiple instances of
GamesListActivity stacking up); cleanup of GamesListDelegate tracking
of open games.
 2016-04-05 08:18:12 -07:00
Eric House
21ef6d4e13 tossing stuff at the wall trying to fix occasional failures to layout 
board in dual-pane mode (that show up as all-white BoardView). I think
there was a slight reduction in frequency, which varies with screen
size at least.
 2016-04-04 14:30:04 -07:00
Eric House
ae8a66f37b snapshot on the way to handling rotation of the board view. Pass 
orientation changes down to it (or any other interested delegate), and
have it lay its container out again. There appear to be race
conditions here: sometimes the toolbar winds up in the wrong
orientation, and on some devices the board can be blank. One problem
is that on a multi-paned device a single pane may be portrait (taller
than wide) though the whole device is in landscape mode. The big
challege is to get the view's max dimensions (and whether it's
landscape or portrait) when layout hasn't yet begun, because we that
for the jni part of layout. Messy still, but better than before and I
think progress in the right direction.
 2016-04-04 13:43:16 -07:00
Eric House
b6431f0373 when normal means don't succeed in generating summary, try again with 
via JNIThread's cache.
 2016-04-04 11:35:39 -07:00
Eric House
f47a11aa42 snapshot of changes adding refcounting to jnithread so and instance 
can be shared by multiple delegates, e.g. Board and Chat. Works but
with lots of crashes and stuff remaining to be done.
 2016-03-31 22:05:58 -07:00
Bernard Massot
1aba000f89 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)
 2016-03-31 00:44:28 +02:00
Bernard Massot
e8cf76be72 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)

this string should be split into a singular and a plural versions
 2016-03-28 21:46:12 +02:00
Bernard Massot
978f15d1c9 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)
 2016-03-28 21:45:59 +02:00
Bernard Massot
4ca62547fc Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)

this string should be split into a singular and a plural versions
 2016-03-28 21:00:24 +02:00
Bernard Massot
fb66c6ecbc Translated using Weblate (French) 
Currently translated at 97.2% (705 of 725 strings)
 2016-03-28 20:38:41 +02:00
Eric House
b6f992533a fix NPE. Method isn't called unless positive/confirming button has 
been pressed.
 2016-03-19 05:44:37 -07:00
Eric House
ab26e263ef cleanup: remove unnecessary file. 2016-03-14 22:01:55 -07:00
Eric House
0bc6387714 add support for behavior: when the left fragment opens a new fragment 
it replaces the right one rather than pushing the left off the
screen. Use that to make dictionary browser, chat, and studylist all
able to swap places while the open board is on the left.
 2016-03-14 21:48:07 -07:00
Eric House
f23a28cbce log onDestroy too 2016-03-14 21:46:28 -07:00
Eric House
0a843bd430 add chat fragment, which displays ok but can't send. Turn menus off/on 
as fragments are made visible.
 2016-03-13 19:53:59 -07:00
Eric House
c35020ef97 Merge branch 'android_branch' into android_dualpane2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2016-03-13 17:27:02 -07:00
Eric House
61ff6a6c33 Merge branch 'android_beta_106_branch' into android_branch 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
 2016-03-13 17:16:47 -07:00
Eric House
a8ebaaf789 better summary text 2016-03-13 14:42:50 -07:00
Eric House
1bcd977fa0 oops: fix crash by passing the right table name 2016-03-13 14:42:37 -07:00
Eric House
365695423c add a bunch of logging to code converting old-format chat. I've seen 
this code fail once, can't reproduce even on the same data, so I want
this in place (debug builds only) in case it happens again.
 2016-03-13 13:55:46 -07:00
Eric House
d25d33689a put a colon after chat sender's name in display 2016-03-13 12:50:09 -07:00
Eric House
b07a783fe1 revert to sdk 19 for gradle builds too (though they're just for 
debugging at this point)
 2016-03-13 12:42:31 -07:00
Eric House
0338bedf38 revert change adding new notification icon. It's not required when 
building for SDK 19, and I don't want to release it without testing on
more OS versions.
 2016-03-12 17:40:20 -08:00
Eric House
a157c9bb43 up strings and changelog for release 2016-03-12 17:39:18 -08:00
Eric House
d208e4ef51 ignore more AS metadata 2016-03-12 17:38:25 -08:00
Eric House
78f0ac7783 delete a game's entries in chats table when it's deleted 2016-03-12 17:23:25 -08:00
Eric House
9e9d9a740c add and use fragment for dict browser. Works except for the relaunch 
logic around changing the parameters (e.g. word length filters.)
 2016-03-12 16:46:44 -08:00
Eric House
117752d965 move static stuff from activity to delegate 2016-03-12 15:47:34 -08:00
Eric House
a111cf8953 move static stuff from activity to delegate 2016-03-12 15:46:59 -08:00
Eric House
8981765897 fix finish() so it pops stack in fragment case 2016-03-12 15:32:53 -08:00
Eric House
31d01e4ef0 remove dead file 2016-03-12 15:32:32 -08:00
Eric House
5928c8a9e6 handle dialogs correctly in Fragment activity, at least to the extent 
of fixing the new game name one.
 2016-03-12 15:17:19 -08:00
Eric House
e72443b850 go straight to single-pane implementation for non-debug builds. If this works 
might be able to fold this branch into what I'm releasing from.
 2016-03-12 15:14:06 -08:00
Eric House
04144213d5 fix so at least games list and board work. Required finishing the list view implementation. 2016-03-12 14:29:16 -08:00
Eric House
aa4f4e0e99 launch the Main activity after installing 2016-03-12 14:28:40 -08:00
Eric House
9837fc61bf fix gradle build: compile support library 2016-03-12 14:23:38 -08:00
Eric House
29992a5d8b changes the initial post-merge commit didn't pick up. Still no idea if it runs. 2016-03-11 22:21:07 -08:00
Eric House
b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/values/styles.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/BTInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java
	xwords4/android/scripts/adb-install.sh
	xwords4/android/scripts/find-and-ant.sh
 2016-03-11 22:19:37 -08:00
Eric House
08da6e5472 use logdf instead 2016-03-11 18:23:59 -08:00
Eric House
e0cf48779d delete a game's entries in chats table when it's deleted 2016-03-11 18:21:25 -08:00
Eric House
054cf5bf52 drop mysterious exception that seems to happen only on one emulator 
and that can be safely dropped then.
 2016-03-11 18:20:53 -08:00
Eric House
7f4729ad73 send messages from within chat delegate, without closing it. Requires 
leaving the board delegate's game and jnithread open and adding a
static to JNIThread to chat can get the current instance to use for
sending, all a bit of a hack that depends on onDestroy getting called
in a timely manner. TODO: display chats that arrive while the
receiving game's window is open.
 2016-03-10 07:38:55 -08:00
Eric House
5d9de30170 merge remote changes 2016-03-08 07:27:30 -08:00
Eric House
a03dd9423d move dbg build back to target-19 too 2016-03-08 07:20:52 -08:00
Eric House
78fb130e4f stack-overflow config wierdness to fix long chat lines not 
wrapping. Needs testing on multiple OS versions.
 2016-03-08 07:20:40 -08:00
Eric House
5dc7b66e89 use different background color for local player's chat lines 2016-03-08 07:20:02 -08:00
Eric House
cd93bdb03e move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
Eric House
0b7dca2222 store and present chat sender's name instead of the lame "Me"/"Not me" 
thing. Requires a new table, and includes code to convert from old
format. Still need to clean up the presentation (TableRow).
 2016-03-06 07:03:54 -08:00
Eric House
2ca0fe5ca4 add board_getSelPlayer() 2016-03-06 06:34:49 -08:00
Eric House
d67d9a704c script to make it easier to launch logcat with multiple devices connected 2016-03-06 06:34:25 -08:00
Eric House
f5bc9ca434 toward using chat senders' names in history: add chats table so we can 
keep track of sender as a separate column rather than a prepended
string. I'm committing this separately for easier debugging of the
code that uses it and that converts from the old format.
 2016-03-05 21:30:21 -08:00
Eric House
ff12cc6f91 tweak scripts to have better default behavior 2016-03-05 12:16:23 -08:00
Eric House
d536d05e24 remove unnecessary override (identical to parent's implemenation) 2016-03-04 19:49:59 -08:00
Eric House
4402b81bdf fix crash (assertion failure) finding words associated with a cell 
when there's a trade above it on the move stack.
 2016-03-04 19:29:42 -08:00
Eric House
9fb5f49595 when a game's opened from an Android db, there's no row data to delete 2016-03-04 19:28:38 -08:00
Eric House
4f3d620cd6 in search of why some game summaries never load: show a different 
state string when the load has timed out.
 2016-03-04 08:34:47 -08:00
Eric House
885b375a55 add a notification icon that looks better on lollipop. But: still needs polish. 2016-03-04 08:29:31 -08:00
Eric House
0f6615b25b formatting 2016-03-04 08:16:42 -08:00
Eric House
36bce5332d undo changes forcing there to be a single checked item, since that 
made it impossible to do bulk deletes.
 2016-02-29 07:38:08 -08:00
Eric House
eb4613c842 deal with case where invitation via relay requires a wordlist that 
must be downloaded. (Does not solve the problem that if the download
fails the invitation must be resent.)
 2016-02-26 07:13:12 -08:00
Eric House
830d66e538 ignore AS metadata 2016-02-25 21:37:15 -08:00
Eric House
03dc1206a5 remove Android Studio metadata. 2016-02-25 21:34:00 -08:00
Eric House
b8c98487d7 use sdk 22 for gradle builds too; rename apk file based on git revision number 2016-02-25 21:20:17 -08:00
Eric House
ca41a2390c usage should exit with an error 2016-02-24 22:16:56 -08:00
Eric House
6fe302eab1 first cut at fix to hundreds of games leading to attention-grabbing 
battery usage: rather than have every single ExpiringDelegate set its
own timer, run a single time they can attach themselves to.
 2016-02-24 22:16:40 -08:00
Eric House
dd0a677d97 upgrade to latest crittercism (java code only) 2016-02-24 07:23:50 -08:00
Eric House
8c3f1ee100 up sdk version to 22 in order to drop timestamp from marshmallow logs 
(since they provide it natively)
 2016-02-24 07:12:10 -08:00
Eric House
3a94f38820 use android-19 instead of -14, which seems to be no longer supported 2016-02-21 13:36:57 -08:00
Eric House
841715a78b pass constant 2016-02-21 08:01:27 -08:00
Eric House
19d1a6059e new script for working with gradle builds. Probably totally broken: 
I'm committing it now because I'm tired of it being in the way during
branch changes.
 2016-02-19 07:12:00 -08:00
Eric House
bf3c0021a6 up version and changelog for new release 2016-02-19 07:10:28 -08:00
Eric House
50107949f2 merge local heads 2016-02-18 07:47:46 -08:00
Eric House
86883eb51a handle tap on scoreboard by showing last move summary (as happens for 
long-tap) when option to switch users is disabled.
 2016-02-18 07:46:36 -08:00
Eric House
53f44af199 fix assertion failure by handling missing case 2016-02-18 07:45:41 -08:00
Eric House
33916761fb include various options, e.g. whether hints are allowed, in data used 
to clone a game prior to a rematch so they're not lost. Thanks A.B.!
 2016-02-18 06:48:48 -08:00
Eric House
ee0caad464 make String private 2016-02-18 06:39:40 -08:00
Eric House
05e82d4ee7 find apks from android root; print cmd in way it can be run from shell 2016-02-18 06:39:06 -08:00
Eric House
c09088658e rewrite to search for variants and attached devices when none 
specified, and more. Requires modern bash now rather than /bin/sh.
 2016-02-17 07:34:10 -08:00
Eric House
4157169d91 add dict.xwd so I don't have to keep creating it 2016-02-16 20:48:28 -08:00
Eric House
ac9ab226a4 Merge remote-tracking branch 'weblate/android_translate' into android_branch 2016-02-09 07:15:57 -08:00
Eric House
5084e70843 fix bug: if you're iterating through hints and you drag a tile to the 
left of tray divider (without moving divider) it may still be included
in hinted moves. Fix is to reset engine whenever the set of tiles left
of divider changes.
 2016-02-05 07:29:51 -08:00
Eric House
ff49ce61a5 ignore new language files 2016-02-05 07:13:55 -08:00
naofum
ccdf1d6bf9 Translated using Weblate (Japanese) 
Currently translated at 100.0% (725 of 725 strings)
 2016-02-05 12:57:57 +01:00
Eric House
bec115568e remove FIXED -- was a one-time thing 2016-02-04 20:45:17 -08:00
Eric House
856bb89749 drop french, since there are better dictionaries; don't say FIXED for 
languages that didn't have the thing before
 2016-02-03 20:53:58 -08:00
Eric House
0684139183 add ability to build a second variant. Works, but they can't both be 
installed because of duplicate permissions.
 2016-02-03 20:44:40 -08:00
Eric House
2cb989022c up name and version code for new release 2016-02-03 20:40:46 -08:00
Eric House
ee5c0707f0 generated files 2016-02-03 20:40:12 -08:00
Eric House
37bf8179aa add to list of languages thefreedictionary.com supports (and put tmp 
FIXED! in its name for people who got used to it being broken)
 2016-02-03 20:39:48 -08:00
Eric House
c4eaf912d6 better string 2016-02-03 20:39:07 -08:00
Eric House
f49925bcb4 fix thefreedictionary lookups, at least for English 2016-02-03 06:16:31 -08:00
Eric House
874b479a69 avoid NPE by dropping message after test 2016-02-02 20:54:35 -08:00
Eric House
5ccb9bf7a3 notes and version code changes for release 2016-02-02 19:41:16 -08:00
Eric House
6e30d77ada pull int (ptr) out of GamePtr inside jni code where it can be done 
once instead of at every call site. There's probably a performance
penalty to making bunch of extra calls back into java, but the code's
much cleaner. Will pay attention to performance changes.
 2016-02-02 07:50:02 -08:00
Eric House
5ddb4da466 when resending messages, be willing to do it more frequently, and 
don't count toward quota unless a send actually happens.
 2016-02-02 07:32:41 -08:00
Eric House
d3e521ca6e cleanup 2016-02-02 07:04:29 -08:00
Eric House
19713a40ad add param to comms_resendAll to limit type of message sent 
(e.g. BT). Meant to be used when a single type has become available.
 2016-02-02 07:01:48 -08:00
Eric House
9c6908d14a ignore 2016-02-01 06:55:11 -08:00
Eric House
75939d9203 remove bogus flag (incompatible with my key). And confirm that can be 
installed on top of a build signed with SHA256, the new default.
 2016-02-01 06:27:29 -08:00
Eric House
36551a310a add jarsigner params that are supposed to fix for installing on older devices 2016-02-01 06:17:36 -08:00
Eric House
45224a75fa add (disabled) code for case where game ptr wrapper is passed instead 
of the ptr itself.
 2016-01-31 20:06:45 -08:00
Eric House
9455c0ef26 wrap jni ptr so can detect leaks (failure to call 
game_dispose()). There was one that had been undetected for years. The
int is still passed into the jni, and each call site has to pull it
from the wrapper. Better would be to pass the wrapper, but I'm worried
about the performance hit of making a call back into the java world
from every jni entrypoint. Will test....
 2016-01-31 19:51:51 -08:00
Eric House
8327fa71a1 Merge branch 'android_branch' into android_translate 
# 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.
 2016-01-29 06:03:58 -08:00
Eric House
86068cfdfe oops -- forget to let these get generated 2016-01-29 06:01:53 -08:00
Eric House
7b452e37e4 Merge branch 'android_translate' of git://git.weblate.org/xwords into android_translate 
# Conflicts:
#	xwords4/android/XWords4/res_src/values-fr/strings.xml
 2016-01-29 06:00:56 -08:00
jean-christophe
93e3468501 Translated using Weblate (French) 
Currently translated at 99.1% (704 of 710 strings)
 2016-01-29 00:32:38 +01:00
naofum
20c99c61b6 Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-28 12:44:42 +01:00
Eric House
794bce1ceb cleanup from review of diff since last release. All whitespace or 
removing logging except for one check for null.
 2016-01-27 07:31:10 -08:00
Eric House
813d5c18b3 show explanatory text when there are no invitations 2016-01-25 07:29:26 -08:00
Eric House
3c92b8837a add changelog mention of weblate additions 2016-01-24 10:32:07 -08:00
Eric House
f07dd2a344 remove unused string 2016-01-23 22:09:40 -08:00
Eric House
e6fa514982 Merge branch 'android_branch' into android_translate 2016-01-23 22:03:40 -08:00
Eric House
5ef7495d51 The Japanese translation has a number of plurals with "one" quantities 
but no "other", which crashes. "Fix" these by making the copy script
turn one into other, which may well make sense given Japanese
grammer. At any rate it prevents crashes until I can work it out with
the translator and/or weblate.
 2016-01-23 21:59:31 -08:00
Eric House
b9b9038c66 remove empty strings 2016-01-23 21:55:07 -08:00
Eric House
c0e8f9cb65 look for plurals too 2016-01-23 21:06:37 -08:00
Eric House
805f160556 don't break r.{string,plurals}.id across lines: my script's too dumb 
to recognize them then
 2016-01-23 21:04:20 -08:00
Eric House
ca09c48d95 deal with case where target of symlink is gone 2016-01-23 20:55:32 -08:00
Eric House
3500d8c8b9 bring in latest French changes 2016-01-22 07:26:26 -08:00
Eric House
b289154e19 up app version strings, changes list for new release 2016-01-21 20:56:45 -08:00
Eric House
dcedbefd63 fix rematch info getting overwritten the first time a game is 
opened. Some GameSummary fields are unknown to jni code and so
shouldn't be saved if they happen to be empty (as they will be when
the GameSummary is created by jni and never merged with what was read
from the DB when the game was loaded.
 2016-01-21 07:14:57 -08:00
Eric House
7325377bcb remove comment 2016-01-21 07:13:46 -08:00
Eric House
16b558a566 fix BT and SMS game creation in response to invitations by passing a 
UtilCtxt they can use to get the devices ID, allowing relay messages
to reach the games when they're not open. Move into superclass while
at it.
 2016-01-21 06:27:51 -08:00
Eric House
3bff4c070a fix compiler warning 2016-01-21 06:25:19 -08:00
Eric House
7d62614ced Recent AS metadata changes. I'm waiting for the changes to stop.... 2016-01-20 07:58:41 -08:00
Eric House
eb08e8e78d give user a chance to turn on play-via-SMS when sending an SMS 
invitation (which will otherwise fail silently). Required a hack
passing params from one dialog to another, but I like that better
(today) than creating new single-purpose iVars in BoardDelegate.
 2016-01-20 07:58:01 -08:00
Eric House
f65d42732b offer invites-info menu on release builds too if debug features 
enabled.
 2016-01-19 07:17:29 -08:00
Eric House
7ba7879a55 cleanup: track only checked items, not all items. 2016-01-19 06:53:43 -08:00
Eric House
eee13bcdd6 fix assertion failure by dropping packet for which I can't get an 
address. It was in a three-player game with two on the server device.
 2016-01-19 06:41:44 -08:00
Bernard Massot
fe235b2348 Translated using Weblate (French) 
Currently translated at 98.8% (702 of 710 strings)
 2016-01-18 21:44:26 +01:00
Eric House
177a591a23 During SMS and BT invitation, when a single target is sought uncheck 
the old selection when a new one is made.
 2016-01-18 08:36:25 -08:00
Eric House
38898776bd when re-inviting, pre-populate BT and SMS invite dialogs from the most 
recent invitation of that "means" recorded for that game
 2016-01-18 07:41:47 -08:00
Eric House
6c1394a3a5 separate explanatory dialogs for games sending invites based on 
whether they were created for a rematch. If for a rematch, don't give
user ability to change invite target; just resend (if asked) and show
a toast. Also, send rematch invites only when there aren't already
some, i.e. the first time the game's opened.
 2016-01-16 13:52:30 -08:00
Eric House
3ca47cdd82 add debug-only context menu giving conn-via config and invites for GamesList games. 2016-01-16 12:08:36 -08:00
Eric House
84fe06e029 in invite, record bt device name rather than (unreadable) addr 2016-01-15 20:52:39 -08:00
Eric House
e8ceb82d8d add debug-only menu to show game's sent invitations 2016-01-15 20:48:53 -08:00
Eric House
9d20aea6be record NFC invites 2016-01-15 06:01:35 -08:00
Eric House
fe0504a308 put a different title on notifications when it's now a player's 
turn. Probably only matters in three-device games, but I like it.
 2016-01-14 20:45:58 -08:00
Eric House
1e50181b12 fix handling of SMS invitations specifying a dictionary that's missing 2016-01-14 07:55:49 -08:00
Eric House
90f7438290 allow deleting dict that doesn't exist (don't assert) 2016-01-14 07:37:47 -08:00
Eric House
bdafcfa916 improve text around invitations 2016-01-13 19:51:24 -08:00
Eric House
e98ba8d84a make explicitly public 2016-01-13 08:00:28 -08:00
Eric House
42574550d0 move method next to others with same name 2016-01-13 07:59:46 -08:00
Eric House
26d0aedb8f Comment out apk-renaming stuff. It's confusing AS. 2016-01-13 07:58:59 -08:00
Eric House
dffaf2335e get rid of Dialog theme for invite activities for Dbg version too 2016-01-13 06:48:13 -08:00
naofum
7ee18b8995 Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-12 18:44:48 +01:00
Eric House
a1f590642a don't write DB column that's never read, nor pass the value that was 
being written.
 2016-01-12 00:09:34 -08:00
Eric House
bb2ebe8128 code cleanup 2016-01-11 23:56:56 -08:00
Eric House
e94ec48613 don't encourage invited games to invite others; instead remind that 
they've been invited and can only wait for the game to begin. (Unless
more than two devices are involved this should only happen briefly and
when connections aren't working perfectly.)
 2016-01-11 23:53:16 -08:00
Eric House
e1f6bc3c8e stop posting toast about net status fix working 2016-01-11 07:23:25 -08:00
Eric House
c13b637b46 record invites sent as part of rematch 2016-01-09 13:02:56 -08:00
Eric House
b6bebbb0c4 offer re-invite; track and display more than one invitation, 
including those whose success isn't known (email and clipboard).
 2016-01-09 10:14:43 -08:00
Eric House
73a7a8836f show in game list item if invitations pending 2016-01-09 06:58:18 -08:00
Eric House
e60945733f first step in showing a different alert for an unconnected game where 
an invitation's already been sent. It's stored in a new DB table, and
user can display info about how and to what device it was sent.
 2016-01-08 19:05:22 -08:00
Eric House
7e714ae547 fix crash posing Toast from non-looper Activities 2016-01-08 18:58:46 -08:00
naofum
ec6a197b2c Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-08 16:26:24 +01:00
Weblate
38fef0a4ed Merge remote-tracking branch 'origin/android_translate' into android_translate 2016-01-07 19:17:25 +01:00
Eric House
f5947d25d9 Make invite dialogs full-screen. They're cramped otherwise. 2016-01-07 08:07:26 -08:00
Eric House
df3a213efc remove padding 2016-01-07 08:07:17 -08:00
Eric House
6c4a736cc6 generated files that couldn't be merged 2016-01-07 07:39:46 -08:00
Eric House
0fe5cce97a remove duplicate string 2016-01-07 07:39:31 -08:00
Eric House
5c14ad3f22 Merge remote-tracking branch 'origin/android_branch' into android_translate 2016-01-07 07:30:15 -08:00
Eric House
44ec13ea25 more AS metadata changes (and a comment) 2016-01-07 07:21:03 -08:00
Eric House
6d39780030 generated when I told AS to stop offering to remove braces from one-line IF statements 2016-01-07 07:20:13 -08:00
Eric House
bbad4a316a better fix for memory leak (because local to where the leak is): keep 
a weak reference to the owning object in the runnable added to the
main Handler so that it can be gc'd if otherwise unreachable.
 2016-01-06 19:33:30 -08:00
Eric House
14aab9ec36 Revert "fix massive memory leak by removing ExpiringDelegate's timers when" 
This reverts commit 50ca74d259.
 2016-01-06 19:29:37 -08:00
Eric House
50ca74d259 fix massive memory leak by removing ExpiringDelegate's timers when 
owning view is removed from parent window.
 2016-01-06 07:03:03 -08:00
Eric House
b472d78ba0 remove unused variable 2016-01-06 06:52:32 -08:00
Eric House
79f2bd148f reminder of way I'll probably want to do variants in the future 2016-01-06 06:48:01 -08:00
Eric House
eda1e89e3e replace empty-list-explanation functionality that went away when I 
stopped inheriting from ListActivity.
 2016-01-04 20:40:47 -08:00
Eric House
c62c9899eb Hack: use sed to strip utf-8 marker from start of file. 2016-01-04 20:38:49 -08:00
Eric House
9311a2daa0 fix gradle build for changes to script 2016-01-04 08:07:20 -08:00
Eric House
52b53b9a9d try not using executeOnExecutor on the theory that occasional OOM 
errors are happening because too many threads are trying to create
thumbnails at once.
 2016-01-04 07:23:48 -08:00
Eric House
a1e381e722 up version code to match main variant 2016-01-04 07:22:59 -08:00
Eric House
2286f55e8f only second-guess network available tracking every 20 seconds. And 
show toast about it only on DEBUG builds.
 2016-01-03 21:02:24 -08:00
Eric House
efd47d731a send the correctly calculated hash value, and up strings for another 
release.  This is the minimum required for a new release on top of the
previous one, but not enough if released on this branch!
 2016-01-03 20:23:46 -08:00
Eric House
07dd7f2eed use a different name for each variant's db when written to SD card so 
they don't overwrite each other's.
 2016-01-03 20:19:46 -08:00
Eric House
b8c597ab98 oops -- fix prematurely committed script. 2016-01-03 19:53:16 -08:00
Eric House
ba712046a2 add git version to file in assets/ so can tell .apk's version in 
filesystem (before it's installed).
 2016-01-03 19:27:33 -08:00
Eric House
22dde029c8 Merge tag 'android_beta_100' into android_branch 
ready for release
 2016-01-03 11:36:37 -08:00
Eric House
a51b01491d up strings for new version, and copyright for new year 2016-01-02 09:21:59 -08:00
Eric House
929141f36d fix compiler warning 2016-01-01 21:13:35 -08:00
Eric House
8dfddea508 up initial client vers id sent to relay 2016-01-01 21:09:10 -08:00
Eric House
ccb86f0358 0 len is ok 2016-01-01 21:05:28 -08:00
Eric House
6a0bcaee26 add missing parameter 2016-01-01 19:48:22 -08:00
Eric House
8c26cf726a file for new French wordlist (not publicly available yet) 2016-01-01 19:32:32 -08:00
Eric House
a4a135b953 up CV version for testing 2016-01-01 19:30:35 -08:00
Eric House
ebcae1a523 move hashing into memstream impl, and reintroduce the old/broken 
treatment of the final 8 bits. I'll need to release a version that
still produces the incorrect hash for compatibility with existing
clients that expect it, but that also looks for the correct hash. When
that's out there I can do a new release that sends the correct hash.
 2016-01-01 17:57:14 -08:00
Eric House
4813c95976 cleanup: rename function and remove unused param 2015-12-31 15:47:48 -08:00
Eric House
02d5d26c60 when a move comes in whose hash doesn't match the top of the move 
stack, go down the stack looking for a match. If it's found, pop down
to that point then apply the move. This fixes stalls in the test
engine when undo is enabled, and so I assume that undos and turns are
somehow coming in out-of-order. Should be rare that this happens.
 2015-12-31 06:04:55 -08:00
Eric House
dd242c3ff5 make undo ratio operate on 1/1000 scale -- and even with this it's 
overwhelming when more than 40 clients are running.
 2015-12-30 21:23:29 -08:00
Eric House
9ddee9790d Merge tag 'android_beta_99' into android_branch 
ready for fix-marshmallow-bt release
 2015-12-30 06:41:39 -08:00
Eric House
c9264eecac add debug-only code to assert that the hash on the move stack remains 
unchanged across a push and pop. Was used to verify memstream.c change
just committed.
 2015-12-30 06:31:02 -08:00
Eric House
0a91f852cc add commented-out flag 2015-12-30 05:59:52 -08:00
Eric House
a2ca381890 remove assert when hashes don't match. As currently implemented, this 
can happen when somebody does an undo, since the ordering of undos and
moves is not assured. The result is a temporary (I think) stall, where
a move is rejected because the hash doesn't match, but that will be
accepted later when the undo's been processed and the hash will now
match.
 2015-12-30 05:59:06 -08:00
Eric House
89138edae1 when dumping stream, preserve the subset of bits in the last word 
that's real data. This fixes assertions that after popping a move off
the move stack the hash is the same as before it was pushed. It may or
may not be sufficient to fix reported stalls, but it's certainly
necessary.
 2015-12-30 05:56:01 -08:00
Eric House
6ce1fbe465 add red Dbg to the middle of variant's icon 2015-12-30 05:53:37 -08:00
Eric House
4ed843a529 start UDP at 100% by default since all clients will be that way now 2015-12-29 19:01:15 -08:00
Eric House
c96861b329 wrap hash-related logging in ifdefs so can be easily turned on 2015-12-29 19:00:30 -08:00
Eric House
e3d6cb74fc for some reason log files are now considered binary by grep, so -a option's needed 2015-12-29 18:59:52 -08:00
Eric House
5e3f7d0731 remove logging 2015-12-29 18:58:28 -08:00
Eric House
2f5ae51d3f experimental change toward fixing networking stalls: when the cache 
thinks the network isn't up, check anyway. Probably needs to be done
on a backoff timer so we aren't checking every few milliseconds....
 2015-12-29 07:14:27 -08:00
Eric House
299b8ddc70 assert when hashes don't match. This may be legit, but I need to 
understand when it can happen because I think it's the cause of games
failing to communicate in the field
 2015-12-29 07:11:05 -08:00
Eric House
78d435c8cc fix what are errors with new compiler 2015-12-29 07:09:50 -08:00
Eric House
ec9f233fdd fix assertion, and up version code since I already uploaded a beta to 
google
 2015-12-27 20:48:41 -08:00
Eric House
b4d919b3a1 remove logging 2015-12-22 11:46:19 -08:00
Eric House
285dedb75f fix NPE -- by inspection after a logged crash: can't reproduce 2015-12-21 22:31:27 -08:00
Eric House
49caf6505a up strings and changelog for new release 2015-12-21 18:50:04 -08:00
Eric House
7878fd8fcc fix test to hide menu when it'll otherwise cause an array 
out-of-bounds exception. Thanks Aidan.
 2015-12-21 18:23:41 -08:00
Eric House
3635abb17d changes in players matter for local games too 2015-12-21 18:22:04 -08:00
Eric House
ea4e437e94 fix, by inspection, NPE reported through the Play Store. 2015-12-21 18:21:59 -08:00
Eric House
c48580b4ba generated changes 2015-12-21 18:04:35 -08:00
Eric House
3da798f437 required by prev commit: follow api change to work around marshmallow 
address change.
 2015-12-21 18:00:41 -08:00
Eric House
f78cd0f656 fix another source of bad/marshmallow addresses, and add asserts to 
catch any others.
 2015-12-21 18:00:25 -08:00
Eric House
162ab11f12 fix, at least for most cases, Marshmallow change that doesn't let an 
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
 2015-12-21 18:00:06 -08:00
Eric House
7cb1714568 fix compile -- new compiler, probably 2015-12-21 17:46:50 -08:00
Eric House
8e4867eccd add some logging about network state 2015-12-21 17:04:40 -08:00
Eric House
6677a3e402 launch networked rematch games on creation, not just local ones 2015-12-21 16:42:54 -08:00
Eric House
f7df11b923 required by prev commit: follow api change to work around marshmallow 
address change.
 2015-12-21 16:27:11 -08:00
Eric House
7805900c07 fix another source of bad/marshmallow addresses, and add asserts to 
catch any others.
 2015-12-21 16:26:30 -08:00
Eric House
79e1473bf6 fix, at least for most cases, Marshmallow change that doesn't let an 
app know the BT/Mac addr of its own interface. The new bogus addr is
transmitted in common/ structs, and so sending code need to look up by
name when told to use that address.
 2015-12-21 15:56:52 -08:00
Eric House
536d220ba7 remove some logging 2015-12-21 15:42:57 -08:00
Eric House
57ba6ab693 remove org.apache.http (as SDK 23 prefers) 2015-12-13 12:17:33 -08:00
Eric House
87c6b3e0fe use an enum for startActivityForResult requestCode to ensure they're 
unique across the app.
 2015-12-09 06:10:09 -08:00
Eric House
2a3bd60740 supply missing param 2015-12-08 07:15:26 -08:00
Eric House
db9c079356 fix to show files appearing in only one apk 2015-12-05 11:13:13 -08:00
Eric House
4e14477faf script to compare .apk files, meant to aid in confirming that gradle 
and ant are producing the same thing.
 2015-12-04 21:51:10 -08:00
Eric House
9d42d76ae0 collapse a couple of list-specific classes into their superclasses. 2015-11-24 08:15:27 -08:00
Eric House
87edd09ab6 Cleanup: get rid of ListActivity. Eventually all Activities need to 
inherit from FragmentActivity since there's no List-aware equivalent,
so XWListActivity now extends XWActivity and nearly all its methods go
away. getListView() and friends are all I needed to implement --
apparently.
 2015-11-24 08:01:16 -08:00
Eric House
e3e4ebd7de changes AS made 2015-11-23 07:51:54 -08:00
Eric House
97f24973e4 Rather than ask player for name on app install, ask every time he 
creates a new game (but with a don't-ask-again check to avoid
annoying.) Make changes to DlgDelegate to support.
 2015-11-23 07:51:31 -08:00
Eric House
0b0bd02e79 remove logging 2015-11-20 23:15:24 -08:00
Eric House
d468866a01 no more variables called socket; all are "sock" now. 2015-11-20 23:15:04 -08:00
Eric House
b7b664bee6 rename .apks to match the ant ones, including git revision info 2015-11-18 21:28:56 -08:00
Eric House
dc5b979e8a including .apk signing, and turn on proguard, for release gradle builds 2015-11-18 06:27:11 -08:00
Eric House
e0cb84a332 AS changes -- should I be tracking these files? 2015-11-17 07:37:21 -08:00
Eric House
8626fdf027 refactor: move inline tests for being on emulator into a static method 2015-11-17 07:19:37 -08:00
Eric House
a2e00794fa some stuff AS changed. I hope it stops doing this eventually 2015-11-12 07:30:09 -08:00
Eric House
6d948a33dd name debug .apk using my convention, to include git rev 2015-11-12 07:29:49 -08:00
Eric House
58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/build.gradle
	xwords4/android/scripts/common_targets.xml
 2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de fix to work with modified script 2015-11-11 22:23:39 -08:00
Eric House
2f4fe1de72 some AS changes when run the first time. Source-level debugging of 
java works!
 2015-11-11 19:04:58 -08:00
Eric House
adbc3615c1 changes to run under gradle 2015-11-11 18:59:00 -08:00
Eric House
ca83f2ab8b add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
Mario Frasca
0d688ab80e Translated using Weblate (Slovak) 
Currently translated at 69.0% (476 of 689 strings)
 2015-11-09 21:45:04 +01:00
Eric House
46cb5404d0 fix so debug and release builds have the right setting passed to 
ndk-build and keep their .o and .so files separate.
 2015-11-06 21:10:45 -08:00
Eric House
9f28e5c350 more gradle improvements. Seems to build a usable .apk, but isn't 
doing release/debug right yet.
 2015-11-05 20:19:07 -08:00
Eric House
7aff11d7b0 files necessary for a gradle build (untested; need to commit and clone 
elsewhere to be sure). I'm not moving things to the conventional
gradle locations yet -- want to keep the ant build working too for
now.
 2015-11-04 06:28:57 -08:00
naofum
6a5462194e Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-11-04 09:44:43 +01:00
naofum
153f6a75c3 Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-10-31 07:47:53 +01:00
Eric House
5d82636c26 allow using env variables in ant files 2015-10-30 05:42:27 -07:00
Eric House
6f1235492d disable local-game reminders by default 2015-10-29 07:31:21 -07:00
Eric House
2f579832b4 trivial refactor 2015-10-29 07:02:18 -07:00
Eric House
77315b50ba changes in players matter for local games too 2015-10-29 07:01:01 -07:00
Eric House
67fb55ccf2 Clear thumbnail when saving changes. Not sure this is the best place 
to do it, but it fixes the problem I'm after.
 2015-10-29 07:00:22 -07:00
Eric House
c581bb93ad change default to checked so code doesn't have to set it 2015-10-29 06:32:18 -07:00
Eric House
83baa5a00c don't allow removing players when game is locked 2015-10-29 06:31:32 -07:00
Eric House
3b6a0cda74 Don't keep game locked the whole time config activity is open: lock to 
load, then again if needed to save.
 2015-10-27 19:18:10 -07:00
Eric House
a2a073067c fix assertion due to lock conflict between game config and context 
menu updating by having updating not insist on getting the lock.
 2015-10-27 07:32:18 -07:00
Eric House
59d01dc6a2 cleanup debug stack printing 2015-10-27 07:26:06 -07:00
Eric House
564b682e64 fix to correctly show stack of lock owner (in debug mode) 2015-10-27 07:25:42 -07:00
Eric House
4e7b2dc727 implement rematch menu: create a new game that will invite when opened 2015-10-27 06:22:52 -07:00
Luiz Wagner Tavares Nascimento
5737277444 Translated using Weblate (Portuguese) 
Currently translated at 61.6% (425 of 689 strings)
 2015-10-26 03:44:54 +01:00
Eric House
ddc9c5f920 beginning of rematch menu: enabled correctly, but not yet handled 2015-10-23 05:41:20 -07:00
Eric House
5886394fd7 move menus 2015-10-23 05:26:14 -07:00
Eric House
082b0e06ac tweak <one> elements to not substitute in the digit 2015-10-22 06:31:58 -07:00
Eric House
2c558ab905 Turn off relay invite. I want to get a release out before I'm like to 
resolve all issues.
 2015-10-22 06:30:19 -07:00
Eric House
058be41265 change file name 2015-10-22 06:18:47 -07:00
naofum
aac42ef39a Translated using Weblate (Japanese) 
Currently translated at 32.3% (223 of 689 strings)
 2015-10-22 12:44:42 +02:00
Eric House
f29d302f06 implement context menus for group items too, and add select/deselect 
items for both -- for groups because there's no other way to select
now. Still not sure how to educate users about the change or to
provide a choice (if it's worth doing).
 2015-10-21 06:31:09 -07:00
Eric House
6aa994e2c6 first cut at putting back context menus. For games only (not groups), 
and done by duplicating the .xml file. TODO: support groups, unify
menu .xml files, and have a user preference controlling whether
context menus are available or at least a newbie info explaining the
change.
 2015-10-20 06:21:43 -07:00
Michal Čihař
0e2f465173 Translated using Weblate (Czech) 
Currently translated at 19.4% (134 of 689 strings)
 2015-10-19 09:44:12 +02:00
Eric House
a02ca24ab4 remove buttons I'm not using, and put the final action button at the bottom 2015-10-15 06:46:53 -07:00
Eric House
1da2dd5330 snapshot of effort to add listing of previous opponent devices to be 
invited. So far it creates the list of devices ok, and inviting from
it works, but they're not yet named, and the list isn't persisted.
 2015-10-15 06:44:10 -07:00
Eric House
27312f7853 add comment 2015-10-15 06:32:47 -07:00