github.com/criticalmaps/criticalmaps-android commits

Multiple code improvements - squid:S1319, squid:S1213, squid:UselessParenthesesCheck

4be3517bdadc1c7cd0097d6abb821da6dc544d88 authored almost 9 years ago by George Kankava <[email protected]>

Merge pull request #163 from cbalster/osmdroid_and_bonuspack_update

update osmdroid (v5.1) and osmbonuspack (v5.7)

1f8ed8e508ef6572dab283cc712e11c6f19503be authored almost 9 years ago by ligi <[email protected]>

Merge pull request #166 from criticalmaps/stephanlindauer-patch-1

added rodrigo to contributor list

7be4c7288f7b579f57afd45e302f1439d32e36db authored almost 9 years ago by ligi <[email protected]>

added rodrigo to contributor list

0cf9ceba60c5a66b5c89d88a9c3b1dbf141d24c9 authored almost 9 years ago by stephan lindauer <[email protected]>

Merge branch 'master' into develop

319321acd3b1ff98edacbe5716dfe9aac3598deb authored almost 9 years ago by stephan lindauer <[email protected]>

release 2.2.1

4416599dc30f0f3ad4c4a62ea51735fa5ac9e39c authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #164 from criticalmaps/develop

release 2.2.1

8f9fe1461ad9b9c838111cdb56853fce32864705 authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #161 from rodrigoaguilera/develop

Add Catalan translation and update Spanish.

46a33ca62cebf14484f8e1ea6bb00e9a74463429 authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #2 from stephanlindauer/rodrigoaguilera-develop

escaped apostrophes

39846b7f840c0c6642829f3c00eb8f967af4f59f authored almost 9 years ago by Rodrigo <[email protected]>

escaped apostrophes

0172b884f74c8ec8fdf9da3e6467b07e7e2e7e60 authored almost 9 years ago by stephan lindauer <[email protected]>

update osmdroid (v5.1) and osmbonuspack (v5.7)

- update osmdroid and remove slf4j dependency as it's no longer needed
- update osmbonuspack and...

141a8118588b9a2486fd4049326cbaed353f99dd authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #162 from cbalster/icon_update

update toolbar and notification icons to match material spec

00454223d137b6dd91d4a7b8fbf28b728c2148c6 authored almost 9 years ago by ligi <[email protected]>

update toolbar and notification icons to match material spec

2ee06fa0ee607f28755d224e79fbad29e13761af authored almost 9 years ago by Christian Balster <[email protected]>

Add Catalan translation and update Spanish.

e162f1c5548fdba2588ed6578a8d9276f1bafd8b authored almost 9 years ago by Rodrigo Aguilera <[email protected]>

Merge pull request #159 from johnjohndoe/minor-typos

Fix typo and capitalization.

2c6dec7c5c8342ac79ea6fcaee2a3a9ef038049f authored almost 9 years ago by Christian Balster <[email protected]>

Fix typo and capitalization.

2ca021a2898465207d35e1b6be78d971a78258f2 authored almost 9 years ago by Tobias Preuss <[email protected]>

release 2.2.0

06e1953f6c0c43ca811275af92cb125941d5b2b1 authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #158 from criticalmaps/develop

Merge in preperation of release 2.2.0

1ffc0c9ffc58eb23778587d0a989163aa637f0e7 authored almost 9 years ago by ligi <[email protected]>

Merge pull request #157 from criticalmaps/master

housekeeping: merge master into develop

9f570b9f38400c130857b7296de7b9d75f8293c9 authored almost 9 years ago by ligi <[email protected]>

Merge pull request #156 from johnjohndoe/gradle-wrapper

Update Gradle wrapper to v.2.10.

e259c2af63372963312e46861d9278fa5318f99f authored almost 9 years ago by ligi <[email protected]>

Update Gradle wrapper to v.2.10.

b8dd8b7a99af5f3e5499a91fd6e0c8c1ce06cab3 authored almost 9 years ago by Tobias Preuss <[email protected]>

Merge pull request #131 from johnjohndoe/gradle-plugin

Update Gradle plugin to v.1.5.0.

7bfc657aa440d9583c7df018ffbb4718570efcef authored almost 9 years ago by ligi <[email protected]>

Update Gradle plugin to v.1.5.0.

37f4fcce21908a5e23ba377ba998a767d17ef9d4 authored almost 9 years ago by Tobias Preuss <[email protected]>

Merge pull request #155 from johnjohndoe/gradle-wrapper

Gradle wrapper

b4e66bfaef20bba8690d47fe788a73e60f83d27c authored almost 9 years ago by ligi <[email protected]>

Update Gradle wrapper to v.2.9.

