Merge branch 'master' into feature-json

2024-12-25 22:35:35 +00:00 · 2017-02-24 06:14:38 +01:00 · 2017-02-24 06:14:38 +01:00 · 3d2b07eae9
commit 3d2b07eae9
parent 2a82c5b374 be56f21a0f
199 changed files with 30 additions and 7 deletions
--- a/build/classes/com/droidkit/actors/Actor$1.class
+++ b/build/classes/com/droidkit/actors/Actor$1.class
--- a/build/classes/com/droidkit/actors/Actor$2.class
+++ b/build/classes/com/droidkit/actors/Actor$2.class
--- a/build/classes/com/droidkit/actors/Actor.class
+++ b/build/classes/com/droidkit/actors/Actor.class
--- a/build/classes/com/droidkit/actors/ActorContext.class
+++ b/build/classes/com/droidkit/actors/ActorContext.class
--- a/build/classes/com/droidkit/actors/ActorCreator.class
+++ b/build/classes/com/droidkit/actors/ActorCreator.class
--- a/build/classes/com/droidkit/actors/ActorRef.class
+++ b/build/classes/com/droidkit/actors/ActorRef.class
--- a/build/classes/com/droidkit/actors/ActorScope.class
+++ b/build/classes/com/droidkit/actors/ActorScope.class
--- a/build/classes/com/droidkit/actors/ActorSelection.class
+++ b/build/classes/com/droidkit/actors/ActorSelection.class
--- a/build/classes/com/droidkit/actors/ActorSystem.class
+++ b/build/classes/com/droidkit/actors/ActorSystem.class
--- a/build/classes/com/droidkit/actors/ActorTime.class
+++ b/build/classes/com/droidkit/actors/ActorTime.class
--- a/build/classes/com/droidkit/actors/CurrentActor.class
+++ b/build/classes/com/droidkit/actors/CurrentActor.class
--- a/build/classes/com/droidkit/actors/Props.class
+++ b/build/classes/com/droidkit/actors/Props.class
--- a/build/classes/com/droidkit/actors/ReflectedActor$Event.class
+++ b/build/classes/com/droidkit/actors/ReflectedActor$Event.class
--- a/build/classes/com/droidkit/actors/ReflectedActor$NamedEvent.class
+++ b/build/classes/com/droidkit/actors/ReflectedActor$NamedEvent.class
--- a/build/classes/com/droidkit/actors/ReflectedActor.class
+++ b/build/classes/com/droidkit/actors/ReflectedActor.class
--- a/build/classes/com/droidkit/actors/dispatch/AbstractDispatchQueue.class
+++ b/build/classes/com/droidkit/actors/dispatch/AbstractDispatchQueue.class
--- a/build/classes/com/droidkit/actors/dispatch/AbstractDispatcher$1.class
+++ b/build/classes/com/droidkit/actors/dispatch/AbstractDispatcher$1.class
--- a/build/classes/com/droidkit/actors/dispatch/AbstractDispatcher.class
+++ b/build/classes/com/droidkit/actors/dispatch/AbstractDispatcher.class
--- a/build/classes/com/droidkit/actors/dispatch/Dispatch.class
+++ b/build/classes/com/droidkit/actors/dispatch/Dispatch.class
--- a/build/classes/com/droidkit/actors/dispatch/QueueListener.class
+++ b/build/classes/com/droidkit/actors/dispatch/QueueListener.class
--- a/build/classes/com/droidkit/actors/dispatch/RunnableDispatcher.class
+++ b/build/classes/com/droidkit/actors/dispatch/RunnableDispatcher.class
--- a/build/classes/com/droidkit/actors/dispatch/SimpleDispatchQueue$Message.class
+++ b/build/classes/com/droidkit/actors/dispatch/SimpleDispatchQueue$Message.class
--- a/build/classes/com/droidkit/actors/dispatch/SimpleDispatchQueue.class
+++ b/build/classes/com/droidkit/actors/dispatch/SimpleDispatchQueue.class
--- a/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher$1.class
+++ b/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher$1.class
--- a/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher$DispatcherThread.class
+++ b/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher$DispatcherThread.class
--- a/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher.class
+++ b/build/classes/com/droidkit/actors/dispatch/ThreadPoolDispatcher.class
--- a/build/classes/com/droidkit/actors/mailbox/AbsActorDispatcher.class
+++ b/build/classes/com/droidkit/actors/mailbox/AbsActorDispatcher.class
--- a/build/classes/com/droidkit/actors/mailbox/ActorDispatcher$1.class
+++ b/build/classes/com/droidkit/actors/mailbox/ActorDispatcher$1.class
--- a/build/classes/com/droidkit/actors/mailbox/ActorDispatcher.class
+++ b/build/classes/com/droidkit/actors/mailbox/ActorDispatcher.class
--- a/build/classes/com/droidkit/actors/mailbox/Envelope.class
+++ b/build/classes/com/droidkit/actors/mailbox/Envelope.class
--- a/build/classes/com/droidkit/actors/mailbox/Mailbox.class
+++ b/build/classes/com/droidkit/actors/mailbox/Mailbox.class
--- a/build/classes/com/droidkit/actors/mailbox/MailboxesQueue.class
+++ b/build/classes/com/droidkit/actors/mailbox/MailboxesQueue.class
--- a/build/classes/com/droidkit/actors/messages/DeadLetter.class
+++ b/build/classes/com/droidkit/actors/messages/DeadLetter.class
--- a/build/classes/com/droidkit/actors/messages/NamedMessage.class
+++ b/build/classes/com/droidkit/actors/messages/NamedMessage.class
--- a/build/classes/com/droidkit/actors/messages/PoisonPill.class
+++ b/build/classes/com/droidkit/actors/messages/PoisonPill.class
--- a/build/classes/com/droidkit/actors/messages/StartActor.class
+++ b/build/classes/com/droidkit/actors/messages/StartActor.class
--- a/build/classes/com/droidkit/actors/tasks/ActorAskImpl$1.class
+++ b/build/classes/com/droidkit/actors/tasks/ActorAskImpl$1.class
--- a/build/classes/com/droidkit/actors/tasks/ActorAskImpl$AskContainer.class
+++ b/build/classes/com/droidkit/actors/tasks/ActorAskImpl$AskContainer.class
--- a/build/classes/com/droidkit/actors/tasks/ActorAskImpl$CombineContainer.class
+++ b/build/classes/com/droidkit/actors/tasks/ActorAskImpl$CombineContainer.class
--- a/build/classes/com/droidkit/actors/tasks/ActorAskImpl.class
+++ b/build/classes/com/droidkit/actors/tasks/ActorAskImpl.class
--- a/build/classes/com/droidkit/actors/tasks/AskCallback.class
+++ b/build/classes/com/droidkit/actors/tasks/AskCallback.class
--- a/build/classes/com/droidkit/actors/tasks/AskCancelledException.class
+++ b/build/classes/com/droidkit/actors/tasks/AskCancelledException.class
--- a/build/classes/com/droidkit/actors/tasks/AskFuture.class
+++ b/build/classes/com/droidkit/actors/tasks/AskFuture.class
--- a/build/classes/com/droidkit/actors/tasks/AskTimeoutException.class
+++ b/build/classes/com/droidkit/actors/tasks/AskTimeoutException.class
--- a/build/classes/com/droidkit/actors/tasks/TaskActor$1.class
+++ b/build/classes/com/droidkit/actors/tasks/TaskActor$1.class
--- a/build/classes/com/droidkit/actors/tasks/TaskActor$Error.class
+++ b/build/classes/com/droidkit/actors/tasks/TaskActor$Error.class
--- a/build/classes/com/droidkit/actors/tasks/TaskActor$Result.class
+++ b/build/classes/com/droidkit/actors/tasks/TaskActor$Result.class
--- a/build/classes/com/droidkit/actors/tasks/TaskActor$TaskListener.class
+++ b/build/classes/com/droidkit/actors/tasks/TaskActor$TaskListener.class
--- a/build/classes/com/droidkit/actors/tasks/TaskActor.class
+++ b/build/classes/com/droidkit/actors/tasks/TaskActor.class
--- a/build/classes/com/droidkit/actors/tasks/messages/TaskCancel.class
+++ b/build/classes/com/droidkit/actors/tasks/messages/TaskCancel.class
--- a/build/classes/com/droidkit/actors/tasks/messages/TaskError.class
+++ b/build/classes/com/droidkit/actors/tasks/messages/TaskError.class
--- a/build/classes/com/droidkit/actors/tasks/messages/TaskRequest.class
+++ b/build/classes/com/droidkit/actors/tasks/messages/TaskRequest.class
--- a/build/classes/com/droidkit/actors/tasks/messages/TaskResult.class
+++ b/build/classes/com/droidkit/actors/tasks/messages/TaskResult.class
--- a/build/classes/com/droidkit/actors/tasks/messages/TaskTimeout.class
+++ b/build/classes/com/droidkit/actors/tasks/messages/TaskTimeout.class
--- a/build/classes/de/fabianonline/telegram_backup/Main$1.class
+++ b/build/classes/de/fabianonline/telegram_backup/Main$1.class
--- a/build/classes/de/fabianonline/telegram_backup/Main.class
+++ b/build/classes/de/fabianonline/telegram_backup/Main.class
--- a/build/classes/de/fabianonline/telegram_backup/MyStorage.class
+++ b/build/classes/de/fabianonline/telegram_backup/MyStorage.class
--- a/build/classes/org/telegram/api/engine/ApiCallback.class
+++ b/build/classes/org/telegram/api/engine/ApiCallback.class
--- a/build/classes/org/telegram/api/engine/AppInfo.class
+++ b/build/classes/org/telegram/api/engine/AppInfo.class
--- a/build/classes/org/telegram/api/engine/GzipRequest.class
+++ b/build/classes/org/telegram/api/engine/GzipRequest.class
--- a/build/classes/org/telegram/api/engine/Logger.class
+++ b/build/classes/org/telegram/api/engine/Logger.class
--- a/build/classes/org/telegram/api/engine/LoggerInterface.class
+++ b/build/classes/org/telegram/api/engine/LoggerInterface.class
--- a/build/classes/org/telegram/api/engine/RpcCallback.class
+++ b/build/classes/org/telegram/api/engine/RpcCallback.class
--- a/build/classes/org/telegram/api/engine/RpcCallbackEx.class
+++ b/build/classes/org/telegram/api/engine/RpcCallbackEx.class
--- a/build/classes/org/telegram/api/engine/RpcException.class
+++ b/build/classes/org/telegram/api/engine/RpcException.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$1.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$1.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$2.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$2.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$1.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$1.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$2.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$2.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$3.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$3.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$4.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread$4.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ConnectionThread.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$ProtoCallback.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$ProtoCallback.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$RpcCallbackWrapper.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$RpcCallbackWrapper.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$SenderThread.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$SenderThread.class
--- a/build/classes/org/telegram/api/engine/TelegramApi$TimeoutThread.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi$TimeoutThread.class
--- a/build/classes/org/telegram/api/engine/TelegramApi.class
+++ b/build/classes/org/telegram/api/engine/TelegramApi.class
--- a/build/classes/org/telegram/api/engine/TimeoutException.class
+++ b/build/classes/org/telegram/api/engine/TimeoutException.class
--- a/build/classes/org/telegram/api/engine/file/DownloadListener.class
+++ b/build/classes/org/telegram/api/engine/file/DownloadListener.class
--- a/build/classes/org/telegram/api/engine/file/Downloader$1.class
+++ b/build/classes/org/telegram/api/engine/file/Downloader$1.class
--- a/build/classes/org/telegram/api/engine/file/Downloader$DownloadBlock.class
+++ b/build/classes/org/telegram/api/engine/file/Downloader$DownloadBlock.class
--- a/build/classes/org/telegram/api/engine/file/Downloader$DownloadFileThread.class
+++ b/build/classes/org/telegram/api/engine/file/Downloader$DownloadFileThread.class
--- a/build/classes/org/telegram/api/engine/file/Downloader$DownloadTask.class
+++ b/build/classes/org/telegram/api/engine/file/Downloader$DownloadTask.class
--- a/build/classes/org/telegram/api/engine/file/Downloader.class
+++ b/build/classes/org/telegram/api/engine/file/Downloader.class
--- a/build/classes/org/telegram/api/engine/file/UploadListener.class
+++ b/build/classes/org/telegram/api/engine/file/UploadListener.class
--- a/build/classes/org/telegram/api/engine/file/Uploader$1.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader$1.class
--- a/build/classes/org/telegram/api/engine/file/Uploader$UploadBlock.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader$UploadBlock.class
--- a/build/classes/org/telegram/api/engine/file/Uploader$UploadFileThread.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader$UploadFileThread.class
--- a/build/classes/org/telegram/api/engine/file/Uploader$UploadResult.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader$UploadResult.class
--- a/build/classes/org/telegram/api/engine/file/Uploader$UploadTask.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader$UploadTask.class
--- a/build/classes/org/telegram/api/engine/file/Uploader.class
+++ b/build/classes/org/telegram/api/engine/file/Uploader.class
--- a/build/classes/org/telegram/api/engine/storage/AbsApiState.class
+++ b/build/classes/org/telegram/api/engine/storage/AbsApiState.class
--- a/build/classes/org/telegram/mtproto/CallWrapper.class
+++ b/build/classes/org/telegram/mtproto/CallWrapper.class
--- a/build/classes/org/telegram/mtproto/MTProto$1.class
+++ b/build/classes/org/telegram/mtproto/MTProto$1.class
--- a/build/classes/org/telegram/mtproto/MTProto$2.class
+++ b/build/classes/org/telegram/mtproto/MTProto$2.class
--- a/build/classes/org/telegram/mtproto/MTProto$3.class
+++ b/build/classes/org/telegram/mtproto/MTProto$3.class
--- a/build/classes/org/telegram/mtproto/MTProto$InternalActionsActor.class
+++ b/build/classes/org/telegram/mtproto/MTProto$InternalActionsActor.class
--- a/build/classes/org/telegram/mtproto/MTProto$RequestPingDelay.class
+++ b/build/classes/org/telegram/mtproto/MTProto$RequestPingDelay.class
--- a/build/classes/org/telegram/mtproto/MTProto$RequestSalt.class
+++ b/build/classes/org/telegram/mtproto/MTProto$RequestSalt.class
--- a/build/classes/org/telegram/mtproto/MTProto$ResponseActor.class
+++ b/build/classes/org/telegram/mtproto/MTProto$ResponseActor.class
--- a/Show More
+++ b/Show More