procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
John Preston 2016-12-30 17:50:59 +04:00
parent 2e4426aac0 19b77ee4ac
commit b2414939c9
14 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitattributes vendored Normal file
View File

@ -0,0 +1,5 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Ensure diffs have LF endings
*.diff text eol=lf

3
README.md
View File

@ -2,6 +2,7 @@
This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol. This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol.
[![GitHub version](https://badge.fury.io/gh/telegramdesktop%2Ftdesktop.svg)](https://badge.fury.io/gh/telegramdesktop%2Ftdesktop)
[![Build Status](https://travis-ci.org/telegramdesktop/tdesktop.svg?branch=master)](https://travis-ci.org/telegramdesktop/tdesktop) [![Build Status](https://travis-ci.org/telegramdesktop/tdesktop.svg?branch=master)](https://travis-ci.org/telegramdesktop/tdesktop)
The source code is published under GPLv3 with OpenSSL exception, the license is available [here][license]. The source code is published under GPLv3 with OpenSSL exception, the license is available [here][license].
@ -12,7 +13,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* Mac OS X 10.8 - Mac OS X 10.11 * Mac OS X 10.8 - Mac OS X 10.11
* Mac OS X 10.6 - Mac OS X 10.7 (separate build) * Mac OS X 10.6 - Mac OS X 10.7 (separate build)
* Ubuntu 12.04 - Ubuntu 16.04 * Ubuntu 12.04 - Ubuntu 16.04
* Fedora 22 * Fedora 22 - Fedora 24
## Third-party ## Third-party

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,0 FILEVERSION 0,10,20,0
PRODUCTVERSION 0,10,19,0 PRODUCTVERSION 0,10,20,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.19.0" VALUE "FileVersion", "0.10.20.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.0" VALUE "ProductVersion", "0.10.20.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,0 FILEVERSION 0,10,20,0
PRODUCTVERSION 0,10,19,0 PRODUCTVERSION 0,10,20,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.19.0" VALUE "FileVersion", "0.10.20.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.0" VALUE "ProductVersion", "0.10.20.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

3
Telegram/SourceFiles/boxes/addcontactbox.cpp
View File

@ -560,6 +560,9 @@ void GroupInfoBox::notifyFileQueryUpdated(const FileDialog::QueryUpdate &update)
return; return;
} }
_setPhotoFileQueryId = 0; _setPhotoFileQueryId = 0;
if (update.remoteContent.isEmpty() && update.filePaths.isEmpty()) {
return;
}
QImage img; QImage img;
if (!update.remoteContent.isEmpty()) { if (!update.remoteContent.isEmpty()) {

4
Telegram/SourceFiles/core/version.h
View File

@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10019; constexpr int AppVersion = 10020;
constexpr str_const AppVersionStr = "0.10.19"; constexpr str_const AppVersionStr = "0.10.20";
constexpr bool AppAlphaVersion = false; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

4
Telegram/SourceFiles/mainwidget.cpp
View File

@ -723,6 +723,10 @@ void MainWidget::shareContactLayer(UserData *contact) {
} }
void MainWidget::shareUrlLayer(const QString &url, const QString &text) { void MainWidget::shareUrlLayer(const QString &url, const QString &text) {
// Don't allow to insert an inline bot query by share url link.
if (url.trimmed().startsWith('@')) {
return;
}
hiderLayer(new HistoryHider(this, url, text)); hiderLayer(new HistoryHider(this, url, text));
} }

22
Telegram/SourceFiles/media/media_clip_ffmpeg.cpp
View File

@ -27,6 +27,11 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
namespace Media { namespace Media {
namespace Clip { namespace Clip {
namespace internal { namespace internal {
namespace {
constexpr int kSkipInvalidDataPackets = 10;
} // namespace
FFMpegReaderImplementation::FFMpegReaderImplementation(FileLocation *location, QByteArray *data, uint64 playId) : ReaderImplementation(location, data) FFMpegReaderImplementation::FFMpegReaderImplementation(FileLocation *location, QByteArray *data, uint64 playId) : ReaderImplementation(location, data)
, _playId(playId) { , _playId(playId) {
@ -54,6 +59,10 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
if (_mode == Mode::Normal) { if (_mode == Mode::Normal) {
return ReadResult::EndOfFile; return ReadResult::EndOfFile;
} }
if (!_hadFrame) {
LOG(("Gif Error: Got EOF before a single frame was read!"));
return ReadResult::Error;
}
if ((res = avformat_seek_file(_fmtContext, _streamId, std::numeric_limits<int64_t>::min(), 0, std::numeric_limits<int64_t>::max(), 0)) < 0) { if ((res = avformat_seek_file(_fmtContext, _streamId, std::numeric_limits<int64_t>::min(), 0, std::numeric_limits<int64_t>::max(), 0)) < 0) {
if ((res = av_seek_frame(_fmtContext, _streamId, 0, AVSEEK_FLAG_BYTE)) < 0) { if ((res = av_seek_frame(_fmtContext, _streamId, 0, AVSEEK_FLAG_BYTE)) < 0) {
@ -70,11 +79,12 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
_hadFrame = false; _hadFrame = false;
_frameMs = 0; _frameMs = 0;
_lastReadVideoMs = _lastReadAudioMs = 0; _lastReadVideoMs = _lastReadAudioMs = 0;
_skippedInvalidDataPackets = 0;
continue; continue;
} else if (res != AVERROR(EAGAIN)) { } else if (res != AVERROR(EAGAIN)) {
char err[AV_ERROR_MAX_STRING_SIZE] = { 0 }; char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
LOG(("Audio Error: Unable to avcodec_receive_frame() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res))); LOG(("Gif Error: Unable to avcodec_receive_frame() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
return ReadResult::Error; return ReadResult::Error;
} }
@ -100,9 +110,11 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
finishPacket(); finishPacket();
char err[AV_ERROR_MAX_STRING_SIZE] = { 0 }; char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
LOG(("Audio Error: Unable to avcodec_send_packet() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res))); LOG(("Gif Error: Unable to avcodec_send_packet() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
if (res == AVERROR_INVALIDDATA) { if (res == AVERROR_INVALIDDATA) {
continue; // try to skip bad packet if (++_skippedInvalidDataPackets < kSkipInvalidDataPackets) {
continue; // try to skip bad packet
}
} }
return ReadResult::Error; return ReadResult::Error;
} }
@ -319,11 +331,11 @@ bool FFMpegReaderImplementation::start(Mode mode, int64 &positionMs) {
_codecContext = avcodec_alloc_context3(nullptr); _codecContext = avcodec_alloc_context3(nullptr);
if (!_codecContext) { if (!_codecContext) {
LOG(("Audio Error: Unable to avcodec_alloc_context3 %1").arg(logData())); LOG(("Gif Error: Unable to avcodec_alloc_context3 %1").arg(logData()));
return false; return false;
} }
if ((res = avcodec_parameters_to_context(_codecContext, _fmtContext->streams[_streamId]->codecpar)) < 0) { if ((res = avcodec_parameters_to_context(_codecContext, _fmtContext->streams[_streamId]->codecpar)) < 0) {
LOG(("Audio Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res))); LOG(("Gif Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
return false; return false;
} }
av_codec_set_pkt_timebase(_codecContext, _fmtContext->streams[_streamId]->time_base); av_codec_set_pkt_timebase(_codecContext, _fmtContext->streams[_streamId]->time_base);

1
Telegram/SourceFiles/media/media_clip_ffmpeg.h
View File

@ -103,6 +103,7 @@ private:
bool _opened = false; bool _opened = false;
bool _hadFrame = false; bool _hadFrame = false;
bool _frameRead = false; bool _frameRead = false;
int _skippedInvalidDataPackets = 0;
int _audioStreamId = -1; int _audioStreamId = -1;
uint64 _playId = 0; uint64 _playId = 0;

2
Telegram/SourceFiles/platform/linux/linux_libs.cpp
View File

@ -271,7 +271,7 @@ void start() {
} }
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
if (QString(getenv("XDG_CURRENT_DESKTOP")).toLower() == qstr("unity")) { if (QString(getenv("XDG_CURRENT_DESKTOP")).toLower().split(':').contains(qstr("unity"))) {
QLibrary lib_unity(qstr("unity"), 9, 0); QLibrary lib_unity(qstr("unity"), 9, 0);
loadLibrary(lib_unity, "unity", 9); loadLibrary(lib_unity, "unity", 9);

6
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -368,9 +368,9 @@ bool MainWindow::psHasNativeNotifications() {
} }
void MainWindow::LibsLoaded() { void MainWindow::LibsLoaded() {
QString cdesktop = QString(getenv("XDG_CURRENT_DESKTOP")).toLower(); QStringList cdesktop = QString(getenv("XDG_CURRENT_DESKTOP")).toLower().split(':');
noQtTrayIcon = (cdesktop == qstr("pantheon")) || (cdesktop == qstr("gnome")); noQtTrayIcon = (cdesktop.contains(qstr("pantheon"))) || (cdesktop.contains(qstr("gnome")));
tryAppIndicator = (cdesktop == qstr("xfce")); tryAppIndicator = cdesktop.contains(qstr("xfce"));
if (noQtTrayIcon) cSetSupportTray(false); if (noQtTrayIcon) cSetSupportTray(false);

2
Telegram/build/build.bat
View File

@ -176,7 +176,7 @@ echo .
echo Version %AppVersionStrFull% is ready for deploy! echo Version %AppVersionStrFull% is ready for deploy!
echo . echo .
set "FinalReleasePath=Z:\TBuild\tother\tsetup" set "FinalReleasePath=Y:\TBuild\tother\tsetup"
set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%" set "FinalDeployPath=%FinalReleasePath%\%AppVersionStrMajor%\%AppVersionStrFull%"
if not exist "%DeployPath%\%UpdateFile%" goto error if not exist "%DeployPath%\%UpdateFile%" goto error

6
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 10019 AppVersion 10020
AppVersionStrMajor 0.10 AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.19 AppVersionStrSmall 0.10.20
AppVersionStr 0.10.19 AppVersionStr 0.10.20
AlphaChannel 0 AlphaChannel 0
BetaVersion 0 BetaVersion 0

1
Telegram/gyp/refresh.sh
View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
set -e set -e
FullExecPath=$PWD FullExecPath=$PWD
pushd `dirname $0` > /dev/null pushd `dirname $0` > /dev/null