ef01de9156afd9f4f1b5877d44ca2d163ff58f05 authored almost 9 years ago by Tobias Preuss <[email protected]>

Update Gradle wrapper to v.2.8.

+ Completes earlier update in commit 77a8b4d43a1506ec8bf85989bf2657d01ac96123.

1bbddc767248ec64ec703a0e2dfa47dfc994182f authored almost 9 years ago by Tobias Preuss <[email protected]>

Merge pull request #154 from criticalmaps/readme-fix

fixed image references

5ead315a256c64bebcf605f102f4437971132a99 authored almost 9 years ago by ligi <[email protected]>

fixed image references

3da8f5e405b59b2fbe2c6827cd2ab911080d0edf authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #153 from canerbasaran/master

update Turkish translation

034ca0525f57f45d4d4a18b0e848e67bde8a3c7b authored almost 9 years ago by stephan lindauer <[email protected]>

update Turkish translation

e62d08811bc3ebcb772469a669be505748e8cdf0 authored almost 9 years ago by Caner Başaran <[email protected]>

Merge pull request #150 from cbalster/fix_upload_progress

ImageUploadHandler: fix progress update

c13050fb424832e1e3751bf926ed18e528ce3bcb authored almost 9 years ago by ligi <[email protected]>

Merge pull request #152 from criticalmaps/notify_slackchannel_after_ci_build

Add slack notifications to travis configuration

326f4f908e9819d05a576edc6b73620a11b04fd0 authored almost 9 years ago by ligi <[email protected]>

Add slack notifications to travis configuration

6845c3f51cc29ccb9d7f0a1227ecfb48cba0391e authored almost 9 years ago by Norman Sander <[email protected]>

ImageUploadHandler: fix progress update

even though this works we should use publishProgress()
to ensure proper synchronization

fe38367ebabae67aeb77f67cd54e40f09d7d59a2 authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #132 from johnjohndoe/sharedpreferences

Simplify usage of shared preferences.

a01952f9d1fbe45a6d9d7aa092b6608432c826f5 authored almost 9 years ago by Christian Balster <[email protected]>

Simplify usage of shared preferences.

+ Inject shared preferences.
+ Please note that former setting will NOT be restored since
pref...

8d63f5aa729c4b4fcd5db13c3fa0969682016ee7 authored almost 9 years ago by Tobias Preuss <[email protected]>

Merge pull request #149 from cbalster/rework_chat_send_button

Rework chat send button

356a696fb20782cc984815a7185f2f8736937dd9 authored almost 9 years ago by ligi <[email protected]>

chat: animate send button state changes

42490aca7ecc1ffb2f876e5facde40c2e29d8949 authored almost 9 years ago by Christian Balster <[email protected]>

chat: disable FAB instead of hiding it while message is empty

fdcc44e45c15c9f6308871da27a6c44aada34429 authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #148 from ligi/ligi/fix_npe_in_locationmanager

Fix npe in locationmanager

4cc1238ca672cfeab4563923a36d0189ceb3ca5b authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #146 from cbalster/chat_location_handling

Chat location state handling

d097d9fbb2ad37c88a6d16cde45a132a6caa5d81 authored almost 9 years ago by ligi <[email protected]>

Get LocationManager when constructing

Fixes #147

69d6f855de78d00e2fcf57e72702a5e6edf49007 authored almost 9 years ago by ligi <[email protected]>

chat: get rid of searching for location overlay

handle this with the input hint instead

cd7a4e9af59de3062249b3420a3429cf12478d6e authored almost 9 years ago by Christian Balster <[email protected]>

chat: don't set location overlay state on server event

909bb8d2699e062618f1127594744ec73a606f65 authored almost 9 years ago by Christian Balster <[email protected]>

chat: change FAB alignment

97785ce955f07de858aa00586df6a53b91d53129 authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #145 from cbalster/start_stop_location_updates_in_service

Start stop location updates in service

6165a96c83c2bc58f84d0c80e08e7ed0e15deb84 authored almost 9 years ago by ligi <[email protected]>

LocationUpdateManager: inject application context in constructor

This way we make sure the sharedPreferences exist and remove the argument to the init method.
Al...

f9017b7e1a8b8191aa767bae412b06aefeecba3e authored almost 9 years ago by Christian Balster <[email protected]>

rename LocationUpdateService to LocationUpdateManager

a10e63e0b3a797d9560c219542bc0e41452974e2 authored almost 9 years ago by Christian Balster <[email protected]>

handle start/stop of location listening in service

ensures proper behavior in case the service gets killed and restarted.

33beb9fda2113f2128700e3f7dc38a70184124f3 authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #144 from stephanlindauer/add_floating_action_button_for_twitter

Add floating action button for twitter

