Commit graph

119 commits

Author SHA1 Message Date
Jan Christian Grünhage a0fda16193
Updated libraries and replaced mp3agic jar with gradle dependency. 2017-03-11 11:11:26 +01:00
Jan Christian Grünhage 67d6fd5ffb Merge pull request #10 from jcgruenhage/AndroidStudio23
Just tested this, works.
2017-03-08 11:06:02 +01:00
Mark Gillespie 59e90a7ab6 Gradle 2.3.0 2017-03-06 19:26:45 +00:00
Jan Christian Grünhage c33c463327 Added Matrix/IRC Chatroom 2017-02-27 22:43:33 +01:00
Jan Christian Grünhage c8dd62f9c2
Version Bump 2017-02-01 13:46:15 +01:00
Jan Christian Grünhage 1af76ee43d
Merge branch 'release/v0.9.4' 2017-02-01 13:32:01 +01:00
Jan Christian Grünhage dc1c2018eb
Add .idea/misc.xml to .gitignore 2017-01-30 21:01:02 +01:00
Jan Christian Grünhage 353e9cdef7
This does not need to be under version control 2017-01-30 20:57:06 +01:00
Jan Christian Grünhage c52f99fbf0
Fixed AutoExports running even when they were disabled. 2017-01-30 20:45:13 +01:00
Jan Christian Grünhage 6dcfb36482
Updated Lib versions, Readded gradle-wrapper.properties, this should be under version control. 2017-01-30 20:41:06 +01:00
Mark Gillespie 9b4c54557b updated gitignore 2017-01-28 08:46:08 +00:00
Mark Gillespie 381fd5c910 Move the powermanager before the intent. Removed wrapper properties from source control. This is dynamically generated. 2017-01-27 18:21:34 +00:00
Mark Gillespie 259a989505 Merge branch 'develop' into overwrite_preference 2017-01-26 18:34:53 +00:00
Mark Gillespie a8c51db21b Null check in here to prevent a random crash. 2017-01-26 18:33:51 +00:00
Jan Christian Grünhage c1b2473097
Changed gradle version, test for circleci 2017-01-24 19:36:20 +01:00
Mark Gillespie 180fdb0e59 Merge branch 'develop' into overwrite_preference 2017-01-24 08:38:12 +00:00
Jan Christian Grünhage ef06717ae4
Updated to gradle 3.3 and plugin 2.3 beta 2 2017-01-23 19:06:35 +01:00
Mark Gillespie bbda51b845 Had some occasional crashes from this wakelock code. 2017-01-21 13:08:48 +00:00
Mark Gillespie 3794434085 Use uniqueID in the filenames. This appears to help with some file corruption problems I have been seeing (wrong tracks, or 0 byte files). Some more testing to see if this is truly fixed. Treat 0 byte as garbage that needs overwriting. 2017-01-21 13:08:07 +00:00
Mark Gillespie 7502842cdd Change {group} tag to {playlist} ({group} is still understood in switch for backwards compat).
Tidy up tag list dialog (missing \n in de)
Include {playlist} in the separate tag list for the playlists.
2017-01-20 23:33:37 +00:00
Mark Gillespie cdf640b21f This one too. 2017-01-20 21:48:29 +00:00
Mark Gillespie 2af33709ec Stop tracking these too (still builds in Android Studio 2.2.3 with a clean repo) 2017-01-20 21:11:45 +00:00
Mark Gillespie ac32a41d69 Removing some things that I think shouldn't be tracked. (causes chaos, as it constantly want to try and check these in, and because they are tracked, they can't be ignored by git. 2017-01-20 21:00:28 +00:00
Jan Christian Grünhage 86e0b7c02a
isAlreadyThere caused an IllegalArgumentException, when called with the default export path without enabling force overwrite. 2017-01-20 11:03:47 +01:00
Jan Christian Grünhage dc87dc7c4b
Merge branch 'overwrite_preference' of github.com:jcgruenhage/PlayMusicExporter into overwrite_preference 2017-01-20 10:47:10 +01:00
Jan Christian Grünhage b69fa49451
Removed APK from project, this has not been updated since the fork anyway and the apks can be found in the github release anyway. 2017-01-20 10:46:50 +01:00
Mark Gillespie b503cfb966 Trying to prevent deep sleeping during big exports. (export would totally stall, and then resume when device was woken up). Not really what was wanted. Testing this out.... 2017-01-20 08:38:13 +00:00
Mark Gillespie 6529c82896 Merge branch 'develop' into overwrite_preference 2017-01-19 23:08:29 +00:00
Mark Gillespie 81035f1082 Rebased on branch from develop. Overwrite files preference and renamed "groups" to "Playlists" (The term Groups really confused me!!!). 2017-01-19 23:03:44 +00:00
Jan Christian Grünhage 1cfa10bf88
Rewrote/Reformatted README.md 2017-01-19 11:36:00 +01:00
Mark Gillespie 782ada5c12 Artwork loading and path fixes. 2017-01-19 09:03:53 +00:00
Jan Christian Grünhage bb2cd0cf80
Merge branch 'release/v0.9.3' into develop 2017-01-19 00:45:09 +01:00
Jan Christian Grünhage 4ba762107f
Merge branch 'release/v0.9.3' 2017-01-19 00:45:03 +01:00
Jan Christian Grünhage 05ebba3da1
Bump version number (again) 2017-01-19 00:44:54 +01:00
Jan Christian Grünhage 3fc9540791
Added Translation, moved code in ExportAllService, try catch was not trying anything. 2017-01-19 00:42:22 +01:00
Jan Christian Grünhage 42b72e822a
Merge branch 'feature/automation_fix' into develop
# Conflicts:
#	framework/framework.iml
#	playmusicexporter/playmusicexporter.iml
#	playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
2017-01-19 00:23:20 +01:00
Jan Christian Grünhage 46abd0a972
Merge branch 'release/v0.9.2' 2017-01-19 00:13:27 +01:00
Jan Christian Grünhage db5b8b1d6c
Merge branch 'release/v0.9.2' into develop 2017-01-19 00:04:44 +01:00
Jan Christian Grünhage 21cbed8522
Merge branch 'release/v0.9.2' 2017-01-19 00:04:38 +01:00
Jan Christian Grünhage b3901dc04b
Translations, bumped version number. 2017-01-19 00:04:25 +01:00
Jan Christian Grünhage e3dac5c1d3
Set proper defaults.
Also switched from using alba to using albums, since it is more common.
This does not include the names of variables or key string contents, only those visible to the user.
The other occurrences might be changed to albums later too, or these changed reverted to alba.
2017-01-18 23:54:14 +01:00
Jan Christian Grünhage 903743e68e
Merge branch 'feature/appintro' into develop 2017-01-18 23:41:07 +01:00
Jan Christian Grünhage f2a8a24e28
Finished AppIntro
The minSdk bump in the libs come from the try to use lambdas, but JACK does not work with lambdas in libraries yet, but who still uses gingerbread anyway.
2017-01-18 23:40:51 +01:00
Jan Christian Grünhage 43dd39951c
Started Implementing the Introduction, still a lot missing, 2017-01-15 22:36:02 +01:00
Jan Christian Grünhage 57f721b6cf
Switched to Java 1.8, enabled JACK
I made this change to be able to use lambdas, which saves a lot of code, since android development heavily relies on anonymous classes.
2017-01-14 17:00:23 +01:00
Jan Christian Grünhage 903a1162e7
Continued work on new settings 2017-01-14 16:58:16 +01:00
Jan Christian Grünhage 87a80b4dd7
Added exception type to the crash log, which was previously unavailable.
The log in the crash handler now contains what kind of exception is being handled by the handler.
2017-01-01 19:37:12 +01:00
Jan Christian Grünhage 59ad21e0c8
Merge branch 'release/v0.9.1' 2016-12-31 13:13:05 +01:00
Jan Christian Grünhage 51d0ed4c7e
Fixed missing translations 2016-12-31 13:08:44 +01:00
Jan Christian Grünhage 73cdb73b34
Merge branch 'release/v0.9.1' 2016-12-31 12:58:52 +01:00