Commit graph

566 commits

Author SHA1 Message Date
Chumva
a145db7e17 Remove unnecessary apply 2018-09-04 16:16:23 +03:00
Chumva
33a287ca9f Remove unnecessary variable 2018-09-04 15:56:39 +03:00
Chumva
6f1974ea60 Remove colorStateList and refactor SortByBottomSheet 2018-09-04 15:15:38 +03:00
Chumva
ac454fa9f8 rename dimension resource 2018-09-04 13:47:42 +03:00
Chumva
b355b56c6c Fix group icon and add colorStateList 2018-09-04 13:29:21 +03:00
Chumva
ba473df31f Add sorting to live now fragment 2018-09-03 19:23:57 +03:00
Alex Sytnyk
f843c219ce Add user photo to the "Disable all sharing" dialog 2018-09-03 18:24:26 +03:00
Alex Sytnyk
c5dfef67be Change icon for OsmAnd Nightly 2018-09-03 15:58:51 +03:00
Alex Sytnyk
4683281377 Add user photo to the "My location" screen 2018-09-03 15:55:08 +03:00
Dmitriy Prodchenko
834cc5b700 Add image for Turn off dialog, and icon for OsmAnd Nightly version 2018-09-03 15:49:32 +03:00
Alex Sytnyk
fb40853153 Add compatibility with OsmAnd Nightly 2018-09-03 14:30:40 +03:00
Alex Sytnyk
9c28f7d131 Finish ChooseOsmAndBottomSheet 2018-09-03 12:02:26 +03:00
Alex Sytnyk
8203052e86 ChooseOsmAndBottomSheet in progress 2018-08-31 17:36:25 +03:00
Alex Sytnyk
7ebea3048c Create layout for "Choose OsmAnd" bottom sheet 2018-08-31 17:26:42 +03:00
Alex Sytnyk
eb5d38a4c5 Extract updating of "appToConnectPackage" to the TelegramSettings 2018-08-31 16:28:14 +03:00
Alex Sytnyk
ca48340164 Choose OsmAnd on "Open OsmAnd" button click in progress 2018-08-31 16:19:28 +03:00
Alexey
6a9a30c955
Merge pull request #5955 from osmandapp/TelegramAidlUpdate
Telegram AIDL callback update
2018-08-31 15:04:06 +03:00
Alex Sytnyk
9e8723342c Move settings classes from SettingsDialogFragment to the TelegramSettings 2018-08-31 14:22:46 +03:00
Chumva
5ce94dc933 remove unnecessary methods from callback 2018-08-31 12:54:40 +03:00
Chumva
8da4fb8474 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramAidlUpdate 2018-08-30 19:08:42 +03:00
Alex Sytnyk
491b628d90 Add DisableSharingBottomSheet and related stuff 2018-08-30 19:06:59 +03:00
Chumva
bdb5c41514 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramAidlUpdate
# Conflicts:
#	OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
#	OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
#	OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
2018-08-30 18:33:58 +03:00
Chumva
c0befa533f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramAidlUpdate
# Conflicts:
#	OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
#	OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
#	OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
2018-08-30 18:30:07 +03:00
Chumva
396d56ba28 Add check for active mapActivity and add parameter updateTimeMS 2018-08-30 17:07:54 +03:00
Chumva
50c7e5e63e Add setId to callback 2018-08-30 15:05:30 +03:00
Chumva
6b99ea420f Remove unnecessary changes 2018-08-30 13:20:28 +03:00
Chumva
7948a66e58 Rename aidl methods and remove boundPackage 2018-08-30 13:13:51 +03:00
Chumva
8cbf7862a6 Add getId for callback and add check for changing connected package 2018-08-30 12:37:18 +03:00
Chumva
1ac5fd6ce9 Add check for OsmAnd version code 2018-08-29 17:26:09 +03:00
Chumva
31e0f4fc38 Add clearLayer and rename methods 2018-08-29 16:01:53 +03:00
Chumva
34928a01d6 move asyncTasks to ShowLocationHelper 2018-08-29 15:27:50 +03:00
Chumva
7c6344b197 Add update method to IOsmAndAidlCallback 2018-08-29 13:49:09 +03:00
Chumva
d774c7575a Add missing search and navigation aidl to telegram app 2018-08-29 12:14:20 +03:00
Alex Sytnyk
d788d036f7 Replace "logout" menu item with "exit" item 2018-08-28 20:10:59 +03:00
Chumva
8815e8968b rename constants and addGrayPhoto 2018-08-28 15:26:48 +03:00
Chumva
6bfece0744 remove telegram logic from uiUtils 2018-08-28 14:58:44 +03:00
Chumva
448290aa21 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramStaleLocation 2018-08-28 14:22:36 +03:00
Alexander Sytnyk
68d538bdc6
Merge pull request #5907 from osmandapp/TelegramImprovements
Telegram improvements
2018-08-28 12:55:10 +03:00
Chumva
717af0e6ff refactor telegramSettings clear 2018-08-28 12:50:49 +03:00
Alexander Sytnyk
64131d0b16
Merge pull request #5929 from osmandapp/TelegramUiImprovements
Fix status bar transparent color
2018-08-28 12:38:54 +03:00
Chumva
aed07abecf move statusBar check under setContentView 2018-08-28 12:37:54 +03:00
Chumva
2c707e1dac move statusBar check to top 2018-08-28 12:36:45 +03:00
Chumva
6ed6dee124 remove unnecessary changes 2018-08-28 12:29:06 +03:00
Chumva
6db6e83949 add BaseDialogFragment 2018-08-28 12:24:39 +03:00
Alexander Sytnyk
420e50d48c
Merge pull request #5905 from osmandapp/UiImprovements
Add locHistoryTime setting to LiveNowTabFragment
2018-08-28 12:00:41 +03:00
Chumva
01e6b8ff60 remove default value for messageExpTime 2018-08-28 11:58:20 +03:00
Chumva
7a8caa4831 remove unnecessary changes 2018-08-28 11:50:42 +03:00
Chumva
5a71f738df remove unnecessary changes and refactor getMessagesByChatIds 2018-08-28 11:49:22 +03:00
Chumva
4c627efa05 fix empty login screen 2018-08-27 13:27:35 +03:00
Chumva
6b95f24ae4 add check for duration 2018-08-27 12:28:38 +03:00
Chumva
648660f6c6 change description resources 2018-08-27 11:38:16 +03:00
Chumva
7533fcff97 fix NoClassDefFoundError 2018-08-23 17:12:16 +03:00
Chumva
cd1f6a58e5 fix status bar transparent color 2018-08-23 15:03:59 +03:00
Chumva
0e4fb790b9 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramImprovements 2018-08-23 10:58:39 +03:00
Chumva
ef915383e5 rename checkUserGrayPhoto 2018-08-23 10:41:14 +03:00
Chumva
76d238b240 remove unnecessary changes 2018-08-22 19:04:11 +03:00
Chumva
00c160a015 add asyncTask for converting images 2018-08-22 18:53:21 +03:00
Chumva
67f9b52b66 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramStaleLocation 2018-08-22 14:56:39 +03:00
Dmitriy Prodchenko
3b276dcf69 Add active state icon for placeholder 2018-08-22 14:55:49 +03:00
Chumva
8b07bbfb5d add check for chat icon 2018-08-22 14:12:40 +03:00
Chumva
ea1c74a97c add stale location icons 2018-08-21 19:15:01 +03:00
Chumva
a3d5cd8567 on logout clear all settings and internal state 2018-08-20 15:07:08 +03:00
Chumva
cade49f764 fix requestLocationPermission on start 2018-08-20 14:15:25 +03:00
Chumva
2a2aa98bbb add locHistoryTime setting to LiveNowTabFragment 2018-08-20 11:10:23 +03:00
Alex Sytnyk
d87bc048ed Fix authorization 2018-08-17 18:36:11 +03:00
Alexander Sytnyk
ae20adac9f
Merge pull request #5885 from osmandapp/UiImprovements
Ui time improvements
2018-08-17 15:40:21 +03:00
Chumva
692aba1072 refactor getListItemLiveTimeDescr 2018-08-17 15:38:24 +03:00
Chumva
d2dd566c8b change locationViewContainer visibility 2018-08-17 15:23:17 +03:00
Chumva
54c446f278 move getListItemLiveTimeDescr to OsmandFormatter 2018-08-17 15:22:04 +03:00
Chumva
f14b96fb88 refactored getFormattedDate 2018-08-17 14:03:38 +03:00
Chumva
fe633f06a2 refactored getListItemLiveTimeDescr 2018-08-17 13:57:07 +03:00
Chumva
ae0c21c7fe improve SIMPLE_DATE_FORMAT 2018-08-17 13:52:15 +03:00
Alex Sytnyk
3bd8007aab Fix working with OsmAnd API 2018-08-17 13:47:03 +03:00
Chumva
ea0ad82805 added checks for locationViewContainer visibility 2018-08-17 13:32:35 +03:00
Chumva
85d71779f0 refactor getListItemLiveTimeDescr and add getFormattedDate in OsmandFormatter 2018-08-17 13:29:57 +03:00
Alex Sytnyk
990842d775 Fix TelegramHelper#removeOldMessages 2018-08-16 17:14:59 +03:00
Chumva
0f1711a63c add SimpleDateFormat 2018-08-16 16:17:06 +03:00
Chumva
afd793a1fc Merge remote-tracking branch 'origin/master' 2018-08-16 16:05:42 +03:00
Chumva
409bada16c change time for osmand bot 2018-08-16 16:05:31 +03:00
Alex Sytnyk
423bd5d628 Fix TdApi.Message.isAppropriate() 2018-08-16 15:53:57 +03:00
Alex Sytnyk
04d6e82157 Fix live messages 2018-08-16 15:15:50 +03:00
Chumva
e4380be6f3 fix expired time for removing map points 2018-08-16 14:13:13 +03:00
Chumva
43427f39b8 remove unnecessary changes 2018-08-16 13:48:39 +03:00
Chumva
f99086f668 refactor getListItemLiveTimeDescr 2018-08-16 13:41:44 +03:00
Chumva
85bd983223 refactor getLastUpdatedTime 2018-08-16 13:25:40 +03:00
Chumva
9e697a4080 add getLastUpdatedTime 2018-08-16 13:16:58 +03:00
Chumva
f1ece52940 add scroll listener to recyclerView 2018-08-16 12:47:41 +03:00
Chumva
e668e12143 change live to last response 2018-08-16 12:43:47 +03:00
Chumva
d5842c2bc3 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TravelUiImprovements 2018-08-16 12:30:04 +03:00
Alex Sytnyk
4ca99c10ee Refactor TelegramHelper#addNewMessage 2018-08-16 12:23:50 +03:00
Chumva
ebd912bd42 fix lastUpdated item time and refactor onBindViewHolder for holder in SetTimeDialogFragment 2018-08-16 11:31:28 +03:00
Chumva
be04f298e6 add check for messages expire time 2018-08-16 10:41:46 +03:00
Chumva
801385f9d2 remove unnecessary string 2018-08-15 19:12:24 +03:00
Chumva
a09dc0a280 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TravelUiImprovements
# Conflicts:
#	OsmAnd-telegram/res/values/strings.xml
2018-08-15 19:11:28 +03:00
Chumva
cfaf362a5e add TelegramLocationListeners to SetTimeDialogFragment 2018-08-15 19:08:30 +03:00
Alexander Sytnyk
8a67ba2a22
Merge pull request #5876 from osmandapp/TravelUiImprovements
Live time ui updates
2018-08-15 17:43:02 +03:00
Chumva
0ebacc2c5e fix date from OsmAndBot text locations 2018-08-15 17:39:52 +03:00
Alex Sytnyk
c8df498231 Update disconnect_from_telegram_desc string 2018-08-15 17:34:30 +03:00
Alex Sytnyk
1631a78857 Show Welcome screen after log out 2018-08-15 17:02:20 +03:00
Chumva
4e102bb1e8 add time in ui for live now messages 2018-08-15 17:00:58 +03:00
Alexander Sytnyk
d02dcefae4
Merge pull request #5870 from osmandapp/ShareLocationImprovements
Fix sendLocationInterval and add check for existing live messages
2018-08-15 15:32:48 +03:00
Chumva
10ec2eb3c0 remove unnecessary changes 2018-08-15 15:24:38 +03:00
Chumva
928fec6560 remove ChatLiveMessagesListener 2018-08-15 15:22:16 +03:00
Chumva
117837aa54 add ChatLiveMessagesListener to MainActivity 2018-08-15 15:00:09 +03:00
Chumva
f1c4741076 fix sendTimeInterval and add check for existing live messages 2018-08-15 13:58:59 +03:00
Alex Sytnyk
2cee8dd5a2 Create DisconnectTelegramBottomSheet and related stuff 2018-08-14 22:37:35 +03:00
Alex Sytnyk
9b9690be1a Create theme for BottomSheetDialog 2018-08-14 22:30:59 +03:00
Alex Sytnyk
27d1bfec7b Create BottomSheetDialog and related stuff 2018-08-14 18:32:07 +03:00
Chumva
e1eba6ceeb rename handler 2018-08-14 16:05:30 +03:00
Chumva
c63a89f4ea fix two same live messages and refactor adapter updates 2018-08-14 15:57:17 +03:00
Chumva
21af6cc24e move startAdapterUpdate 2018-08-14 14:06:36 +03:00
Chumva
d8bdd0ddfe Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ShareLocationImprovements 2018-08-14 13:26:09 +03:00
Chumva
965f908ace add chatLiveStartTimeSec and updates for adapter 2018-08-14 13:20:16 +03:00
Alex Sytnyk
cbe7051247 Make method "requestMessage" silent 2018-08-14 12:39:24 +03:00
Chumva
ad7bd6d1c5 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into ShareLocationImprovements 2018-08-14 10:34:41 +03:00
Alex Sytnyk
0ec2fb2895 Add synchronization 2018-08-13 18:40:40 +03:00
Alex Sytnyk
b41a2560a8 Rename method in the MessagesDbHelper 2018-08-13 18:25:31 +03:00
Alex Sytnyk
1d5360f58f Save live messages to DB 2018-08-13 17:35:49 +03:00
Chumva
4985db672b add ability to stop sending live messages in telegram 2018-08-13 16:08:03 +03:00
Chumva
1f9e39fa1d remove empty space 2018-08-10 17:23:47 +03:00
Chumva
6d1693614c rename animateStartSharingBtn 2018-08-10 17:14:37 +03:00
Chumva
c3f4221c01 add tools visibility for button 2018-08-10 17:11:17 +03:00
Chumva
34f0a3d8d3 change fab background 2018-08-10 17:07:20 +03:00
Chumva
7bdf07122e Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MyLocationFab 2018-08-10 17:06:48 +03:00
Alex Sytnyk
a2d540f9ff Add background for extended fab 2018-08-10 17:05:11 +03:00
Chumva
577359c205 add ability to enter sharing mode in bottomBar cancel button 2018-08-10 16:57:13 +03:00
Alex Sytnyk
a52b40879f Add description to the "Settings" screen 2018-08-10 16:55:09 +03:00
Chumva
8ce3642345 add share location btn and support for it 2018-08-10 16:28:45 +03:00
Alex Sytnyk
59c90e548f Fix icons 2018-08-10 16:19:04 +03:00
Alex Sytnyk
27dd23f04b Add the ability to choose app to connect 2018-08-10 15:34:17 +03:00
Alex Sytnyk
a0c27af3d0 Use new icons for SettingsDialogFragment 2018-08-10 13:49:24 +03:00
Dmitriy Prodchenko
d8946a63da Add icons for Location Sharing 2018-08-10 13:38:17 +03:00
Alex Sytnyk
79799eab71 Fix TelegramHelper 2018-08-10 13:35:30 +03:00
Alexander Sytnyk
130ad85f3e
Merge pull request #5819 from osmandapp/LiveNowUiImprovements
Add appbar to LiveNowTabFragment
2018-08-10 13:20:36 +03:00
Alex Sytnyk
6f42612123 SettingsDialogFragment in progress; use values from settings instead of constants 2018-08-10 13:16:46 +03:00
Chumva
06594ff687 refactor setupOptionsBtn call 2018-08-10 13:14:19 +03:00
Chumva
4cd1a344ba refactor options button setup 2018-08-10 13:10:57 +03:00
Chumva
79fe8ae039 remove unnecessary apply 2018-08-10 13:06:11 +03:00
Chumva
cf47b3c4c0 move setupOptionsBtn to activity 2018-08-10 12:44:55 +03:00
Chumva
b14190c190 add setupOptionsBtn 2018-08-10 12:33:23 +03:00
Chumva
f047a655c8 clean imports 2018-08-10 12:25:36 +03:00
Chumva
4f0c51d42e removed unused field 2018-08-10 12:24:53 +03:00
Chumva
82987dd237 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into LiveNowUiImprovements 2018-08-10 12:13:17 +03:00
Chumva
2c2837876b removed unused button 2018-08-10 12:08:52 +03:00
Chumva
cf8bdf06c0 add appbar to LiveNowTabFragment 2018-08-10 11:16:42 +03:00
Alex Sytnyk
c7ffc1afa8 Add small changes to AndroidUtils and OsmandFormatter 2018-08-10 11:12:29 +03:00
Chumva
c0938d1ce1 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MyLocationSharingMode 2018-08-10 10:38:55 +03:00
Alex Sytnyk
a2200ea826 SettingsDialogFragment in progress 2018-08-09 22:07:47 +03:00
Alex Sytnyk
dfcaa846fd Extract logic for creating username into a separate method in the TelegramUiHelper 2018-08-09 22:00:18 +03:00
Alex Sytnyk
ce3afc5a38 Add "getActiveIcon" method to the UiUtils 2018-08-09 21:58:16 +03:00
Alex Sytnyk
3bc7fdc8b9 Fix logging out 2018-08-09 21:57:34 +03:00
Chumva
28fe361d3d rename const 2018-08-09 18:28:17 +03:00
Chumva
6768fd0745 remove unnecessary check in MyLocationTabFragment 2018-08-09 18:24:55 +03:00
Chumva
76fba24c4d remove unnecessary changes in MyLocationTabFragment and OsmandFormatter 2018-08-09 18:16:16 +03:00
Chumva
dd08aa3d31 remove unnecessary code in getChatListIds 2018-08-09 17:54:15 +03:00
Chumva
fb118fa1a4 return appBarScrollRange 2018-08-09 17:35:11 +03:00
Alex Sytnyk
6430ae0e3a Fix small issues caused by increasing api level 2018-08-09 17:13:12 +03:00
Chumva
0a28034449 remove unnecessary code and cleaned onBindViewHolder 2018-08-09 17:05:47 +03:00
Alex Sytnyk
71bf82ab22 Update compileSdkVersion and support libs from 27 to 28 API 2018-08-09 16:51:58 +03:00
Chumva
1d9ee00225 add time formatting and refactored MyLocationTabFragment 2018-08-09 16:45:39 +03:00
Dmitriy Prodchenko
02943eced2 Rename icons with OsmAnd logo, add tap state for FAB, add color variant of OsmAnd logo 2018-08-09 14:55:27 +03:00
Chumva
7dc01155f5 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MyLocationSharingMode 2018-08-09 13:53:33 +03:00
Alex Sytnyk
3a7bf0e030 Replace AndroidUtils.isGooglePlayInstalled with AndroidUtils.isAppInstalled 2018-08-09 13:09:08 +03:00
Chumva
37111025f5 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MyLocationSharingMode 2018-08-09 10:48:35 +03:00
Chumva
494e40a59a remove chatLiveMessagesFull 2018-08-08 19:23:37 +03:00
Alex Sytnyk
fea565192d SettingsDialogFragment in progress 2018-08-08 19:17:00 +03:00
Alex Sytnyk
a75a8e3bda Add padding to primary and secondary buttons 2018-08-08 18:57:58 +03:00
Alex Sytnyk
16a8c21f79 Make small refactoring 2018-08-08 18:48:16 +03:00
Chumva
3c7c950e34 hide textInArea 2018-08-08 17:59:36 +03:00
Chumva
488685a656 add support for expire time and improve ui 2018-08-08 17:53:50 +03:00
Chumva
1146a2f8ee Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MyLocationSharingMode 2018-08-08 17:41:44 +03:00
Alex Sytnyk
964dbc2bc4 Rewrite OsmandFormater.getFormattedDuration 2018-08-08 16:50:24 +03:00
Alex Sytnyk
c546af94c5 Increase padding in AndroidUtils.getPopupMenuWidth 2018-08-08 16:49:23 +03:00
Dmitriy Prodchenko
fbacf142d0 Add 9Patch shadow for cards 2018-08-08 14:18:20 +03:00
Chumva
3eee51364e fix scroll range 2018-08-08 11:52:54 +03:00
Chumva
c89f4ce116 remove unnecessary call to editDate 2018-08-08 11:44:54 +03:00
Alex Sytnyk
d1816ba821 Create SettingsDialogFragment and related stuff; make small refactoring 2018-08-07 20:51:06 +03:00
Alex Sytnyk
7eead1e879 Fix logging in OsmAnd-Telegram 2018-08-06 18:38:28 +03:00
Alex Sytnyk
28303d1c46 Use new background for "Open OsmAnd" button 2018-08-06 18:18:14 +03:00
Alexander Sytnyk
f6ec08f75b
Merge pull request #5779 from osmandapp/TelegramUiImprovements
Add stale location
2018-08-06 17:49:40 +03:00
Chumva
e6498521d0 remove unnecessary call to editDate 2018-08-06 17:30:41 +03:00
Chumva
d0ad7fe62d remove field created time 2018-08-06 16:44:13 +03:00
Dmitriy Prodchenko
f281acc602 Fix file name for 9Patch 2018-08-06 16:40:47 +03:00
Chumva
9c25f2dd8f improve time parsing for text locations 2018-08-06 16:15:15 +03:00
Chumva
a2bc710c00 refactored parseOsmAndBotLocation 2018-08-06 15:57:03 +03:00
Chumva
152254ae26 change stale time to 15 minutes 2018-08-06 14:32:11 +03:00
Chumva
8d666dc27e rename time variable 2018-08-06 14:31:05 +03:00
Chumva
a155063c86 create const 2018-08-06 14:20:18 +03:00
Dmitriy Prodchenko
5fc82dbe1f Add shadow for FAB,location sharing 2018-08-06 13:41:43 +03:00
Alex Sytnyk
7e08a6035b Fix OsmAnd-Telegram launcher icon 2018-08-06 13:38:30 +03:00
Alex Sytnyk
0456998a99 Add animation for "Open OsmAnd" button 2018-08-06 13:10:47 +03:00
Chumva
135e073b50 create const 2018-08-06 10:30:52 +03:00
Chumva
4853fcd17b Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramUiImprovements 2018-08-06 10:28:24 +03:00
Chumva
c47d6aa37d add stale location 2018-08-03 18:53:21 +03:00
Alex Sytnyk
3e9f4ead06 Add the button for opening OsmAnd to "Live Now" screen 2018-08-03 18:44:42 +03:00
Alex Sytnyk
c15f294dc4 Fix "All" number for chat description 2018-08-03 16:38:56 +03:00
Chumva
37c8d2b9a0 add checks in getOsmAndBotDeviceName 2018-08-03 14:55:07 +03:00
Chumva
87879559bb add check for Osmand bot 2018-08-03 14:42:01 +03:00
Chumva
a12f2eca5a remove unnecessary check for OsmAnd bot 2018-08-03 14:35:49 +03:00
Chumva
c65868f522 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramUiImprovements
# Conflicts:
#	OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
2018-08-03 13:50:57 +03:00