43255b0e7822990c837aa3fa6705a847304b15b2 authored almost 9 years ago by ligi <[email protected]>

incorporated suggestion by @ligi: https://github.com/stephanlindauer/criticalmaps-android/commit/913805502a3864e36bced982843bb9879938ab0b#commitcomment-15167045

ffcf51dd50b9f4e15ab3bd5f2347c4e7105389e8 authored almost 9 years ago by stephan lindauer <[email protected]>

incorporated suggestion by @ligi: https://github.com/stephanlindauer/criticalmaps-android/commit/92c4665f0c748bbc90577673ebc52e458abae465#commitcomment-15166799

8ffb66294a1ce1c89320c6aaaa2ac91366db1983 authored almost 9 years ago by stephan lindauer <[email protected]>

incorporated suggestion by @ligi: https://github.com/stephanlindauer/criticalmaps-android/commit/92c4665f0c748bbc90577673ebc52e458abae465#commitcomment-15166785

913805502a3864e36bced982843bb9879938ab0b authored almost 9 years ago by stephan lindauer <[email protected]>

added floating action button to post new tweet #117

92c4665f0c748bbc90577673ebc52e458abae465 authored almost 9 years ago by stephan lindauer <[email protected]>

Merge pull request #143 from cbalster/misc_changes

Misc changes

8c41b6285d372b5b70bd68629ea4f4e74c6c59cb authored almost 9 years ago by stephan lindauer <[email protected]>

twittergethandler: close response body and use okhttp api to check success

3a65dd0e1e7ad1ac466589c12dc419e1dc301907 authored almost 9 years ago by Christian Balster <[email protected]>

pullserverhandler: don't process empty responses

723c244768005e0afe9f4e022ebdadf4ee143096 authored almost 9 years ago by Christian Balster <[email protected]>

pullserverhandler: use okhttp api to check success

f5ae1f2a8507da4b9284d959cbf20391c203d558 authored almost 9 years ago by Christian Balster <[email protected]>

set new chat data before posting update event

otherwise new chat messages will always lag one update behind

45b59dbb65dc81e5821707e134280bc2fba6a382 authored almost 9 years ago by Christian Balster <[email protected]>

Merge pull request #142 from cbalster/rework_image_upload

rework image upload + misc

ff516a001fb67aa75ed48ae47c7f7163997ab608 authored almost 9 years ago by stephan lindauer <[email protected]>

rework image upload

switch to OkHttp's native API and let it do the heavy lifting

8b1d16880f5d976ecc1c6e990c49d4657d580110 authored about 9 years ago by Christian Balster <[email protected]>

recycle bitmaps after use

As bitmaps require large amounts of memory recycle them as soon as possible
to allow for faster ...

6dfd041dc4e6743ff824399ccc9dbb152e7d5f4b authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #141 from cbalster/use_exisiting_okhttpclient_for_picasso

use existing okhttpclient for picasso

27c47b5746b6405c4cb0398c47ac0e9f5c80bf0e authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #140 from cbalster/update_okhttp

update okhttp to v2.7.0

91b85e19235aab447337d6880331e148fbde110f authored about 9 years ago by stephan lindauer <[email protected]>

use existing okhttpclient for picasso

... and let Dagger manage the picasso singleton

5d46b1c2eb988db431d6b4b9ef376c2560122127 authored about 9 years ago by Christian Balster <[email protected]>

update okhttp to v2.7.0

b91da21bafe0b89e9b96fd28b085736bb2413aef authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #139 from stephanlindauer/added_french

added french translation and lena to contributor list

2b7174c7ce324a8508e1cebb4f4928a49d1144f8 authored about 9 years ago by Christian Balster <[email protected]>

added french translation and lena to contributor list

e18abcfb6977f6e3c8237a9cdae9bee8ab47688d authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #137 from stephanlindauer/issue_115_add_salt_to_device_hash

added salt to uniqueDeviceId

0e818b1d503108533d927801dc9c1ac22773ae95 authored about 9 years ago by ligi <[email protected]>

Merge pull request #138 from cbalster/dont_show_rules_panel_animation_on_state_restore

don't show rules panel animation on state restore

46635b949ec6db542529a849695d7abff59e5f6a authored about 9 years ago by ligi <[email protected]>

don't show rules panel animation on state restore

086f7347429943bcf5f7448b83cc85fefd4177f1 authored about 9 years ago by Christian Balster <[email protected]>

date format fix

59c18761416e2d1067e701e5bc52a1145f86caf3 authored about 9 years ago by stephan lindauer <[email protected]>

added 6 hours to date for dateString generation to be safe it doesnt change during the cm nights

1915fc43ac5611ec29200754fd74e092a56ae7bc authored about 9 years ago by stephan lindauer <[email protected]>

changed field name as per discussion in

https://github.com/stephanlindauer/criticalmaps-android/commit/dbe6bb1dbd1ede6c9bffd05f4da14807b7...

4f6851bbfbcf9c931340e3c01e493eace09c874c authored about 9 years ago by stephan lindauer <[email protected]>

added salt to uniqueDeviceId

dbe6bb1dbd1ede6c9bffd05f4da14807b7a388ae authored about 9 years ago by stephan lindauer <[email protected]>

fixed old version settings for f-droid

bf0d76cb07a939d5f3f377ee46c70ab864f5743e authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #136 from cbalster/add_opensource_licenses

add license info for third party libraries to about

30da614a1e2d7a6a3084df500f5bfe1d405c2daa authored about 9 years ago by ligi <[email protected]>

add license info for third party libraries

f83fab82b2452bdc3a8e20db4ae274789e064514 authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #134 from cbalster/housekeeping

Housekeeping

c30f0c19b2a3575c78ea824dc1111411d8bb7616 authored about 9 years ago by ligi <[email protected]>

fixed travis build

5b2d523ebc2bbf02b0c353793ee018f97fb4650b authored about 9 years ago by stephan lindauer <[email protected]>

update support library to version 23.1.1

f59fa9347d206468ad46769a9646193446289fe8 authored about 9 years ago by Christian Balster <[email protected]>

update build tools to 23.0.2

06928020cb5b56c676faa8986dbe8951b168d2b4 authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #130 from cbalster/styles_cleanup

some ui cleanup

0cdb5d8411ba0d1421db4121ec5799fa4ad6d65c authored about 9 years ago by ligi <[email protected]>

introduction screen cleanup

fix wrong rtl drawable and align icons with text

9b54b3299fac1b62868ef17d295831b4bf0373c2 authored about 9 years ago by Christian Balster <[email protected]>

use theme text styles and colors in about and rules

c95db7e7ffc4193e77eb4f60531e049b0f7ac293 authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #129 from cbalster/dont_send_old_locations_to_backend

don't send old location fixes to backend

042ea617c390c0f18726ee5889eef6d317247aa1 authored about 9 years ago by ligi <[email protected]>

don't send old location fixes to backend

e8b6664eb497dc03a8566c8b980fc71d52bbdf27 authored about 9 years ago by Christian Balster <[email protected]>

Merge pull request #128 from ligi/ligi/use_dagger_2.0

Use dagger 2.0

4bd87f6be1d3244a31c73ec1528d5ed4eb271f2e authored about 9 years ago by Christian Balster <[email protected]>

DRY Registering in LocationUpdatesService

c23b7545f7bffdc68a2b613f8775fea0a8f347fc authored about 9 years ago by ligi <[email protected]>

Use Dagger2.0 for DI

7ef87c321904ec7b8000c888d2c72a50d40184de authored about 9 years ago by ligi <[email protected]>

Merge pull request #125 from ligi/ligi/bump_to_gradle_2.8

Use Gradle 2.8

27c0723aa9adecc004e66017f6cca2ddb54de418 authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #126 from ligi/ligi/use_sp

Use SP instead of DP for text

ef947959dc6e0dd4621488264c53ab4f709abc52 authored about 9 years ago by stephan lindauer <[email protected]>

Use SP instead of DP for text

44d4ab8965dbf0f819784e5441b3e9e8751bf348 authored about 9 years ago by ligi <[email protected]>

Use Gradle 2.8

77a8b4d43a1506ec8bf85989bf2657d01ac96123 authored about 9 years ago by ligi <[email protected]>

Merge branch 'master' into develop

0cde22b266e0ab2425c2485497da0aaaf525f5e6 authored about 9 years ago by ligi <[email protected]>

Merge pull request #120 from stephanlindauer/italian_translation

Italian translation

301205460b089892e61b0aaae98be58fb675e68d authored about 9 years ago by ligi <[email protected]>

added italian translation and added luca to the contributor list

5989e3f3aa71d5ba6d9bae322914d81e68f9c435 authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #124 from stephanlindauer/transparent_side_drawer

Transparent side drawer

4c8226476e80bfd7e67801440743a576e4f8eb87 authored about 9 years ago by ligi <[email protected]>

transparent side drawer

489b3d363ab3a7940e0c877e02ec6b07c1a7c267 authored about 9 years ago by stephan lindauer <[email protected]>

Merge pull request #123 from cbalster/improve_location_handling

Improve location handling

af892c8fb09311c323d3bcc8422e663a4e3a5e17 authored about 9 years ago by ligi <[email protected]>

Ecosyste.ms: OpenCollective

github.com/criticalmaps/criticalmaps-android