Skip to content

A
apk
Commit 91ae97e2 authored by DrKLO's avatar DrKLO
Browse files
Options

Broadcasts, updated gif lib, blur image\video preview 

Note: untested, don’t upload to market
parent e5cb3685
Show whitespace changes
Inline Side-by-side
Showing with 1466 additions and 807 deletions
TMessagesProj/build.gradle
View file @ 91ae97e2
...@@ -83,7 +83,7 @@ android { ...@@ -83,7 +83,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 290 versionCode 291
versionName "1.6.2" versionName "1.7.0"
} }
} }
TMessagesProj/jni/Android.mk
View file @ 91ae97e2
...@@ -8,6 +8,7 @@ LOCAL_CFLAGS += -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA ...@@ -8,6 +8,7 @@ LOCAL_CFLAGS += -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA
LOCAL_CFLAGS += -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT LOCAL_CFLAGS += -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT
LOCAL_CPPFLAGS := -DBSD=1 -ffast-math -O2 -funroll-loops LOCAL_CPPFLAGS := -DBSD=1 -ffast-math -O2 -funroll-loops
#LOCAL_LDLIBS := -llog #LOCAL_LDLIBS := -llog
LOCAL_LDLIBS := -ljnigraphics
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
./opus/src/opus.c \ ./opus/src/opus.c \
......
TMessagesProj/jni/gif.c
View file @ 91ae97e2
//tanks to https://github.com/koral--/android-gif-drawable //thanks to https://github.com/koral--/android-gif-drawable
/* /*
MIT License MIT License
Copyright (c) Copyright (c)
...@@ -73,7 +73,7 @@ typedef struct { ...@@ -73,7 +73,7 @@ typedef struct {
typedef struct { typedef struct {
unsigned int duration; unsigned int duration;
short transpIndex; int transpIndex;
unsigned char disposalMethod; unsigned char disposalMethod;
} FrameInfo; } FrameInfo;
...@@ -132,8 +132,9 @@ static int fileRewindFun(GifInfo *info) { ...@@ -132,8 +132,9 @@ static int fileRewindFun(GifInfo *info) {
static unsigned long getRealTime() { static unsigned long getRealTime() {
struct timespec ts; struct timespec ts;
const clockid_t id = CLOCK_MONOTONIC; const clockid_t id = CLOCK_MONOTONIC;
if (id != (clockid_t) - 1 && clock_gettime(id, &ts) != -1) if (id != (clockid_t) - 1 && clock_gettime(id, &ts) != -1) {
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
}
return -1; return -1;
} }
...@@ -195,7 +196,7 @@ static void packARGB32(argb *pixel, GifByteType alpha, GifByteType red, GifByteT ...@@ -195,7 +196,7 @@ static void packARGB32(argb *pixel, GifByteType alpha, GifByteType red, GifByteT
} }
static void getColorFromTable(int idx, argb *dst, const ColorMapObject *cmap) { static void getColorFromTable(int idx, argb *dst, const ColorMapObject *cmap) {
char colIdx = idx >= cmap->ColorCount ? 0 : idx; int colIdx = (idx >= cmap->ColorCount) ? 0 : idx;
GifColorType *col = &cmap->Colors[colIdx]; GifColorType *col = &cmap->Colors[colIdx];
packARGB32(dst, 0xFF, col->Red, col->Green, col->Blue); packARGB32(dst, 0xFF, col->Red, col->Green, col->Blue);
} }
...@@ -218,7 +219,7 @@ static inline bool setupBackupBmp(GifInfo *info, short transpIndex) { ...@@ -218,7 +219,7 @@ static inline bool setupBackupBmp(GifInfo *info, short transpIndex) {
if (transpIndex == -1) { if (transpIndex == -1) {
getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap); getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap);
} else { } else {
packARGB32(&paintingColor,0,0,0,0); packARGB32(&paintingColor, 0, 0, 0, 0);
} }
eraseColor(info->backupPtr, fGIF->SWidth, fGIF->SHeight, paintingColor); eraseColor(info->backupPtr, fGIF->SWidth, fGIF->SHeight, paintingColor);
return true; return true;
...@@ -231,14 +232,15 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info) ...@@ -231,14 +232,15 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info)
if (ExtFunction == GRAPHICS_EXT_FUNC_CODE && ExtData[0] == 4) { if (ExtFunction == GRAPHICS_EXT_FUNC_CODE && ExtData[0] == 4) {
FrameInfo *fi = &info->infos[info->gifFilePtr->ImageCount]; FrameInfo *fi = &info->infos[info->gifFilePtr->ImageCount];
fi->transpIndex = -1; fi->transpIndex = -1;
char *b = (char *)ExtData + 1; char *b = (char*) ExtData + 1;
short delay = ((b[2] << 8) | b[1]); short delay = ((b[2] << 8) | b[1]);
fi->duration = delay > 1 ? delay * 10 : 100; fi->duration = delay > 1 ? delay * 10 : 100;
fi->disposalMethod = ((b[0] >> 2) & 7); fi->disposalMethod = ((b[0] >> 2) & 7);
if (ExtData[1] & 1) if (ExtData[1] & 1) {
fi->transpIndex = (short) b[3]; fi->transpIndex = 0xff & b[3];
}
if (fi->disposalMethod == 3 && info->backupPtr == NULL) { if (fi->disposalMethod == 3 && info->backupPtr == NULL) {
if (!setupBackupBmp(info,fi->transpIndex)) { if (!setupBackupBmp(info, fi->transpIndex)) {
return GIF_ERROR; return GIF_ERROR;
} }
} }
...@@ -260,7 +262,7 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info) ...@@ -260,7 +262,7 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info)
return GIF_OK; return GIF_OK;
} }
static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) { static int DDGifSlurp(GifFileType *GifFile, GifInfo* info, bool shouldDecode) {
GifRecordType RecordType; GifRecordType RecordType;
GifByteType *ExtData; GifByteType *ExtData;
int codeSize; int codeSize;
...@@ -268,12 +270,13 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) { ...@@ -268,12 +270,13 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
size_t ImageSize; size_t ImageSize;
do { do {
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) { if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
switch (RecordType) { switch (RecordType) {
case IMAGE_DESC_RECORD_TYPE: { case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(GifFile, !shouldDecode) == GIF_ERROR) { if (DGifGetImageDesc(GifFile, !shouldDecode) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
int i = shouldDecode ? info->currentIndex : GifFile->ImageCount - 1; int i = shouldDecode ? info->currentIndex : GifFile->ImageCount - 1;
SavedImage *sp = &GifFile->SavedImages[i]; SavedImage *sp = &GifFile->SavedImages[i];
...@@ -302,12 +305,13 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) { ...@@ -302,12 +305,13 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
} }
} else { } else {
if (DGifGetLine(GifFile, sp->RasterBits, ImageSize) == GIF_ERROR) { if (DGifGetLine(GifFile, sp->RasterBits, ImageSize) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
} }
if (info->currentIndex >= GifFile->ImageCount - 1) { if (info->currentIndex >= GifFile->ImageCount - 1) {
if (info->loopCount > 0) if (info->loopCount > 0) {
info->currentLoop++; info->currentLoop++;
}
if (fileRewindFun(info) != 0) { if (fileRewindFun(info) != 0) {
info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED; info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED;
return GIF_ERROR; return GIF_ERROR;
...@@ -316,31 +320,34 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) { ...@@ -316,31 +320,34 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
return GIF_OK; return GIF_OK;
} else { } else {
if (DGifGetCode(GifFile, &codeSize, &ExtData) == GIF_ERROR) { if (DGifGetCode(GifFile, &codeSize, &ExtData) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
while (ExtData) { while (ExtData != NULL) {
if (DGifGetCodeNext(GifFile, &ExtData) == GIF_ERROR) { if (DGifGetCodeNext(GifFile, &ExtData) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
} }
} }
break; break;
}
case EXTENSION_RECORD_TYPE: { case EXTENSION_RECORD_TYPE:
if (DGifGetExtension(GifFile, &ExtFunction, &ExtData) == GIF_ERROR) { if (DGifGetExtension(GifFile, &ExtFunction, &ExtData) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
if (!shouldDecode) { if (!shouldDecode) {
info->infos = realloc(info->infos, (GifFile->ImageCount + 1) * sizeof(FrameInfo)); FrameInfo *tmpInfos = realloc(info->infos, (GifFile->ImageCount + 1) * sizeof(FrameInfo));
if (tmpInfos == NULL) {
return GIF_ERROR;
}
info->infos = tmpInfos;
if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) { if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
return GIF_ERROR; return GIF_ERROR;
} }
} }
while (ExtData) { while (ExtData != NULL) {
if (DGifGetExtensionNext(GifFile, &ExtData, &ExtFunction) == GIF_ERROR) { if (DGifGetExtensionNext(GifFile, &ExtData, &ExtFunction) == GIF_ERROR) {
return GIF_ERROR; return (GIF_ERROR);
} }
if (!shouldDecode) { if (!shouldDecode) {
if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) { if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
...@@ -349,22 +356,23 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) { ...@@ -349,22 +356,23 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
} }
} }
break; break;
}
case TERMINATE_RECORD_TYPE: case TERMINATE_RECORD_TYPE:
break;
default: default:
break; break;
} }
} while (RecordType != TERMINATE_RECORD_TYPE); } while (RecordType != TERMINATE_RECORD_TYPE);
bool ok = true; bool ok = true;
if (shouldDecode) { if (shouldDecode) {
ok = (fileRewindFun(info) == 0); ok = (fileRewindFun(info) == 0);
} }
if (ok) { if (ok) {
return GIF_OK; return (GIF_OK);
} else { } else {
info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED; info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED;
return GIF_ERROR; return (GIF_ERROR);
} }
} }
...@@ -381,7 +389,7 @@ static argb *getAddr(argb *bm, int width, int left, int top) { ...@@ -381,7 +389,7 @@ static argb *getAddr(argb *bm, int width, int left, int top) {
} }
static void blitNormal(argb *bm, int width, int height, const SavedImage *frame, const ColorMapObject *cmap, int transparent) { static void blitNormal(argb *bm, int width, int height, const SavedImage *frame, const ColorMapObject *cmap, int transparent) {
const unsigned char *src = (unsigned char *)frame->RasterBits; const unsigned char* src = (unsigned char*) frame->RasterBits;
argb *dst = getAddr(bm, width, frame->ImageDesc.Left, frame->ImageDesc.Top); argb *dst = getAddr(bm, width, frame->ImageDesc.Left, frame->ImageDesc.Top);
GifWord copyWidth = frame->ImageDesc.Width; GifWord copyWidth = frame->ImageDesc.Width;
if (frame->ImageDesc.Left + copyWidth > width) { if (frame->ImageDesc.Left + copyWidth > width) {
...@@ -393,9 +401,6 @@ static void blitNormal(argb *bm, int width, int height, const SavedImage *frame, ...@@ -393,9 +401,6 @@ static void blitNormal(argb *bm, int width, int height, const SavedImage *frame,
copyHeight = height - frame->ImageDesc.Top; copyHeight = height - frame->ImageDesc.Top;
} }
int srcPad, dstPad;
dstPad = width - copyWidth;
srcPad = frame->ImageDesc.Width - copyWidth;
for (; copyHeight > 0; copyHeight--) { for (; copyHeight > 0; copyHeight--) {
copyLine(dst, src, cmap, transparent, copyWidth); copyLine(dst, src, cmap, transparent, copyWidth);
src += frame->ImageDesc.Width; src += frame->ImageDesc.Width;
...@@ -404,7 +409,7 @@ static void blitNormal(argb *bm, int width, int height, const SavedImage *frame, ...@@ -404,7 +409,7 @@ static void blitNormal(argb *bm, int width, int height, const SavedImage *frame,
} }
static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord top, GifWord width, GifWord height, argb col) { static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord top, GifWord width, GifWord height, argb col) {
uint32_t *dst = (uint32_t *)getAddr(bm, bmWidth, left, top); uint32_t* dst = (uint32_t*) getAddr(bm, bmWidth, left, top);
GifWord copyWidth = width; GifWord copyWidth = width;
if (left + copyWidth > bmWidth) { if (left + copyWidth > bmWidth) {
copyWidth = bmWidth - left; copyWidth = bmWidth - left;
...@@ -414,7 +419,7 @@ static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord ...@@ -414,7 +419,7 @@ static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord
if (top + copyHeight > bmHeight) { if (top + copyHeight > bmHeight) {
copyHeight = bmHeight - top; copyHeight = bmHeight - top;
} }
uint32_t *pColor = (uint32_t *)(&col); uint32_t* pColor = (uint32_t *) (&col);
for (; copyHeight > 0; copyHeight--) { for (; copyHeight > 0; copyHeight--) {
memset(dst, *pColor, copyWidth * sizeof(argb)); memset(dst, *pColor, copyWidth * sizeof(argb));
dst += bmWidth; dst += bmWidth;
...@@ -424,12 +429,11 @@ static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord ...@@ -424,12 +429,11 @@ static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord
static void drawFrame(argb *bm, int bmWidth, int bmHeight, const SavedImage *frame, const ColorMapObject *cmap, short transpIndex) { static void drawFrame(argb *bm, int bmWidth, int bmHeight, const SavedImage *frame, const ColorMapObject *cmap, short transpIndex) {
if (frame->ImageDesc.ColorMap != NULL) { if (frame->ImageDesc.ColorMap != NULL) {
cmap = frame->ImageDesc.ColorMap; cmap = frame->ImageDesc.ColorMap;
if (cmap == NULL || cmap->ColorCount != (1 << cmap->BitsPerPixel)) { if (cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
cmap = defaultCmap; cmap = defaultCmap;
} }
} }
blitNormal(bm, bmWidth, bmHeight, frame, cmap, transpIndex);
blitNormal(bm, bmWidth, bmHeight, frame, cmap, (int) transpIndex);
} }
static bool checkIfCover(const SavedImage *target, const SavedImage *covered) { static bool checkIfCover(const SavedImage *target, const SavedImage *covered) {
...@@ -445,30 +449,28 @@ static bool checkIfCover(const SavedImage *target, const SavedImage *covered) { ...@@ -445,30 +449,28 @@ static bool checkIfCover(const SavedImage *target, const SavedImage *covered) {
} }
static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info, unsigned int idx) { static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info, unsigned int idx) {
argb *backup = info->backupPtr; argb* backup = info->backupPtr;
argb color; argb color;
packARGB32(&color, 0, 0, 0, 0); packARGB32(&color, 0, 0, 0, 0);
GifFileType *fGif = info->gifFilePtr; GifFileType *fGif = info->gifFilePtr;
SavedImage *cur = &fGif->SavedImages[idx - 1]; SavedImage* cur = &fGif->SavedImages[idx - 1];
SavedImage *next = &fGif->SavedImages[idx]; SavedImage* next = &fGif->SavedImages[idx];
bool curTrans = info->infos[idx - 1].transpIndex != -1; bool curTrans = info->infos[idx - 1].transpIndex != -1;
int curDisposal = info->infos[idx - 1].disposalMethod; int curDisposal = info->infos[idx - 1].disposalMethod;
bool nextTrans = info->infos[idx].transpIndex != -1; bool nextTrans = info->infos[idx].transpIndex != -1;
int nextDisposal = info->infos[idx].disposalMethod; int nextDisposal = info->infos[idx].disposalMethod;
argb *tmp; argb *tmp;
if ((curDisposal == 2 || curDisposal == 3) && (nextTrans || !checkIfCover(next, cur))) { if ((curDisposal == 2 || curDisposal == 3) && (nextTrans || !checkIfCover(next, cur))) {
switch (curDisposal) { switch (curDisposal) {
case 2: { case 2:
fillRect(bm, fGif->SWidth, fGif->SHeight, cur->ImageDesc.Left, cur->ImageDesc.Top, cur->ImageDesc.Width, cur->ImageDesc.Height, color); fillRect(bm, fGif->SWidth, fGif->SHeight, cur->ImageDesc.Left, cur->ImageDesc.Top, cur->ImageDesc.Width, cur->ImageDesc.Height, color);
}
break; break;
case 3: { case 3:
tmp = bm; tmp = bm;
bm = backup; bm = backup;
backup = tmp; backup = tmp;
}
break; break;
} }
} }
...@@ -478,27 +480,25 @@ static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info, unsigned int id ...@@ -478,27 +480,25 @@ static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info, unsigned int id
} }
} }
static jboolean reset(GifInfo *info) { static void reset(GifInfo *info) {
if (fileRewindFun(info) != 0) { if (fileRewindFun(info) != 0) {
return JNI_FALSE; return;
} }
info->nextStartTime = 0; info->nextStartTime = 0;
info->currentLoop = -1; info->currentLoop = -1;
info->currentIndex = -1; info->currentIndex = -1;
return JNI_TRUE;
} }
static void getBitmap(argb *bm, GifInfo *info) { static void getBitmap(argb *bm, GifInfo *info) {
GifFileType *fGIF = info->gifFilePtr; GifFileType* fGIF = info->gifFilePtr;
argb paintingColor; argb paintingColor;
int i = info->currentIndex; int i = info->currentIndex;
if (DDGifSlurp(fGIF, info, true) == GIF_ERROR) { if (DDGifSlurp(fGIF, info, true) == GIF_ERROR) {
return; //TODO add leniency support return;
} }
SavedImage *cur = &fGIF->SavedImages[i]; SavedImage* cur = &fGIF->SavedImages[i];
int transpIndex = info->infos[i].transpIndex;
short transpIndex = info->infos[i].transpIndex;
if (i == 0) { if (i == 0) {
if (transpIndex == -1) { if (transpIndex == -1) {
getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap); getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap);
...@@ -513,11 +513,14 @@ static void getBitmap(argb *bm, GifInfo *info) { ...@@ -513,11 +513,14 @@ static void getBitmap(argb *bm, GifInfo *info) {
} }
static void setMetaData(int width, int height, int ImageCount, int errorCode, JNIEnv *env, jintArray metaData) { static void setMetaData(int width, int height, int ImageCount, int errorCode, JNIEnv *env, jintArray metaData) {
jint *ints = (*env)->GetIntArrayElements(env, metaData, 0); jint *const ints = (*env)->GetIntArrayElements(env, metaData, 0);
*ints++ = width; if (ints == NULL) {
*ints++ = height; return;
*ints++ = ImageCount; }
*ints = errorCode; ints[0] = width;
ints[1] = height;
ints[2] = ImageCount;
ints[3] = errorCode;
(*env)->ReleaseIntArrayElements(env, metaData, ints, 0); (*env)->ReleaseIntArrayElements(env, metaData, ints, 0);
} }
...@@ -554,9 +557,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j ...@@ -554,9 +557,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j
info->speedFactor = 1.0; info->speedFactor = 1.0;
info->rasterBits = calloc(GifFileIn->SHeight * GifFileIn->SWidth, sizeof(GifPixelType)); info->rasterBits = calloc(GifFileIn->SHeight * GifFileIn->SWidth, sizeof(GifPixelType));
info->infos = malloc(sizeof(FrameInfo)); info->infos = malloc(sizeof(FrameInfo));
info->infos->duration = 0;
info->infos->disposalMethod = 0;
info->infos->transpIndex = -1;
info->backupPtr = NULL; info->backupPtr = NULL;
if (info->rasterBits == NULL || info->infos == NULL) { if (info->rasterBits == NULL || info->infos == NULL) {
...@@ -564,15 +564,18 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j ...@@ -564,15 +564,18 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j
setMetaData(width, height, 0, D_GIF_ERR_NOT_ENOUGH_MEM, env, metaData); setMetaData(width, height, 0, D_GIF_ERR_NOT_ENOUGH_MEM, env, metaData);
return (jint) NULL; return (jint) NULL;
} }
info->infos->duration = 0;
if (DDGifSlurp(GifFileIn, info, false) == GIF_ERROR) { info->infos->disposalMethod = 0;
Error = GifFileIn->Error; info->infos->transpIndex = -1;
}
if (GifFileIn->SColorMap == NULL || GifFileIn->SColorMap->ColorCount != (1 << GifFileIn->SColorMap->BitsPerPixel)) { if (GifFileIn->SColorMap == NULL || GifFileIn->SColorMap->ColorCount != (1 << GifFileIn->SColorMap->BitsPerPixel)) {
GifFreeMapObject(GifFileIn->SColorMap); GifFreeMapObject(GifFileIn->SColorMap);
GifFileIn->SColorMap = defaultCmap; GifFileIn->SColorMap = defaultCmap;
} }
DDGifSlurp(GifFileIn, info, false);
int imgCount = GifFileIn->ImageCount; int imgCount = GifFileIn->ImageCount;
if (imgCount < 1) { if (imgCount < 1) {
Error = D_GIF_ERR_NO_FRAMES; Error = D_GIF_ERR_NO_FRAMES;
} }
...@@ -583,7 +586,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j ...@@ -583,7 +586,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j
cleanUp(info); cleanUp(info);
} }
setMetaData(width, height, imgCount, Error, env, metaData); setMetaData(width, height, imgCount, Error, env, metaData);
return (jint)(Error == 0 ? info : NULL); return (jint)(Error == 0 ? info : NULL);
} }
...@@ -600,12 +602,12 @@ JNIEXPORT jlong JNICALL Java_org_telegram_ui_Views_GifDrawable_getAllocationByte ...@@ -600,12 +602,12 @@ JNIEXPORT jlong JNICALL Java_org_telegram_ui_Views_GifDrawable_getAllocationByte
return sum; return sum;
} }
JNIEXPORT jboolean JNICALL Java_org_telegram_ui_Views_GifDrawable_reset(JNIEnv *env, jclass class, jobject gifInfo) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_reset(JNIEnv *env, jclass class, jobject gifInfo) {
GifInfo *info = (GifInfo *)gifInfo; GifInfo *info = (GifInfo *)gifInfo;
if (info == NULL) { if (info == NULL) {
return JNI_FALSE; return;
} }
return reset(info); reset(info);
} }
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_setSpeedFactor(JNIEnv *env, jclass class, jobject gifInfo, jfloat factor) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_setSpeedFactor(JNIEnv *env, jclass class, jobject gifInfo, jfloat factor) {
...@@ -618,7 +620,7 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_setSpeedFactor(JNI ...@@ -618,7 +620,7 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_setSpeedFactor(JNI
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv *env, jclass class, jobject gifInfo, jint desiredPos, jintArray jPixels) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv *env, jclass class, jobject gifInfo, jint desiredPos, jintArray jPixels) {
GifInfo *info = (GifInfo *)gifInfo; GifInfo *info = (GifInfo *)gifInfo;
if (info == NULL) { if (info == NULL || jPixels == NULL) {
return; return;
} }
int imgCount = info->gifFilePtr->ImageCount; int imgCount = info->gifFilePtr->ImageCount;
...@@ -643,15 +645,19 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv ...@@ -643,15 +645,19 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv
if (i == imgCount - 1 && lastFrameRemainder > info->infos[i].duration) { if (i == imgCount - 1 && lastFrameRemainder > info->infos[i].duration) {
lastFrameRemainder = info->infos[i].duration; lastFrameRemainder = info->infos[i].duration;
} }
info->lastFrameReaminder = lastFrameRemainder;
if (i > info->currentIndex) { if (i > info->currentIndex) {
jint *pixels = (*env)->GetIntArrayElements(env, jPixels, 0); jint *const pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
if (pixels == NULL) {
return;
}
while (info->currentIndex <= i) { while (info->currentIndex <= i) {
info->currentIndex++; info->currentIndex++;
getBitmap((argb *)pixels, info); getBitmap((argb*) pixels, info);
} }
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0); (*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
} }
info->lastFrameReaminder = lastFrameRemainder;
if (info->speedFactor == 1.0) { if (info->speedFactor == 1.0) {
info->nextStartTime = getRealTime() + lastFrameRemainder; info->nextStartTime = getRealTime() + lastFrameRemainder;
} else { } else {
...@@ -661,7 +667,7 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv ...@@ -661,7 +667,7 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv *env, jclass class, jobject gifInfo, jint desiredIdx, jintArray jPixels) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv *env, jclass class, jobject gifInfo, jint desiredIdx, jintArray jPixels) {
GifInfo *info = (GifInfo *)gifInfo; GifInfo *info = (GifInfo *)gifInfo;
if (info == NULL) { if (info == NULL|| jPixels==NULL) {
return; return;
} }
if (desiredIdx <= info->currentIndex) { if (desiredIdx <= info->currentIndex) {
...@@ -673,15 +679,19 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv ...@@ -673,15 +679,19 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv
return; return;
} }
jint *const pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
if (pixels == NULL) {
return;
}
info->lastFrameReaminder = 0;
if (desiredIdx >= imgCount) { if (desiredIdx >= imgCount) {
desiredIdx = imgCount - 1; desiredIdx = imgCount - 1;
} }
info->lastFrameReaminder = 0;
jint *pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
while (info->currentIndex < desiredIdx) { while (info->currentIndex < desiredIdx) {
info->currentIndex++; info->currentIndex++;
getBitmap((argb *)pixels, info); getBitmap((argb *) pixels, info);
} }
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0); (*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
if (info->speedFactor == 1.0) { if (info->speedFactor == 1.0) {
...@@ -689,16 +699,13 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv ...@@ -689,16 +699,13 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv
} else { } else {
info->nextStartTime = getRealTime() + info->infos[info->currentIndex].duration * info->speedFactor; info->nextStartTime = getRealTime() + info->infos[info->currentIndex].duration * info->speedFactor;
} }
} }
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_renderFrame(JNIEnv *env, jclass class, jintArray jPixels, jobject gifInfo, jintArray metaData) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_renderFrame(JNIEnv *env, jclass class, jintArray jPixels, jobject gifInfo, jintArray metaData) {
GifInfo *info = (GifInfo *)gifInfo; GifInfo *info = (GifInfo *)gifInfo;
if (info == NULL) { if (info == NULL || jPixels == NULL) {
return; return;
} }
bool needRedraw = false; bool needRedraw = false;
unsigned long rt = getRealTime(); unsigned long rt = getRealTime();
...@@ -708,23 +715,39 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_renderFrame(JNIEnv ...@@ -708,23 +715,39 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_renderFrame(JNIEnv
} }
needRedraw = true; needRedraw = true;
} }
jint *rawMetaData = (*env)->GetIntArrayElements(env, metaData, 0); jint *const rawMetaData = (*env)->GetIntArrayElements(env, metaData, 0);
if (rawMetaData == NULL) {
return;
}
if (needRedraw) { if (needRedraw) {
jint *pixels = (*env)->GetIntArrayElements(env, jPixels, 0); jint *const pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
if (pixels == NULL) {
(*env)->ReleaseIntArrayElements(env, metaData, rawMetaData, 0);
return;
}
getBitmap((argb *)pixels, info); getBitmap((argb *)pixels, info);
rawMetaData[3] = info->gifFilePtr->Error; rawMetaData[3] = info->gifFilePtr->Error;
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0); (*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
unsigned int scaledDuration = info->infos[info->currentIndex].duration;
int scaledDuration = info->infos[info->currentIndex].duration;
if (info->speedFactor != 1.0) { if (info->speedFactor != 1.0) {
scaledDuration /= info->speedFactor; scaledDuration /= info->speedFactor;
if (scaledDuration<=0) {
scaledDuration=1;
} else if (scaledDuration > INT_MAX) {
scaledDuration = INT_MAX;
}
} }
info->nextStartTime = rt + scaledDuration; info->nextStartTime = rt + scaledDuration;
rawMetaData[4] = scaledDuration; rawMetaData[4] = scaledDuration;
} else { } else {
rawMetaData[4] = (int) (rt - info->nextStartTime); long delay = info->nextStartTime-rt;
if (delay < 0) {
rawMetaData[4] = -1;
} else {
rawMetaData[4] = (int) delay;
}
} }
(*env)->ReleaseIntArrayElements(env, metaData, rawMetaData, 0); (*env)->ReleaseIntArrayElements(env, metaData, rawMetaData, 0);
} }
...@@ -794,9 +817,6 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_saveRemainder(JNIE ...@@ -794,9 +817,6 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_saveRemainder(JNIE
return; return;
} }
info->lastFrameReaminder = getRealTime() - info->nextStartTime; info->lastFrameReaminder = getRealTime() - info->nextStartTime;
if (info->lastFrameReaminder > 0) {
info->lastFrameReaminder = 0;
}
} }
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_restoreRemainder(JNIEnv *env, jclass class, jobject gifInfo) { JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_restoreRemainder(JNIEnv *env, jclass class, jobject gifInfo) {
...@@ -814,7 +834,7 @@ JNIEXPORT jint JNICALL Java_org_telegram_ui_Views_GifDrawable_openFile(JNIEnv *e ...@@ -814,7 +834,7 @@ JNIEXPORT jint JNICALL Java_org_telegram_ui_Views_GifDrawable_openFile(JNIEnv *e
return (jint) NULL; return (jint) NULL;
} }
const char *fname = (*env)->GetStringUTFChars(env, jfname, 0); const char *const fname = (*env)->GetStringUTFChars(env, jfname, 0);
FILE *file = fopen(fname, "rb"); FILE *file = fopen(fname, "rb");
(*env)->ReleaseStringUTFChars(env, jfname, fname); (*env)->ReleaseStringUTFChars(env, jfname, fname);
if (file == NULL) { if (file == NULL) {
......
TMessagesProj/jni/image.c
View file @ 91ae97e2
...@@ -2,8 +2,101 @@ ...@@ -2,8 +2,101 @@
#include <stdio.h> #include <stdio.h>
#include <setjmp.h> #include <setjmp.h>
#include <libjpeg/jpeglib.h> #include <libjpeg/jpeglib.h>
#include <android/bitmap.h>
#include "utils.h" #include "utils.h"
static inline uint64_t get_colors (const uint8_t *p) {
return p[0] + (p[1] << 16) + ((uint64_t)p[2] << 32);
}
static void fastBlur(int imageWidth, int imageHeight, int imageStride, void *pixels) {
uint8_t *pix = (uint8_t *)pixels;
const int w = imageWidth;
const int h = imageHeight;
const int stride = imageStride;
const int radius = 3;
const int r1 = radius + 1;
const int div = radius * 2 + 1;
if (radius > 15 || div >= w || div >= h) {
return;
}
uint64_t rgb[imageStride * imageHeight];
int x, y, i;
int yw = 0;
const int we = w - r1;
for (y = 0; y < h; y++) {
uint64_t cur = get_colors (&pix[yw]);
uint64_t rgballsum = -radius * cur;
uint64_t rgbsum = cur * ((r1 * (r1 + 1)) >> 1);
for (i = 1; i <= radius; i++) {
uint64_t cur = get_colors (&pix[yw + i * 4]);
rgbsum += cur * (r1 - i);
rgballsum += cur;
}
x = 0;
#define update(start, middle, end) \
rgb[y * w + x] = (rgbsum >> 4) & 0x00FF00FF00FF00FFLL; \
rgballsum += get_colors (&pix[yw + (start) * 4]) - 2 * get_colors (&pix[yw + (middle) * 4]) + get_colors (&pix[yw + (end) * 4]); \
rgbsum += rgballsum; \
x++; \
while (x < r1) {
update (0, x, x + r1);
}
while (x < we) {
update (x - r1, x, x + r1);
}
while (x < w) {
update (x - r1, x, w - 1);
}
#undef update
yw += stride;
}
const int he = h - r1;
for (x = 0; x < w; x++) {
uint64_t rgballsum = -radius * rgb[x];
uint64_t rgbsum = rgb[x] * ((r1 * (r1 + 1)) >> 1);
for (i = 1; i <= radius; i++) {
rgbsum += rgb[i * w + x] * (r1 - i);
rgballsum += rgb[i * w + x];
}
y = 0;
int yi = x * 4;
#define update(start, middle, end) \
int64_t res = rgbsum >> 4; \
pix[yi] = res; \
pix[yi + 1] = res >> 16; \
pix[yi + 2] = res >> 32; \
rgballsum += rgb[x + (start) * w] - 2 * rgb[x + (middle) * w] + rgb[x + (end) * w]; \
rgbsum += rgballsum; \
y++; \
yi += stride;
while (y < r1) {
update (0, y, y + r1);
}
while (y < he) {
update (y - r1, y, y + r1);
}
while (y < h) {
update (y - r1, y, h - 1);
}
#undef update
}
}
typedef struct my_error_mgr { typedef struct my_error_mgr {
struct jpeg_error_mgr pub; struct jpeg_error_mgr pub;
jmp_buf setjmp_buffer; jmp_buf setjmp_buffer;
...@@ -16,6 +109,15 @@ METHODDEF(void) my_error_exit(j_common_ptr cinfo) { ...@@ -16,6 +109,15 @@ METHODDEF(void) my_error_exit(j_common_ptr cinfo) {
longjmp(myerr->setjmp_buffer, 1); longjmp(myerr->setjmp_buffer, 1);
} }
JNIEXPORT void Java_org_telegram_messenger_Utilities_blurBitmap(JNIEnv *env, jclass class, jobject bitmap, int width, int height, int stride) {
void *pixels = 0;
if (AndroidBitmap_lockPixels(env, bitmap, &pixels) < 0) {
return;
}
fastBlur(width, height, stride, pixels);
AndroidBitmap_unlockPixels(env, bitmap);
}
JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jintArray bitmap, int scale, int format, int width, int height) { JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jintArray bitmap, int scale, int format, int width, int height) {
int i; int i;
......
TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
View file @ 91ae97e2
...@@ -93,6 +93,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -93,6 +93,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public boolean enableJoined = true; public boolean enableJoined = true;
public int fontSize = AndroidUtilities.dp(16); public int fontSize = AndroidUtilities.dp(16);
private TLRPC.ChatParticipants currentChatInfo = null;
private int chatParticipantsId = 0;
private class UserActionUpdates extends TLRPC.Updates { private class UserActionUpdates extends TLRPC.Updates {
} }
...@@ -118,7 +121,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -118,7 +121,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
private class DelayedMessage { private class DelayedMessage {
public TLRPC.TL_messages_sendMedia sendRequest; public TLObject sendRequest;
public TLRPC.TL_decryptedMessage sendEncryptedRequest; public TLRPC.TL_decryptedMessage sendEncryptedRequest;
public int type; public int type;
public String originalPath; public String originalPath;
...@@ -182,7 +185,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -182,7 +185,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
MessagesStorage storage = MessagesStorage.getInstance(); MessagesStorage storage = MessagesStorage.getInstance();
NotificationCenter.getInstance().addObserver(this, FileLoader.FileDidUpload); NotificationCenter.getInstance().addObserver(this, FileLoader.FileDidUpload);
NotificationCenter.getInstance().addObserver(this, FileLoader.FileDidFailUpload); NotificationCenter.getInstance().addObserver(this, FileLoader.FileDidFailUpload);
NotificationCenter.getInstance().addObserver(this, 10); NotificationCenter.getInstance().addObserver(this, chatInfoDidLoaded);
NotificationCenter.getInstance().addObserver(this, messageReceivedByServer);
addSupportUser(); addSupportUser();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
enableJoined = preferences.getBoolean("EnableContactJoined", true); enableJoined = preferences.getBoolean("EnableContactJoined", true);
...@@ -282,28 +286,35 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -282,28 +286,35 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (arr != null) { if (arr != null) {
for (int a = 0; a < arr.size(); a++) { for (int a = 0; a < arr.size(); a++) {
DelayedMessage message = arr.get(a); DelayedMessage message = arr.get(a);
if (file != null && message.sendRequest != null) { TLRPC.InputMedia media = null;
if (message.sendRequest instanceof TLRPC.TL_messages_sendMedia) {
media = ((TLRPC.TL_messages_sendMedia)message.sendRequest).media;
} else if (message.sendRequest instanceof TLRPC.TL_messages_sendBroadcast) {
media = ((TLRPC.TL_messages_sendBroadcast)message.sendRequest).media;
}
if (file != null && media != null) {
if (message.type == 0) { if (message.type == 0) {
message.sendRequest.media.file = file; media.file = file;
performSendMessageRequest(message.sendRequest, message.obj, message.originalPath); performSendMessageRequest(message.sendRequest, message.obj, message.originalPath);
} else if (message.type == 1) { } else if (message.type == 1) {
if (message.sendRequest.media.thumb == null) { if (media.thumb == null) {
message.sendRequest.media.thumb = file; media.thumb = file;
performSendDelayedMessage(message); performSendDelayedMessage(message);
} else { } else {
message.sendRequest.media.file = file; media.file = file;
performSendMessageRequest(message.sendRequest, message.obj, message.originalPath); performSendMessageRequest(message.sendRequest, message.obj, message.originalPath);
} }
} else if (message.type == 2) { } else if (message.type == 2) {
if (message.sendRequest.media.thumb == null && message.location != null) { if (media.thumb == null && message.location != null) {
message.sendRequest.media.thumb = file; media.thumb = file;
performSendDelayedMessage(message); performSendDelayedMessage(message);
} else { } else {
message.sendRequest.media.file = file; media.file = file;
performSendMessageRequest(message.sendRequest, message.obj, message.originalPath); performSendMessageRequest(message.sendRequest, message.obj, message.originalPath);
} }
} else if (message.type == 3) { } else if (message.type == 3) {
message.sendRequest.media.file = file; media.file = file;
performSendMessageRequest(message.sendRequest, message.obj, message.originalPath); performSendMessageRequest(message.sendRequest, message.obj, message.originalPath);
} }
arr.remove(a); arr.remove(a);
...@@ -380,6 +391,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -380,6 +391,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
} }
} else if (id == chatInfoDidLoaded) {
int chatId = (Integer)args[0];
if (chatParticipantsId == chatId) {
currentChatInfo = (TLRPC.ChatParticipants)args[1];
}
} }
} }
...@@ -388,6 +404,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -388,6 +404,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
super.finalize(); super.finalize();
NotificationCenter.getInstance().removeObserver(this, FileLoader.FileDidUpload); NotificationCenter.getInstance().removeObserver(this, FileLoader.FileDidUpload);
NotificationCenter.getInstance().removeObserver(this, FileLoader.FileDidFailUpload); NotificationCenter.getInstance().removeObserver(this, FileLoader.FileDidFailUpload);
NotificationCenter.getInstance().removeObserver(this, chatInfoDidLoaded);
NotificationCenter.getInstance().removeObserver(this, messageReceivedByServer); NotificationCenter.getInstance().removeObserver(this, messageReceivedByServer);
} }
...@@ -432,6 +449,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -432,6 +449,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
startingSecretChat = false; startingSecretChat = false;
statusRequest = 0; statusRequest = 0;
statusSettingState = 0; statusSettingState = 0;
currentChatInfo = null;
chatParticipantsId = 0;
addSupportUser(); addSupportUser();
} }
...@@ -753,8 +772,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -753,8 +772,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter
dialogsServerOnly.remove(dialog); dialogsServerOnly.remove(dialog);
dialogs_dict.remove(did); dialogs_dict.remove(did);
totalDialogsCount--; totalDialogsCount--;
} else {
dialog.unread_count = 0;
} }
dialogMessage.remove(dialog.top_message); dialogMessage.remove(dialog.top_message);
NotificationsController.getInstance().processReadMessages(null, did, 0, Integer.MAX_VALUE);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(did, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
MessagesStorage.getInstance().deleteDialog(did, onlyHistory); MessagesStorage.getInstance().deleteDialog(did, onlyHistory);
NotificationCenter.getInstance().postNotificationName(removeAllMessagesFromDialog, did); NotificationCenter.getInstance().postNotificationName(removeAllMessagesFromDialog, did);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
...@@ -806,18 +831,22 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -806,18 +831,22 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
}); });
} else { } else {
int encId = (int)(did >> 32); int high_id = (int)(did >> 32);
if (high_id > 0) {
if (onlyHistory) { if (onlyHistory) {
TLRPC.EncryptedChat encryptedChat = encryptedChats.get(encId); TLRPC.EncryptedChat encryptedChat = encryptedChats.get(high_id);
sendClearHistoryMessage(encryptedChat); sendClearHistoryMessage(encryptedChat);
} else { } else {
declineSecretChat(encId); declineSecretChat(high_id);
}
} }
} }
} }
} }
public void loadChatInfo(final int chat_id) { public void loadChatInfo(final int chat_id) {
currentChatInfo = null;
chatParticipantsId = chat_id;
MessagesStorage.getInstance().loadChatInfo(chat_id); MessagesStorage.getInstance().loadChatInfo(chat_id);
} }
...@@ -877,7 +906,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -877,7 +906,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
checkDeletingTask(); checkDeletingTask();
if (UserConfig.isClientActivated()) { if (UserConfig.isClientActivated()) {
if (ConnectionsManager.getInstance().getPauseTime() == 0 && ApplicationLoader.isScreenOn) { if (ConnectionsManager.getInstance().getPauseTime() == 0 && ApplicationLoader.isScreenOn && !ApplicationLoader.mainInterfacePaused) {
if (statusSettingState != 1 && (lastStatusUpdateTime == 0 || lastStatusUpdateTime <= System.currentTimeMillis() - 55000 || offlineSent)) { if (statusSettingState != 1 && (lastStatusUpdateTime == 0 || lastStatusUpdateTime <= System.currentTimeMillis() - 55000 || offlineSent)) {
statusSettingState = 1; statusSettingState = 1;
...@@ -1046,8 +1075,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1046,8 +1075,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors); }, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors);
ConnectionsManager.getInstance().bindRequestToGuid(reqId, classGuid); ConnectionsManager.getInstance().bindRequestToGuid(reqId, classGuid);
} else { } else {
int encId = (int)(dialog_id >> 32); int high_id = (int)(dialog_id >> 32);
TLRPC.EncryptedChat chat = encryptedChats.get(encId); if (high_id > 0) {
TLRPC.EncryptedChat chat = encryptedChats.get(high_id);
if (chat.auth_key != null && chat.auth_key.length > 1 && chat instanceof TLRPC.TL_encryptedChat) { if (chat.auth_key != null && chat.auth_key.length > 1 && chat instanceof TLRPC.TL_encryptedChat) {
TLRPC.TL_messages_setEncryptedTyping req = new TLRPC.TL_messages_setEncryptedTyping(); TLRPC.TL_messages_setEncryptedTyping req = new TLRPC.TL_messages_setEncryptedTyping();
req.peer = new TLRPC.TL_inputEncryptedChat(); req.peer = new TLRPC.TL_inputEncryptedChat();
...@@ -1064,6 +1094,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1064,6 +1094,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
} }
}
public void loadMessages(final long dialog_id, final int offset, final int count, final int max_id, boolean fromCache, int midDate, final int classGuid, boolean from_unread, boolean forward) { public void loadMessages(final long dialog_id, final int offset, final int count, final int max_id, boolean fromCache, int midDate, final int classGuid, boolean from_unread, boolean forward) {
int lower_part = (int)dialog_id; int lower_part = (int)dialog_id;
...@@ -1125,7 +1156,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1125,7 +1156,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<MessageObject> objects = new ArrayList<MessageObject>(); final ArrayList<MessageObject> objects = new ArrayList<MessageObject>();
for (TLRPC.Message message : messagesRes.messages) { for (TLRPC.Message message : messagesRes.messages) {
message.dialog_id = dialog_id; message.dialog_id = dialog_id;
objects.add(new MessageObject(message, usersLocal)); objects.add(new MessageObject(message, usersLocal, 2));
} }
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
...@@ -1234,7 +1265,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1234,7 +1265,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
for (TLRPC.Message m : dialogsRes.messages) { for (TLRPC.Message m : dialogsRes.messages) {
new_dialogMessage.put(m.id, new MessageObject(m, usersLocal)); new_dialogMessage.put(m.id, new MessageObject(m, usersLocal, 0));
} }
for (TLRPC.TL_dialog d : dialogsRes.dialogs) { for (TLRPC.TL_dialog d : dialogsRes.dialogs) {
if (d.last_message_date == 0) { if (d.last_message_date == 0) {
...@@ -1374,7 +1405,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1374,7 +1405,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
for (TLRPC.Message m : dialogsRes.messages) { for (TLRPC.Message m : dialogsRes.messages) {
new_dialogMessage.put(m.id, new MessageObject(m, usersLocal)); new_dialogMessage.put(m.id, new MessageObject(m, usersLocal, 0));
} }
for (TLRPC.TL_dialog d : dialogsRes.dialogs) { for (TLRPC.TL_dialog d : dialogsRes.dialogs) {
if (d.last_message_date == 0) { if (d.last_message_date == 0) {
...@@ -1615,9 +1646,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1615,9 +1646,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (max_date == 0) { if (max_date == 0) {
return; return;
} }
int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
NotificationsController.getInstance().processReadMessages(null, dialog_id, max_date, 0); NotificationsController.getInstance().processReadMessages(null, dialog_id, max_date, 0);
int encId = (int)(dialog_id >> 32); TLRPC.EncryptedChat chat = encryptedChats.get(high_id);
TLRPC.EncryptedChat chat = encryptedChats.get(encId);
if (chat.auth_key != null && chat.auth_key.length > 1 && chat instanceof TLRPC.TL_encryptedChat) { if (chat.auth_key != null && chat.auth_key.length > 1 && chat instanceof TLRPC.TL_encryptedChat) {
TLRPC.TL_messages_readEncryptedHistory req = new TLRPC.TL_messages_readEncryptedHistory(); TLRPC.TL_messages_readEncryptedHistory req = new TLRPC.TL_messages_readEncryptedHistory();
req.peer = new TLRPC.TL_inputEncryptedChat(); req.peer = new TLRPC.TL_inputEncryptedChat();
...@@ -1659,6 +1691,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1659,6 +1691,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
} }
}
public void cancelSendingMessage(MessageObject object) { public void cancelSendingMessage(MessageObject object) {
String keyToRemvoe = null; String keyToRemvoe = null;
...@@ -1795,7 +1828,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1795,7 +1828,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
objArr.add(newMsgObj); objArr.add(newMsgObj);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
updateInterfaceWithMessages(newMsg.dialog_id, objArr); updateInterfaceWithMessages(newMsg.dialog_id, objArr);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
...@@ -1844,7 +1877,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1844,7 +1877,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
objArr.add(newMsgObj); objArr.add(newMsgObj);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
updateInterfaceWithMessages(newMsg.dialog_id, objArr); updateInterfaceWithMessages(newMsg.dialog_id, objArr);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
...@@ -1944,6 +1977,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1944,6 +1977,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
int lower_id = (int)peer; int lower_id = (int)peer;
TLRPC.EncryptedChat encryptedChat = null; TLRPC.EncryptedChat encryptedChat = null;
TLRPC.InputPeer sendToPeer = null; TLRPC.InputPeer sendToPeer = null;
ArrayList<TLRPC.InputUser> sendToPeers = null;
if (lower_id != 0) { if (lower_id != 0) {
if (lower_id < 0) { if (lower_id < 0) {
newMsg.to_id = new TLRPC.TL_peerChat(); newMsg.to_id = new TLRPC.TL_peerChat();
...@@ -1968,7 +2002,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1968,7 +2002,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
} else { } else {
encryptedChat = encryptedChats.get((int)(peer >> 32)); int high_id = (int)(peer >> 32);
if (high_id > 0) {
encryptedChat = encryptedChats.get(high_id);
newMsg.to_id = new TLRPC.TL_peerUser(); newMsg.to_id = new TLRPC.TL_peerUser();
if (encryptedChat.participant_id == UserConfig.getClientUserId()) { if (encryptedChat.participant_id == UserConfig.getClientUserId()) {
newMsg.to_id.user_id = encryptedChat.admin_id; newMsg.to_id.user_id = encryptedChat.admin_id;
...@@ -1976,19 +2012,34 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1976,19 +2012,34 @@ public class MessagesController implements NotificationCenter.NotificationCenter
newMsg.to_id.user_id = encryptedChat.participant_id; newMsg.to_id.user_id = encryptedChat.participant_id;
} }
newMsg.ttl = encryptedChat.ttl; newMsg.ttl = encryptedChat.ttl;
} else {
if (currentChatInfo == null) {
return;
}
sendToPeers = new ArrayList<TLRPC.InputUser>();
for (TLRPC.TL_chatParticipant participant : currentChatInfo.participants) {
TLRPC.User sendToUser = users.get(participant.user_id);
TLRPC.InputUser peerUser = getInputUser(sendToUser);
if (peerUser != null) {
sendToPeers.add(peerUser);
}
}
newMsg.to_id = new TLRPC.TL_peerChat();
newMsg.to_id.chat_id = high_id;
}
} }
newMsg.out = true; newMsg.out = true;
newMsg.date = ConnectionsManager.getInstance().getCurrentTime(); newMsg.date = ConnectionsManager.getInstance().getCurrentTime();
newMsg.random_id = getNextRandomId(); newMsg.random_id = getNextRandomId();
UserConfig.saveConfig(false); UserConfig.saveConfig(false);
final MessageObject newMsgObj = new MessageObject(newMsg, null); final MessageObject newMsgObj = new MessageObject(newMsg, null, 2);
newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENDING; newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENDING;
final ArrayList<MessageObject> objArr = new ArrayList<MessageObject>(); final ArrayList<MessageObject> objArr = new ArrayList<MessageObject>();
objArr.add(newMsgObj); objArr.add(newMsgObj);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
updateInterfaceWithMessages(peer, objArr); updateInterfaceWithMessages(peer, objArr);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
...@@ -1996,11 +2047,19 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -1996,11 +2047,19 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (type == 0) { if (type == 0) {
if (encryptedChat == null) { if (encryptedChat == null) {
if (sendToPeers != null) {
TLRPC.TL_messages_sendBroadcast reqSend = new TLRPC.TL_messages_sendBroadcast();
reqSend.message = message;
reqSend.contacts = sendToPeers;
reqSend.media = new TLRPC.TL_inputMediaEmpty();
performSendMessageRequest(reqSend, newMsgObj, null);
} else {
TLRPC.TL_messages_sendMessage reqSend = new TLRPC.TL_messages_sendMessage(); TLRPC.TL_messages_sendMessage reqSend = new TLRPC.TL_messages_sendMessage();
reqSend.message = message; reqSend.message = message;
reqSend.peer = sendToPeer; reqSend.peer = sendToPeer;
reqSend.random_id = newMsg.random_id; reqSend.random_id = newMsg.random_id;
performSendMessageRequest(reqSend, newMsgObj, null); performSendMessageRequest(reqSend, newMsgObj, null);
}
} else { } else {
TLRPC.TL_decryptedMessage reqSend = new TLRPC.TL_decryptedMessage(); TLRPC.TL_decryptedMessage reqSend = new TLRPC.TL_decryptedMessage();
reqSend.random_id = newMsg.random_id; reqSend.random_id = newMsg.random_id;
...@@ -2012,74 +2071,64 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2012,74 +2071,64 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} else if (type >= 1 && type <= 3 || type >= 5 && type <= 8) { } else if (type >= 1 && type <= 3 || type >= 5 && type <= 8) {
if (encryptedChat == null) { if (encryptedChat == null) {
TLRPC.TL_messages_sendMedia reqSend = new TLRPC.TL_messages_sendMedia(); TLRPC.InputMedia inputMedia = null;
reqSend.peer = sendToPeer; DelayedMessage delayedMessage = null;
reqSend.random_id = newMsg.random_id;
if (type == 1) { if (type == 1) {
reqSend.media = new TLRPC.TL_inputMediaGeoPoint(); inputMedia = new TLRPC.TL_inputMediaGeoPoint();
reqSend.media.geo_point = new TLRPC.TL_inputGeoPoint(); inputMedia.geo_point = new TLRPC.TL_inputGeoPoint();
reqSend.media.geo_point.lat = lat; inputMedia.geo_point.lat = lat;
reqSend.media.geo_point._long = lon; inputMedia.geo_point._long = lon;
performSendMessageRequest(reqSend, newMsgObj, null);
} else if (type == 2) { } else if (type == 2) {
if (photo.access_hash == 0) { if (photo.access_hash == 0) {
reqSend.media = new TLRPC.TL_inputMediaUploadedPhoto(); inputMedia = new TLRPC.TL_inputMediaUploadedPhoto();
DelayedMessage delayedMessage = new DelayedMessage(); delayedMessage = new DelayedMessage();
delayedMessage.originalPath = originalPath; delayedMessage.originalPath = originalPath;
delayedMessage.sendRequest = reqSend;
delayedMessage.type = 0; delayedMessage.type = 0;
delayedMessage.obj = newMsgObj; delayedMessage.obj = newMsgObj;
delayedMessage.location = photo.sizes.get(photo.sizes.size() - 1).location; delayedMessage.location = photo.sizes.get(photo.sizes.size() - 1).location;
performSendDelayedMessage(delayedMessage);
} else { } else {
TLRPC.TL_inputMediaPhoto media = new TLRPC.TL_inputMediaPhoto(); TLRPC.TL_inputMediaPhoto media = new TLRPC.TL_inputMediaPhoto();
media.id = new TLRPC.TL_inputPhoto(); media.id = new TLRPC.TL_inputPhoto();
media.id.id = photo.id; media.id.id = photo.id;
media.id.access_hash = photo.access_hash; media.id.access_hash = photo.access_hash;
reqSend.media = media; inputMedia = media;
performSendMessageRequest(reqSend, newMsgObj, null);
} }
} else if (type == 3) { } else if (type == 3) {
if (video.access_hash == 0) { if (video.access_hash == 0) {
reqSend.media = new TLRPC.TL_inputMediaUploadedThumbVideo(); inputMedia = new TLRPC.TL_inputMediaUploadedThumbVideo();
reqSend.media.duration = video.duration; inputMedia.duration = video.duration;
reqSend.media.w = video.w; inputMedia.w = video.w;
reqSend.media.h = video.h; inputMedia.h = video.h;
reqSend.media.mime_type = video.mime_type; inputMedia.mime_type = video.mime_type;
DelayedMessage delayedMessage = new DelayedMessage(); delayedMessage = new DelayedMessage();
delayedMessage.originalPath = originalPath; delayedMessage.originalPath = originalPath;
delayedMessage.sendRequest = reqSend;
delayedMessage.type = 1; delayedMessage.type = 1;
delayedMessage.obj = newMsgObj; delayedMessage.obj = newMsgObj;
delayedMessage.location = video.thumb.location; delayedMessage.location = video.thumb.location;
delayedMessage.videoLocation = video; delayedMessage.videoLocation = video;
performSendDelayedMessage(delayedMessage);
} else { } else {
TLRPC.TL_inputMediaVideo media = new TLRPC.TL_inputMediaVideo(); TLRPC.TL_inputMediaVideo media = new TLRPC.TL_inputMediaVideo();
media.id = new TLRPC.TL_inputVideo(); media.id = new TLRPC.TL_inputVideo();
media.id.id = video.id; media.id.id = video.id;
media.id.access_hash = video.access_hash; media.id.access_hash = video.access_hash;
reqSend.media = media; inputMedia = media;
performSendMessageRequest(reqSend, newMsgObj, null);
} }
} else if (type == 6) { } else if (type == 6) {
reqSend.media = new TLRPC.TL_inputMediaContact(); inputMedia = new TLRPC.TL_inputMediaContact();
reqSend.media.phone_number = user.phone; inputMedia.phone_number = user.phone;
reqSend.media.first_name = user.first_name; inputMedia.first_name = user.first_name;
reqSend.media.last_name = user.last_name; inputMedia.last_name = user.last_name;
performSendMessageRequest(reqSend, newMsgObj, null);
} else if (type == 7) { } else if (type == 7) {
if (document.access_hash == 0) { if (document.access_hash == 0) {
if (document.thumb.location != null && document.thumb.location instanceof TLRPC.TL_fileLocation) { if (document.thumb.location != null && document.thumb.location instanceof TLRPC.TL_fileLocation) {
reqSend.media = new TLRPC.TL_inputMediaUploadedThumbDocument(); inputMedia = new TLRPC.TL_inputMediaUploadedThumbDocument();
} else { } else {
reqSend.media = new TLRPC.TL_inputMediaUploadedDocument(); inputMedia = new TLRPC.TL_inputMediaUploadedDocument();
} }
reqSend.media.mime_type = document.mime_type; inputMedia.mime_type = document.mime_type;
reqSend.media.file_name = document.file_name; inputMedia.file_name = document.file_name;
DelayedMessage delayedMessage = new DelayedMessage(); delayedMessage = new DelayedMessage();
delayedMessage.originalPath = originalPath; delayedMessage.originalPath = originalPath;
delayedMessage.sendRequest = reqSend;
delayedMessage.type = 2; delayedMessage.type = 2;
delayedMessage.obj = newMsgObj; delayedMessage.obj = newMsgObj;
delayedMessage.documentLocation = document; delayedMessage.documentLocation = document;
...@@ -2090,26 +2139,73 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2090,26 +2139,73 @@ public class MessagesController implements NotificationCenter.NotificationCenter
media.id = new TLRPC.TL_inputDocument(); media.id = new TLRPC.TL_inputDocument();
media.id.id = document.id; media.id.id = document.id;
media.id.access_hash = document.access_hash; media.id.access_hash = document.access_hash;
reqSend.media = media; inputMedia = media;
performSendMessageRequest(reqSend, newMsgObj, null);
} }
} else if (type == 8) { } else if (type == 8) {
if (audio.access_hash == 0) { if (audio.access_hash == 0) {
reqSend.media = new TLRPC.TL_inputMediaUploadedAudio(); inputMedia = new TLRPC.TL_inputMediaUploadedAudio();
reqSend.media.duration = audio.duration; inputMedia.duration = audio.duration;
reqSend.media.mime_type = audio.mime_type; inputMedia.mime_type = audio.mime_type;
DelayedMessage delayedMessage = new DelayedMessage(); delayedMessage = new DelayedMessage();
delayedMessage.sendRequest = reqSend;
delayedMessage.type = 3; delayedMessage.type = 3;
delayedMessage.obj = newMsgObj; delayedMessage.obj = newMsgObj;
delayedMessage.audioLocation = audio; delayedMessage.audioLocation = audio;
performSendDelayedMessage(delayedMessage);
} else { } else {
TLRPC.TL_inputMediaAudio media = new TLRPC.TL_inputMediaAudio(); TLRPC.TL_inputMediaAudio media = new TLRPC.TL_inputMediaAudio();
media.id = new TLRPC.TL_inputAudio(); media.id = new TLRPC.TL_inputAudio();
media.id.id = audio.id; media.id.id = audio.id;
media.id.access_hash = audio.access_hash; media.id.access_hash = audio.access_hash;
reqSend.media = media; inputMedia = media;
}
}
TLObject reqSend = null;
if (sendToPeers != null) {
TLRPC.TL_messages_sendBroadcast request = new TLRPC.TL_messages_sendBroadcast();
request.contacts = sendToPeers;
request.media = inputMedia;
request.message = "";
if (delayedMessage != null) {
delayedMessage.sendRequest = request;
}
reqSend = request;
} else {
TLRPC.TL_messages_sendMedia request = new TLRPC.TL_messages_sendMedia();
request.peer = sendToPeer;
request.random_id = newMsg.random_id;
request.media = inputMedia;
if (delayedMessage != null) {
delayedMessage.sendRequest = request;
}
reqSend = request;
}
if (type == 1) {
performSendMessageRequest(reqSend, newMsgObj, null);
} else if (type == 2) {
if (photo.access_hash == 0) {
performSendDelayedMessage(delayedMessage);
} else {
performSendMessageRequest(reqSend, newMsgObj, null);
}
} else if (type == 3) {
if (video.access_hash == 0) {
performSendDelayedMessage(delayedMessage);
} else {
performSendMessageRequest(reqSend, newMsgObj, null);
}
} else if (type == 6) {
performSendMessageRequest(reqSend, newMsgObj, null);
} else if (type == 7) {
if (document.access_hash == 0) {
performSendDelayedMessage(delayedMessage);
} else {
performSendMessageRequest(reqSend, newMsgObj, null);
}
} else if (type == 8) {
if (audio.access_hash == 0) {
performSendDelayedMessage(delayedMessage);
} else {
performSendMessageRequest(reqSend, newMsgObj, null); performSendMessageRequest(reqSend, newMsgObj, null);
} }
} }
...@@ -2360,7 +2456,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2360,7 +2456,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
FileLoader.getInstance().replaceImageInCache(fileName, fileName2); FileLoader.getInstance().replaceImageInCache(fileName, fileName2);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.photo, 3); MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.photo, 3);
} else if (newMsg.media instanceof TLRPC.TL_messageMediaVideo && newMsg.media.video != null) { } else if (newMsg.media instanceof TLRPC.TL_messageMediaVideo && newMsg.media.video != null) {
...@@ -2383,7 +2479,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2383,7 +2479,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
newMsg.media.video.mime_type = video.mime_type; newMsg.media.video.mime_type = video.mime_type;
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.video, 5); MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.video, 5);
} else if (newMsg.media instanceof TLRPC.TL_messageMediaDocument && newMsg.media.document != null) { } else if (newMsg.media instanceof TLRPC.TL_messageMediaDocument && newMsg.media.document != null) {
...@@ -2410,7 +2506,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2410,7 +2506,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.document, 4); MessagesStorage.getInstance().putSentFile(originalPath, newMsg.media.document, 4);
} else if (newMsg.media instanceof TLRPC.TL_messageMediaAudio && newMsg.media.audio != null) { } else if (newMsg.media instanceof TLRPC.TL_messageMediaAudio && newMsg.media.audio != null) {
...@@ -2438,7 +2534,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2438,7 +2534,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>(); ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg); arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
} }
} }
} }
...@@ -2539,12 +2635,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2539,12 +2635,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}); });
} }
private void performSendMessageRequest(TLObject req, final MessageObject newMsgObj, final String originalPath) { private void performSendMessageRequest(final TLObject req, final MessageObject newMsgObj, final String originalPath) {
ConnectionsManager.getInstance().performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.getInstance().performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
if (error == null) { if (error == null) {
final int oldId = newMsgObj.messageOwner.id; final int oldId = newMsgObj.messageOwner.id;
final boolean isBroadcast = req instanceof TLRPC.TL_messages_sendBroadcast;
final ArrayList<TLRPC.Message> sentMessages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> sentMessages = new ArrayList<TLRPC.Message>();
if (response instanceof TLRPC.TL_messages_sentMessage) { if (response instanceof TLRPC.TL_messages_sentMessage) {
...@@ -2596,9 +2693,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2596,9 +2693,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} else if (response instanceof TLRPC.messages_StatedMessages) { } else if (response instanceof TLRPC.messages_StatedMessages) {
TLRPC.messages_StatedMessages res = (TLRPC.messages_StatedMessages) response; TLRPC.messages_StatedMessages res = (TLRPC.messages_StatedMessages) response;
if (!res.messages.isEmpty()) { if (!res.messages.isEmpty()) {
sentMessages.addAll(res.messages);
TLRPC.Message message = res.messages.get(0); TLRPC.Message message = res.messages.get(0);
if (!isBroadcast) {
newMsgObj.messageOwner.id = message.id; newMsgObj.messageOwner.id = message.id;
sentMessages.add(message); }
processSentMessage(newMsgObj.messageOwner, message, null, null, originalPath); processSentMessage(newMsgObj.messageOwner, message, null, null, originalPath);
} }
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
...@@ -2623,13 +2722,28 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2623,13 +2722,28 @@ public class MessagesController implements NotificationCenter.NotificationCenter
MessagesStorage.getInstance().storageQueue.postRunnable(new Runnable() { MessagesStorage.getInstance().storageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
MessagesStorage.getInstance().updateMessageStateAndId(newMsgObj.messageOwner.random_id, oldId, newMsgObj.messageOwner.id, 0, false); MessagesStorage.getInstance().updateMessageStateAndId(newMsgObj.messageOwner.random_id, oldId, (isBroadcast ? oldId : newMsgObj.messageOwner.id), 0, false);
MessagesStorage.getInstance().putMessages(sentMessages, true, false); MessagesStorage.getInstance().putMessages(sentMessages, true, false, isBroadcast);
if (isBroadcast) {
ArrayList<TLRPC.Message> currentMessage = new ArrayList<TLRPC.Message>();
currentMessage.add(newMsgObj.messageOwner);
newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENT;
MessagesStorage.getInstance().putMessages(currentMessage, true, false, false);
}
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {
newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENT; newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENT;
NotificationCenter.getInstance().postNotificationName(messageReceivedByServer, oldId, newMsgObj.messageOwner.id, newMsgObj); if (isBroadcast) {
for (TLRPC.Message message : sentMessages) {
ArrayList<MessageObject> arr = new ArrayList<MessageObject>();
MessageObject messageObject = new MessageObject(message, users, 0);
arr.add(messageObject);
updateInterfaceWithMessages(messageObject.getDialogId(), arr, isBroadcast);
}
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
}
NotificationCenter.getInstance().postNotificationName(messageReceivedByServer, oldId, (isBroadcast ? oldId : newMsgObj.messageOwner.id), newMsgObj);
sendingMessages.remove(oldId); sendingMessages.remove(oldId);
} }
}); });
...@@ -2681,7 +2795,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2681,7 +2795,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} else if (message.type == 1) { } else if (message.type == 1) {
if (message.sendRequest != null) { if (message.sendRequest != null) {
if (message.sendRequest.media.thumb == null) { TLRPC.InputMedia media = null;
if (message.sendRequest instanceof TLRPC.TL_messages_sendMedia) {
media = ((TLRPC.TL_messages_sendMedia)message.sendRequest).media;
} else if (message.sendRequest instanceof TLRPC.TL_messages_sendBroadcast) {
media = ((TLRPC.TL_messages_sendBroadcast)message.sendRequest).media;
}
if (media.thumb == null) {
String location = AndroidUtilities.getCacheDir() + "/" + message.location.volume_id + "_" + message.location.local_id + ".jpg"; String location = AndroidUtilities.getCacheDir() + "/" + message.location.volume_id + "_" + message.location.local_id + ".jpg";
putToDelayedMessages(location, message); putToDelayedMessages(location, message);
FileLoader.getInstance().uploadFile(location, false); FileLoader.getInstance().uploadFile(location, false);
...@@ -2702,7 +2822,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2702,7 +2822,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter
FileLoader.getInstance().uploadFile(location, true); FileLoader.getInstance().uploadFile(location, true);
} }
} else if (message.type == 2) { } else if (message.type == 2) {
if (message.sendRequest != null && message.sendRequest.media.thumb == null && message.location != null) { TLRPC.InputMedia media = null;
if (message.sendRequest instanceof TLRPC.TL_messages_sendMedia) {
media = ((TLRPC.TL_messages_sendMedia)message.sendRequest).media;
} else if (message.sendRequest instanceof TLRPC.TL_messages_sendBroadcast) {
media = ((TLRPC.TL_messages_sendBroadcast)message.sendRequest).media;
}
if (message.sendRequest != null && media.thumb == null && message.location != null) {
String location = AndroidUtilities.getCacheDir() + "/" + message.location.volume_id + "_" + message.location.local_id + ".jpg"; String location = AndroidUtilities.getCacheDir() + "/" + message.location.volume_id + "_" + message.location.local_id + ".jpg";
putToDelayedMessages(location, message); putToDelayedMessages(location, message);
FileLoader.getInstance().uploadFile(location, false); FileLoader.getInstance().uploadFile(location, false);
...@@ -2726,7 +2852,61 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2726,7 +2852,61 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
public long createChat(String title, ArrayList<Integer> selectedContacts, final TLRPC.InputFile uploadedAvatar) { public long createChat(String title, ArrayList<Integer> selectedContacts, final TLRPC.InputFile uploadedAvatar, boolean isBroadcast) {
if (isBroadcast) {
TLRPC.TL_chat chat = new TLRPC.TL_chat();
chat.id = UserConfig.lastBroadcastId;
chat.title = title;
chat.photo = new TLRPC.TL_chatPhotoEmpty();
chat.participants_count = selectedContacts.size();
chat.date = (int)(System.currentTimeMillis() / 1000);
chat.left = false;
chat.version = 1;
UserConfig.lastBroadcastId--;
chats.put(chat.id, chat);
ArrayList<TLRPC.Chat> chatsArrays = new ArrayList<TLRPC.Chat>();
chatsArrays.add(chat);
MessagesStorage.getInstance().putUsersAndChats(null, chatsArrays, true, true);
TLRPC.TL_chatParticipants participants = new TLRPC.TL_chatParticipants();
participants.chat_id = chat.id;
participants.admin_id = UserConfig.getClientUserId();
participants.version = 1;
for (Integer id : selectedContacts) {
TLRPC.TL_chatParticipant participant = new TLRPC.TL_chatParticipant();
participant.user_id = id;
participant.inviter_id = UserConfig.getClientUserId();
participant.date = (int)(System.currentTimeMillis() / 1000);
participants.participants.add(participant);
}
MessagesStorage.getInstance().updateChatInfo(chat.id, participants, false);
TLRPC.TL_messageService newMsg = new TLRPC.TL_messageService();
newMsg.action = new TLRPC.TL_messageActionCreatedBroadcastList();
newMsg.local_id = newMsg.id = UserConfig.getNewMessageId();
newMsg.from_id = UserConfig.getClientUserId();
newMsg.unread = false;
newMsg.dialog_id = ((long)chat.id) << 32;
newMsg.to_id = new TLRPC.TL_peerChat();
newMsg.to_id.chat_id = chat.id;
newMsg.out = false;
newMsg.date = ConnectionsManager.getInstance().getCurrentTime();
newMsg.random_id = 0;
UserConfig.saveConfig(false);
MessageObject newMsgObj = new MessageObject(newMsg, users);
newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENT;
ArrayList<MessageObject> objArr = new ArrayList<MessageObject>();
objArr.add(newMsgObj);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true, false);
updateInterfaceWithMessages(newMsg.dialog_id, objArr);
NotificationCenter.getInstance().postNotificationName(chatDidCreated, chat.id);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
return 0;
} else {
TLRPC.TL_messages_createChat req = new TLRPC.TL_messages_createChat(); TLRPC.TL_messages_createChat req = new TLRPC.TL_messages_createChat();
req.title = title; req.title = title;
for (Integer uid : selectedContacts) { for (Integer uid : selectedContacts) {
...@@ -2777,7 +2957,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2777,7 +2957,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>();
messages.add(res.message); messages.add(res.message);
MessagesStorage.getInstance().putMessages(messages, true, true); MessagesStorage.getInstance().putMessages(messages, true, true, false);
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
MessagesStorage.lastSeqValue = res.seq; MessagesStorage.lastSeqValue = res.seq;
MessagesStorage.lastPtsValue = res.pts; MessagesStorage.lastPtsValue = res.pts;
...@@ -2799,12 +2979,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2799,12 +2979,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
}); });
} }
}
public void addUserToChat(int chat_id, final TLRPC.User user, final TLRPC.ChatParticipants info, int count_fwd) { public void addUserToChat(int chat_id, final TLRPC.User user, final TLRPC.ChatParticipants info, int count_fwd) {
if (user == null) { if (user == null) {
return; return;
} }
if (chat_id > 0) {
TLRPC.TL_messages_addChatUser req = new TLRPC.TL_messages_addChatUser(); TLRPC.TL_messages_addChatUser req = new TLRPC.TL_messages_addChatUser();
req.chat_id = chat_id; req.chat_id = chat_id;
req.fwd_limit = count_fwd; req.fwd_limit = count_fwd;
...@@ -2859,7 +3041,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2859,7 +3041,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>();
messages.add(res.message); messages.add(res.message);
MessagesStorage.getInstance().putMessages(messages, true, true); MessagesStorage.getInstance().putMessages(messages, true, true, false);
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
MessagesStorage.lastSeqValue = res.seq; MessagesStorage.lastSeqValue = res.seq;
MessagesStorage.lastPtsValue = res.pts; MessagesStorage.lastPtsValue = res.pts;
...@@ -2880,12 +3062,37 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2880,12 +3062,37 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
}); });
} else {
if (info != null) {
for (TLRPC.TL_chatParticipant p : info.participants) {
if (p.user_id == user.id) {
return;
}
}
TLRPC.Chat chat = chats.get(chat_id);
chat.participants_count++;
ArrayList<TLRPC.Chat> chatArrayList = new ArrayList<TLRPC.Chat>();
chatArrayList.add(chat);
MessagesStorage.getInstance().putUsersAndChats(null, chatArrayList, true, true);
TLRPC.TL_chatParticipant newPart = new TLRPC.TL_chatParticipant();
newPart.user_id = user.id;
newPart.inviter_id = UserConfig.getClientUserId();
newPart.date = ConnectionsManager.getInstance().getCurrentTime();
info.participants.add(0, newPart);
MessagesStorage.getInstance().updateChatInfo(info.chat_id, info, true);
NotificationCenter.getInstance().postNotificationName(chatInfoDidLoaded, info.chat_id, info);
NotificationCenter.getInstance().postNotificationName(updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
}
}
} }
public void deleteUserFromChat(int chat_id, final TLRPC.User user, final TLRPC.ChatParticipants info) { public void deleteUserFromChat(int chat_id, final TLRPC.User user, final TLRPC.ChatParticipants info) {
if (user == null) { if (user == null) {
return; return;
} }
if (chat_id > 0) {
TLRPC.TL_messages_deleteChatUser req = new TLRPC.TL_messages_deleteChatUser(); TLRPC.TL_messages_deleteChatUser req = new TLRPC.TL_messages_deleteChatUser();
req.chat_id = chat_id; req.chat_id = chat_id;
req.user_id = getInputUser(user); req.user_id = getInputUser(user);
...@@ -2940,7 +3147,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2940,7 +3147,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (user.id != UserConfig.getClientUserId()) { if (user.id != UserConfig.getClientUserId()) {
final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>();
messages.add(res.message); messages.add(res.message);
MessagesStorage.getInstance().putMessages(messages, true, true); MessagesStorage.getInstance().putMessages(messages, true, true, false);
} }
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
MessagesStorage.lastSeqValue = res.seq; MessagesStorage.lastSeqValue = res.seq;
...@@ -2962,9 +3169,36 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -2962,9 +3169,36 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
}); });
} else {
if (info != null) {
TLRPC.Chat chat = chats.get(chat_id);
chat.participants_count--;
ArrayList<TLRPC.Chat> chatArrayList = new ArrayList<TLRPC.Chat>();
chatArrayList.add(chat);
MessagesStorage.getInstance().putUsersAndChats(null, chatArrayList, true, true);
boolean changed = false;
if (info != null) {
for (int a = 0; a < info.participants.size(); a++) {
TLRPC.TL_chatParticipant p = info.participants.get(a);
if (p.user_id == user.id) {
info.participants.remove(a);
changed = true;
break;
}
}
if (changed) {
MessagesStorage.getInstance().updateChatInfo(info.chat_id, info, true);
NotificationCenter.getInstance().postNotificationName(chatInfoDidLoaded, info.chat_id, info);
}
}
NotificationCenter.getInstance().postNotificationName(updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
}
}
} }
public void changeChatTitle(int chat_id, String title) { public void changeChatTitle(int chat_id, String title) {
if (chat_id > 0) {
TLRPC.TL_messages_editChatTitle req = new TLRPC.TL_messages_editChatTitle(); TLRPC.TL_messages_editChatTitle req = new TLRPC.TL_messages_editChatTitle();
req.chat_id = chat_id; req.chat_id = chat_id;
req.title = title; req.title = title;
...@@ -3001,7 +3235,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3001,7 +3235,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>();
messages.add(res.message); messages.add(res.message);
MessagesStorage.getInstance().putMessages(messages, true, true); MessagesStorage.getInstance().putMessages(messages, true, true, false);
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
MessagesStorage.lastSeqValue = res.seq; MessagesStorage.lastSeqValue = res.seq;
MessagesStorage.lastPtsValue = res.pts; MessagesStorage.lastPtsValue = res.pts;
...@@ -3022,6 +3256,15 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3022,6 +3256,15 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
}); });
} else {
TLRPC.Chat chat = chats.get(chat_id);
chat.title = title;
ArrayList<TLRPC.Chat> chatArrayList = new ArrayList<TLRPC.Chat>();
chatArrayList.add(chat);
MessagesStorage.getInstance().putUsersAndChats(null, chatArrayList, true, true);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
NotificationCenter.getInstance().postNotificationName(updateInterfaces, UPDATE_MASK_CHAT_NAME);
}
} }
public void changeChatAvatar(int chat_id, TLRPC.InputFile uploadedAvatar) { public void changeChatAvatar(int chat_id, TLRPC.InputFile uploadedAvatar) {
...@@ -3067,7 +3310,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3067,7 +3310,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>(); final ArrayList<TLRPC.Message> messages = new ArrayList<TLRPC.Message>();
messages.add(res.message); messages.add(res.message);
MessagesStorage.getInstance().putMessages(messages, true, true); MessagesStorage.getInstance().putMessages(messages, true, true, false);
if (MessagesStorage.lastSeqValue + 1 == res.seq) { if (MessagesStorage.lastSeqValue + 1 == res.seq) {
MessagesStorage.lastSeqValue = res.seq; MessagesStorage.lastSeqValue = res.seq;
MessagesStorage.lastPtsValue = res.pts; MessagesStorage.lastPtsValue = res.pts;
...@@ -3400,7 +3643,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3400,7 +3643,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final ArrayList<MessageObject> pushMessages = new ArrayList<MessageObject>(); final ArrayList<MessageObject> pushMessages = new ArrayList<MessageObject>();
for (TLRPC.Message message : res.new_messages) { for (TLRPC.Message message : res.new_messages) {
MessageObject obj = new MessageObject(message, usersDict); MessageObject obj = new MessageObject(message, usersDict, 2);
long dialog_id = obj.messageOwner.dialog_id; long dialog_id = obj.messageOwner.dialog_id;
if (dialog_id == 0) { if (dialog_id == 0) {
...@@ -3456,7 +3699,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3456,7 +3699,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
@Override @Override
public void run() { public void run() {
MessagesStorage.getInstance().startTransaction(false); MessagesStorage.getInstance().startTransaction(false);
MessagesStorage.getInstance().putMessages(res.new_messages, false, false); MessagesStorage.getInstance().putMessages(res.new_messages, false, false, false);
MessagesStorage.getInstance().putUsersAndChats(res.users, res.chats, false, false); MessagesStorage.getInstance().putUsersAndChats(res.users, res.chats, false, false);
MessagesStorage.getInstance().commitTransaction(false); MessagesStorage.getInstance().commitTransaction(false);
} }
...@@ -3556,7 +3799,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3556,7 +3799,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
} }
}); });
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
} else if (MessagesStorage.lastSeqValue != updates.seq) { } else if (MessagesStorage.lastSeqValue != updates.seq) {
FileLog.e("tmessages", "need get diff TL_updateShortChatMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq); FileLog.e("tmessages", "need get diff TL_updateShortChatMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq);
if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) { if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) {
...@@ -3611,7 +3854,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3611,7 +3854,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
} }
}); });
MessagesStorage.getInstance().putMessages(arr, false, true); MessagesStorage.getInstance().putMessages(arr, false, true, false);
} else if (MessagesStorage.lastSeqValue != updates.seq) { } else if (MessagesStorage.lastSeqValue != updates.seq) {
FileLog.e("tmessages", "need get diff TL_updateShortMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq); FileLog.e("tmessages", "need get diff TL_updateShortMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq);
if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) { if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) {
...@@ -3784,7 +4027,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3784,7 +4027,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
messagesArr.add(upd.message); messagesArr.add(upd.message);
MessageObject obj = new MessageObject(upd.message, usersDict); MessageObject obj = new MessageObject(upd.message, usersDict, 2);
if (obj.type == 11) { if (obj.type == 11) {
interfaceUpdateMask |= UPDATE_MASK_CHAT_AVATAR; interfaceUpdateMask |= UPDATE_MASK_CHAT_AVATAR;
} else if (obj.type == 10) { } else if (obj.type == 10) {
...@@ -3933,7 +4176,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -3933,7 +4176,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (message != null) { if (message != null) {
int cid = ((TLRPC.TL_updateNewEncryptedMessage)update).message.chat_id; int cid = ((TLRPC.TL_updateNewEncryptedMessage)update).message.chat_id;
messagesArr.add(message); messagesArr.add(message);
MessageObject obj = new MessageObject(message, usersDict); MessageObject obj = new MessageObject(message, usersDict, 2);
long uid = ((long)cid) << 32; long uid = ((long)cid) << 32;
ArrayList<MessageObject> arr = messages.get(uid); ArrayList<MessageObject> arr = messages.get(uid);
if (arr == null) { if (arr == null) {
...@@ -4082,7 +4325,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4082,7 +4325,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
if (!messagesArr.isEmpty()) { if (!messagesArr.isEmpty()) {
MessagesStorage.getInstance().putMessages(messagesArr, true, true); MessagesStorage.getInstance().putMessages(messagesArr, true, true, false);
} }
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
...@@ -4136,7 +4379,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4136,7 +4379,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} else { } else {
editor.remove("notify2_" + dialog_id); editor.remove("notify2_" + dialog_id);
} }
} else if (update.peer instanceof TLRPC.TL_notifyChats) { }/* else if (update.peer instanceof TLRPC.TL_notifyChats) { disable global settings sync
if (editor == null) { if (editor == null) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
editor = preferences.edit(); editor = preferences.edit();
...@@ -4150,7 +4393,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4150,7 +4393,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
editor.putBoolean("EnableAll", update.notify_settings.mute_until == 0); editor.putBoolean("EnableAll", update.notify_settings.mute_until == 0);
editor.putBoolean("EnablePreviewAll", update.notify_settings.show_previews); editor.putBoolean("EnablePreviewAll", update.notify_settings.show_previews);
} }*/
} }
} }
if (editor != null) { if (editor != null) {
...@@ -4317,6 +4560,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4317,6 +4560,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
private void updateInterfaceWithMessages(long uid, ArrayList<MessageObject> messages) { private void updateInterfaceWithMessages(long uid, ArrayList<MessageObject> messages) {
updateInterfaceWithMessages(uid, messages, false);
}
private void updateInterfaceWithMessages(long uid, ArrayList<MessageObject> messages, boolean isBroadcast) {
MessageObject lastMessage = null; MessageObject lastMessage = null;
TLRPC.TL_dialog dialog = dialogs_dict.get(uid); TLRPC.TL_dialog dialog = dialogs_dict.get(uid);
...@@ -4333,6 +4580,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4333,6 +4580,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
boolean changed = false; boolean changed = false;
if (dialog == null) { if (dialog == null) {
if (!isBroadcast) {
dialog = new TLRPC.TL_dialog(); dialog = new TLRPC.TL_dialog();
dialog.id = uid; dialog.id = uid;
dialog.unread_count = 0; dialog.unread_count = 0;
...@@ -4342,16 +4590,19 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4342,16 +4590,19 @@ public class MessagesController implements NotificationCenter.NotificationCenter
dialogs.add(dialog); dialogs.add(dialog);
dialogMessage.put(lastMessage.messageOwner.id, lastMessage); dialogMessage.put(lastMessage.messageOwner.id, lastMessage);
changed = true; changed = true;
}
} else { } else {
if (dialog.top_message > 0 && lastMessage.messageOwner.id > 0 && lastMessage.messageOwner.id > dialog.top_message || if (dialog.top_message > 0 && lastMessage.messageOwner.id > 0 && lastMessage.messageOwner.id > dialog.top_message ||
dialog.top_message < 0 && lastMessage.messageOwner.id < 0 && lastMessage.messageOwner.id < dialog.top_message || dialog.top_message < 0 && lastMessage.messageOwner.id < 0 && lastMessage.messageOwner.id < dialog.top_message ||
dialog.last_message_date < lastMessage.messageOwner.date) { dialog.last_message_date < lastMessage.messageOwner.date) {
dialogMessage.remove(dialog.top_message); dialogMessage.remove(dialog.top_message);
dialog.top_message = lastMessage.messageOwner.id; dialog.top_message = lastMessage.messageOwner.id;
if (!isBroadcast) {
dialog.last_message_date = lastMessage.messageOwner.date; dialog.last_message_date = lastMessage.messageOwner.date;
dialogMessage.put(lastMessage.messageOwner.id, lastMessage);
changed = true; changed = true;
} }
dialogMessage.put(lastMessage.messageOwner.id, lastMessage);
}
} }
if (changed) { if (changed) {
...@@ -4597,8 +4848,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -4597,8 +4848,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public void run() { public void run() {
TLRPC.TL_dialog dialog = dialogs_dict.get(did); TLRPC.TL_dialog dialog = dialogs_dict.get(did);
if (dialog != null) { if (dialog != null) {
dialog.unread_count = 0;
dialogMessage.remove(dialog.top_message); dialogMessage.remove(dialog.top_message);
} }
NotificationsController.getInstance().processReadMessages(null, did, 0, Integer.MAX_VALUE);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(did, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
MessagesStorage.getInstance().deleteDialog(did, true); MessagesStorage.getInstance().deleteDialog(did, true);
NotificationCenter.getInstance().postNotificationName(removeAllMessagesFromDialog, did); NotificationCenter.getInstance().postNotificationName(removeAllMessagesFromDialog, did);
NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); NotificationCenter.getInstance().postNotificationName(dialogsNeedReload);
......
TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
View file @ 91ae97e2
...@@ -367,6 +367,7 @@ public class MessagesStorage { ...@@ -367,6 +367,7 @@ public class MessagesStorage {
database.executeFast("DELETE FROM dialogs WHERE did = " + did).stepThis().dispose(); database.executeFast("DELETE FROM dialogs WHERE did = " + did).stepThis().dispose();
database.executeFast("DELETE FROM chat_settings WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM chat_settings WHERE uid = " + did).stepThis().dispose();
} }
database.executeFast("UPDATE dialogs SET unread_count = 0 WHERE did = " + did).stepThis().dispose();
database.executeFast("DELETE FROM media_counts WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM media_counts WHERE uid = " + did).stepThis().dispose();
database.executeFast("DELETE FROM messages WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM messages WHERE uid = " + did).stepThis().dispose();
database.executeFast("DELETE FROM media WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM media WHERE uid = " + did).stepThis().dispose();
...@@ -1808,7 +1809,7 @@ public class MessagesStorage { ...@@ -1808,7 +1809,7 @@ public class MessagesStorage {
} }
} }
private void putMessagesInternal(final ArrayList<TLRPC.Message> messages, final boolean withTransaction) { private void putMessagesInternal(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, final boolean isBroadcast) {
try { try {
if (withTransaction) { if (withTransaction) {
database.beginTransaction(); database.beginTransaction();
...@@ -1949,10 +1950,21 @@ public class MessagesStorage { ...@@ -1949,10 +1950,21 @@ public class MessagesStorage {
state.dispose(); state.dispose();
state2.dispose(); state2.dispose();
state3.dispose(); state3.dispose();
state = database.executeFast("REPLACE INTO dialogs VALUES(?, ?, ifnull((SELECT unread_count FROM dialogs WHERE did = ?), 0) + ?, ?)");
state = database.executeFast("REPLACE INTO dialogs VALUES(?, ?, ?, ?)");
for (HashMap.Entry<Long, TLRPC.Message> pair : messagesMap.entrySet()) { for (HashMap.Entry<Long, TLRPC.Message> pair : messagesMap.entrySet()) {
state.requery();
Long key = pair.getKey(); Long key = pair.getKey();
int dialog_date = 0;
int old_unread_count = 0;
SQLiteCursor cursor = database.queryFinalized("SELECT date, unread_count FROM dialogs WHERE did = " + key);
if (cursor.next()) {
dialog_date = cursor.intValue(0);
old_unread_count = cursor.intValue(1);
}
cursor.dispose();
state.requery();
TLRPC.Message value = pair.getValue(); TLRPC.Message value = pair.getValue();
Integer unread_count = messagesCounts.get(key); Integer unread_count = messagesCounts.get(key);
if (unread_count == null) { if (unread_count == null) {
...@@ -1963,10 +1975,13 @@ public class MessagesStorage { ...@@ -1963,10 +1975,13 @@ public class MessagesStorage {
messageId = value.local_id; messageId = value.local_id;
} }
state.bindLong(1, key); state.bindLong(1, key);
if (!isBroadcast) {
state.bindInteger(2, value.date); state.bindInteger(2, value.date);
state.bindLong(3, key); } else {
state.bindInteger(4, unread_count); state.bindInteger(2, dialog_date != 0 ? dialog_date : value.date);
state.bindInteger(5, messageId); }
state.bindInteger(3, unread_count);
state.bindInteger(4, messageId);
state.step(); state.step();
} }
state.dispose(); state.dispose();
...@@ -2002,7 +2017,7 @@ public class MessagesStorage { ...@@ -2002,7 +2017,7 @@ public class MessagesStorage {
} }
} }
public void putMessages(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, boolean useQueue) { public void putMessages(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, boolean useQueue, final boolean isBroadcast) {
if (messages.size() == 0) { if (messages.size() == 0) {
return; return;
} }
...@@ -2010,11 +2025,11 @@ public class MessagesStorage { ...@@ -2010,11 +2025,11 @@ public class MessagesStorage {
storageQueue.postRunnable(new Runnable() { storageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
putMessagesInternal(messages, withTransaction); putMessagesInternal(messages, withTransaction, isBroadcast);
} }
}); });
} else { } else {
putMessagesInternal(messages, withTransaction); putMessagesInternal(messages, withTransaction, isBroadcast);
} }
} }
...@@ -2425,9 +2440,15 @@ public class MessagesStorage { ...@@ -2425,9 +2440,15 @@ public class MessagesStorage {
} }
} }
} else { } else {
int encryptedId = (int)(dialog.id >> 32); int high_id = (int)(dialog.id >> 32);
if (!encryptedToLoad.contains(encryptedId)) { if (high_id > 0) {
encryptedToLoad.add(encryptedId); if (!encryptedToLoad.contains(high_id)) {
encryptedToLoad.add(high_id);
}
} else {
if (!chatsToLoad.contains(high_id)) {
chatsToLoad.add(high_id);
}
} }
} }
} }
...@@ -2692,9 +2713,15 @@ public class MessagesStorage { ...@@ -2692,9 +2713,15 @@ public class MessagesStorage {
} }
} }
} else { } else {
int encryptedId = (int)(dialog.id >> 32); int high_id = (int)(dialog.id >> 32);
if (!encryptedToLoad.contains(encryptedId)) { if (high_id > 0) {
encryptedToLoad.add(encryptedId); if (!encryptedToLoad.contains(high_id)) {
encryptedToLoad.add(high_id);
}
} else {
if (!chatsToLoad.contains(high_id)) {
chatsToLoad.add(high_id);
}
} }
} }
} }
......
TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java
View file @ 91ae97e2
...@@ -25,8 +25,8 @@ public class NativeLoader { ...@@ -25,8 +25,8 @@ public class NativeLoader {
private static final long sizes[] = new long[] { private static final long sizes[] = new long[] {
799376, //armeabi 799376, //armeabi
848548, //armeabi-v7a 852644, //armeabi-v7a
1246260, //x86 1250356, //x86
0, //mips 0, //mips
}; };
......
TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
View file @ 91ae97e2
...@@ -400,7 +400,7 @@ public class NotificationsController { ...@@ -400,7 +400,7 @@ public class NotificationsController {
} }
if (photoPath != null) { if (photoPath != null) {
Bitmap img = FileLoader.getInstance().getImageFromMemory(photoPath, null, null, "50_50", false); Bitmap img = FileLoader.getInstance().getImageFromMemory(photoPath, null, null, "50_50");
if (img != null) { if (img != null) {
mBuilder.setLargeIcon(img); mBuilder.setLargeIcon(img);
} }
...@@ -536,7 +536,7 @@ public class NotificationsController { ...@@ -536,7 +536,7 @@ public class NotificationsController {
Boolean value = settingsCache.get(dialog_id); Boolean value = settingsCache.get(dialog_id);
boolean isChat = (int)dialog_id < 0; boolean isChat = (int)dialog_id < 0;
popup = preferences.getInt(isChat ? "popupGroup" : "popupAll", 0); popup = (int)dialog_id == 0 ? 0 : preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
if (value == null) { if (value == null) {
int notify_override = preferences.getInt("notify2_" + dialog_id, 0); int notify_override = preferences.getInt("notify2_" + dialog_id, 0);
value = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0); value = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0);
......
TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
View file @ 91ae97e2
...@@ -850,7 +850,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -850,7 +850,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
} }
public long performRpc(final TLObject rpc, final RPCRequest.RPCRequestDelegate completionBlock, final RPCRequest.RPCQuickAckDelegate quickAckBlock, final boolean requiresCompletion, final int requestClass, final int datacenterId, final boolean runQueue) { public long performRpc(final TLObject rpc, final RPCRequest.RPCRequestDelegate completionBlock, final RPCRequest.RPCQuickAckDelegate quickAckBlock, final boolean requiresCompletion, final int requestClass, final int datacenterId, final boolean runQueue) {
if (!UserConfig.isClientActivated() && (requestClass & RPCRequest.RPCRequestClassWithoutLogin) == 0) { if (rpc == null || !UserConfig.isClientActivated() && (requestClass & RPCRequest.RPCRequestClassWithoutLogin) == 0) {
FileLog.e("tmessages", "can't do request without login " + rpc); FileLog.e("tmessages", "can't do request without login " + rpc);
return 0; return 0;
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
View file @ 91ae97e2
...@@ -248,10 +248,14 @@ public class FileLoadOperation { ...@@ -248,10 +248,14 @@ public class FileLoadOperation {
float w_filter = 0; float w_filter = 0;
float h_filter = 0; float h_filter = 0;
boolean blur = false;
if (filter != null) { if (filter != null) {
String args[] = filter.split("_"); String args[] = filter.split("_");
w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density; w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density; h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
if (args.length > 2) {
blur = true;
}
opts.inJustDecodeBounds = true; opts.inJustDecodeBounds = true;
if (mediaIdFinal != null) { if (mediaIdFinal != null) {
...@@ -270,7 +274,7 @@ public class FileLoadOperation { ...@@ -270,7 +274,7 @@ public class FileLoadOperation {
opts.inSampleSize = (int)scaleFactor; opts.inSampleSize = (int)scaleFactor;
} }
if (filter == null) { if (filter == null || blur) {
opts.inPreferredConfig = Bitmap.Config.ARGB_8888; opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
} else { } else {
opts.inPreferredConfig = Bitmap.Config.RGB_565; opts.inPreferredConfig = Bitmap.Config.RGB_565;
...@@ -300,7 +304,9 @@ public class FileLoadOperation { ...@@ -300,7 +304,9 @@ public class FileLoadOperation {
image = scaledBitmap; image = scaledBitmap;
} }
} }
if (image != null && blur && bitmapH < 100 && bitmapW < 100) {
Utilities.blurBitmap(image, (int)bitmapW, (int)bitmapH, image.getRowBytes());
}
} }
if (FileLoader.getInstance().runtimeHack != null) { if (FileLoader.getInstance().runtimeHack != null) {
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight()); FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
...@@ -494,10 +500,14 @@ public class FileLoadOperation { ...@@ -494,10 +500,14 @@ public class FileLoadOperation {
float w_filter = 0; float w_filter = 0;
float h_filter; float h_filter;
boolean blur = false;
if (filter != null) { if (filter != null) {
String args[] = filter.split("_"); String args[] = filter.split("_");
w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density; w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density; h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
if (args.length > 2) {
blur = true;
}
opts.inJustDecodeBounds = true; opts.inJustDecodeBounds = true;
BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts); BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts);
...@@ -511,7 +521,7 @@ public class FileLoadOperation { ...@@ -511,7 +521,7 @@ public class FileLoadOperation {
opts.inSampleSize = (int) scaleFactor; opts.inSampleSize = (int) scaleFactor;
} }
if (filter == null) { if (filter == null || blur) {
opts.inPreferredConfig = Bitmap.Config.ARGB_8888; opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
} else { } else {
opts.inPreferredConfig = Bitmap.Config.RGB_565; opts.inPreferredConfig = Bitmap.Config.RGB_565;
...@@ -540,7 +550,9 @@ public class FileLoadOperation { ...@@ -540,7 +550,9 @@ public class FileLoadOperation {
image = scaledBitmap; image = scaledBitmap;
} }
} }
if (image != null && blur && bitmapH < 100 && bitmapW < 100) {
Utilities.blurBitmap(image, (int)bitmapW, (int)bitmapH, image.getRowBytes());
}
} }
if (image != null && FileLoader.getInstance().runtimeHack != null) { if (image != null && FileLoader.getInstance().runtimeHack != null) {
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight()); FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
......
TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
View file @ 91ae97e2
...@@ -64,7 +64,7 @@ public class FileLoader { ...@@ -64,7 +64,7 @@ public class FileLoader {
private long lastProgressUpdateTime = 0; private long lastProgressUpdateTime = 0;
private HashMap<String, Integer> BitmapUseCounts = new HashMap<String, Integer>(); private HashMap<String, Integer> BitmapUseCounts = new HashMap<String, Integer>();
int lastImageNum; private int lastImageNum = 0;
public static final int FileDidUpload = 10000; public static final int FileDidUpload = 10000;
public static final int FileDidFailUpload = 10001; public static final int FileDidFailUpload = 10001;
...@@ -717,15 +717,15 @@ public class FileLoader { ...@@ -717,15 +717,15 @@ public class FileLoader {
}); });
} }
public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter) {
return getImageFromMemory(url, null, imageView, filter, cancel); return getImageFromMemory(url, null, imageView, filter);
} }
public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter) {
return getImageFromMemory(null, url, imageView, filter, cancel); return getImageFromMemory(null, url, imageView, filter);
} }
public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, ImageReceiver imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, ImageReceiver imageView, String filter) {
if (url == null && httpUrl == null) { if (url == null && httpUrl == null) {
return null; return null;
} }
...@@ -739,11 +739,7 @@ public class FileLoader { ...@@ -739,11 +739,7 @@ public class FileLoader {
key += "@" + filter; key += "@" + filter;
} }
Bitmap img = imageFromKey(key); return imageFromKey(key);
if (imageView != null && img != null && cancel) {
cancelLoadingForImageView(imageView);
}
return img;
} }
private void performReplace(String oldKey, String newKey) { private void performReplace(String oldKey, String newKey) {
......
TMessagesProj/src/main/java/org/telegram/messenger/TLClassStore.java
View file @ 91ae97e2
...@@ -439,6 +439,7 @@ public class TLClassStore { ...@@ -439,6 +439,7 @@ public class TLClassStore {
classStore.put(TLRPC.TL_decryptedMessageMediaAudio_old.constructor, TLRPC.TL_decryptedMessageMediaAudio_old.class); classStore.put(TLRPC.TL_decryptedMessageMediaAudio_old.constructor, TLRPC.TL_decryptedMessageMediaAudio_old.class);
classStore.put(TLRPC.TL_audio_old.constructor, TLRPC.TL_audio_old.class); classStore.put(TLRPC.TL_audio_old.constructor, TLRPC.TL_audio_old.class);
classStore.put(TLRPC.TL_video_old.constructor, TLRPC.TL_video_old.class); classStore.put(TLRPC.TL_video_old.constructor, TLRPC.TL_video_old.class);
classStore.put(TLRPC.TL_messageActionCreatedBroadcastList.constructor, TLRPC.TL_messageActionCreatedBroadcastList.class);
} }
static TLClassStore store = null; static TLClassStore store = null;
......
TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
View file @ 91ae97e2
...@@ -8996,6 +8996,17 @@ public class TLRPC { ...@@ -8996,6 +8996,17 @@ public class TLRPC {
} }
} }
public static class TL_messageActionCreatedBroadcastList extends MessageAction {
public static int constructor = 0x55555557;
public void readParams(AbsSerializedData stream) {
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
}
}
public static class TL_documentEncrypted extends TL_document { public static class TL_documentEncrypted extends TL_document {
public static int constructor = 0x55555556; public static int constructor = 0x55555556;
......
TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
View file @ 91ae97e2
...@@ -24,6 +24,7 @@ public class UserConfig { ...@@ -24,6 +24,7 @@ public class UserConfig {
public static String pushString = ""; public static String pushString = "";
public static int lastSendMessageId = -210000; public static int lastSendMessageId = -210000;
public static int lastLocalId = -210000; public static int lastLocalId = -210000;
public static int lastBroadcastId = -1;
public static String contactsHash = ""; public static String contactsHash = "";
public static String importHash = ""; public static String importHash = "";
private final static Integer sync = 1; private final static Integer sync = 1;
...@@ -56,6 +57,7 @@ public class UserConfig { ...@@ -56,6 +57,7 @@ public class UserConfig {
editor.putString("importHash", importHash); editor.putString("importHash", importHash);
editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos); editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos);
editor.putInt("contactsVersion", contactsVersion); editor.putInt("contactsVersion", contactsVersion);
editor.putInt("lastBroadcastId", lastBroadcastId);
editor.putBoolean("registeredForInternalPush", registeredForInternalPush); editor.putBoolean("registeredForInternalPush", registeredForInternalPush);
if (currentUser != null) { if (currentUser != null) {
if (withFile) { if (withFile) {
...@@ -174,6 +176,7 @@ public class UserConfig { ...@@ -174,6 +176,7 @@ public class UserConfig {
importHash = preferences.getString("importHash", ""); importHash = preferences.getString("importHash", "");
saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false); saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false);
contactsVersion = preferences.getInt("contactsVersion", 0); contactsVersion = preferences.getInt("contactsVersion", 0);
lastBroadcastId = preferences.getInt("lastBroadcastId", -1);
registeredForInternalPush = preferences.getBoolean("registeredForInternalPush", false); registeredForInternalPush = preferences.getBoolean("registeredForInternalPush", false);
String user = preferences.getString("user", null); String user = preferences.getString("user", null);
if (user != null) { if (user != null) {
...@@ -196,6 +199,7 @@ public class UserConfig { ...@@ -196,6 +199,7 @@ public class UserConfig {
lastLocalId = -210000; lastLocalId = -210000;
lastSendMessageId = -210000; lastSendMessageId = -210000;
contactsVersion = 1; contactsVersion = 1;
lastBroadcastId = -1;
saveIncomingPhotos = false; saveIncomingPhotos = false;
saveConfig(true); saveConfig(true);
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
View file @ 91ae97e2
...@@ -132,6 +132,7 @@ public class Utilities { ...@@ -132,6 +132,7 @@ public class Utilities {
public native static long doPQNative(long _what); public native static long doPQNative(long _what);
public native static void loadBitmap(String path, int[] bitmap, int scale, int format, int width, int height); public native static void loadBitmap(String path, int[] bitmap, int scale, int format, int width, int height);
public native static void blurBitmap(Object bitmap, int width, int height, int stride);
private native static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, int offset, int length); private native static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, int offset, int length);
public static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, boolean changeIv, int offset, int length) { public static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, boolean changeIv, int offset, int length) {
...@@ -139,6 +140,9 @@ public class Utilities { ...@@ -139,6 +140,9 @@ public class Utilities {
} }
public static Integer parseInt(String value) { public static Integer parseInt(String value) {
if (value == null) {
return 0;
}
Integer val = 0; Integer val = 0;
try { try {
Matcher matcher = pattern.matcher(value); Matcher matcher = pattern.matcher(value);
...@@ -548,7 +552,7 @@ public class Utilities { ...@@ -548,7 +552,7 @@ public class Utilities {
} }
public static int getGroupAvatarForId(int id) { public static int getGroupAvatarForId(int id) {
return arrGroupsAvatars[getColorIndex(-id)]; return arrGroupsAvatars[getColorIndex(-Math.abs(id))];
} }
public static String MD5(String md5) { public static String MD5(String md5) {
......
TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java
View file @ 91ae97e2
...@@ -63,6 +63,10 @@ public class MessageObject { ...@@ -63,6 +63,10 @@ public class MessageObject {
public ArrayList<TextLayoutBlock> textLayoutBlocks; public ArrayList<TextLayoutBlock> textLayoutBlocks;
public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users) { public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users) {
this(message, users, 1);
}
public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users, int preview) {
if (textPaint == null) { if (textPaint == null) {
textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
textPaint.setColor(0xff000000); textPaint.setColor(0xff000000);
...@@ -136,7 +140,7 @@ public class MessageObject { ...@@ -136,7 +140,7 @@ public class MessageObject {
} else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) { } else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) {
photoThumbs = new ArrayList<PhotoObject>(); photoThumbs = new ArrayList<PhotoObject>();
for (TLRPC.PhotoSize size : message.action.photo.sizes) { for (TLRPC.PhotoSize size : message.action.photo.sizes) {
photoThumbs.add(new PhotoObject(size)); photoThumbs.add(new PhotoObject(size, preview));
} }
if (isFromMe()) { if (isFromMe()) {
messageText = LocaleController.getString("ActionYouChangedPhoto", R.string.ActionYouChangedPhoto); messageText = LocaleController.getString("ActionYouChangedPhoto", R.string.ActionYouChangedPhoto);
...@@ -232,13 +236,15 @@ public class MessageObject { ...@@ -232,13 +236,15 @@ public class MessageObject {
} }
} }
} }
} else if (message.action instanceof TLRPC.TL_messageActionCreatedBroadcastList) {
messageText = LocaleController.formatString("YouCreatedBroadcastList", R.string.YouCreatedBroadcastList);
} }
} }
} else if (message.media != null && !(message.media instanceof TLRPC.TL_messageMediaEmpty)) { } else if (message.media != null && !(message.media instanceof TLRPC.TL_messageMediaEmpty)) {
if (message.media instanceof TLRPC.TL_messageMediaPhoto) { if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
photoThumbs = new ArrayList<PhotoObject>(); photoThumbs = new ArrayList<PhotoObject>();
for (TLRPC.PhotoSize size : message.media.photo.sizes) { for (TLRPC.PhotoSize size : message.media.photo.sizes) {
PhotoObject obj = new PhotoObject(size); PhotoObject obj = new PhotoObject(size, preview);
photoThumbs.add(obj); photoThumbs.add(obj);
if (imagePreview == null && obj.image != null) { if (imagePreview == null && obj.image != null) {
imagePreview = obj.image; imagePreview = obj.image;
...@@ -247,7 +253,7 @@ public class MessageObject { ...@@ -247,7 +253,7 @@ public class MessageObject {
messageText = LocaleController.getString("AttachPhoto", R.string.AttachPhoto); messageText = LocaleController.getString("AttachPhoto", R.string.AttachPhoto);
} else if (message.media instanceof TLRPC.TL_messageMediaVideo) { } else if (message.media instanceof TLRPC.TL_messageMediaVideo) {
photoThumbs = new ArrayList<PhotoObject>(); photoThumbs = new ArrayList<PhotoObject>();
PhotoObject obj = new PhotoObject(message.media.video.thumb); PhotoObject obj = new PhotoObject(message.media.video.thumb, preview);
photoThumbs.add(obj); photoThumbs.add(obj);
if (imagePreview == null && obj.image != null) { if (imagePreview == null && obj.image != null) {
imagePreview = obj.image; imagePreview = obj.image;
...@@ -262,7 +268,7 @@ public class MessageObject { ...@@ -262,7 +268,7 @@ public class MessageObject {
} else if (message.media instanceof TLRPC.TL_messageMediaDocument) { } else if (message.media instanceof TLRPC.TL_messageMediaDocument) {
if (!(message.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty)) { if (!(message.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty)) {
photoThumbs = new ArrayList<PhotoObject>(); photoThumbs = new ArrayList<PhotoObject>();
PhotoObject obj = new PhotoObject(message.media.document.thumb); PhotoObject obj = new PhotoObject(message.media.document.thumb, preview);
photoThumbs.add(obj); photoThumbs.add(obj);
} }
messageText = LocaleController.getString("AttachDocument", R.string.AttachDocument); messageText = LocaleController.getString("AttachDocument", R.string.AttachDocument);
......
TMessagesProj/src/main/java/org/telegram/objects/PhotoObject.java
View file @ 91ae97e2
...@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory; ...@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory;
import org.telegram.messenger.TLRPC; import org.telegram.messenger.TLRPC;
import org.telegram.messenger.FileLoader; import org.telegram.messenger.FileLoader;
import org.telegram.messenger.Utilities;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -20,21 +21,26 @@ public class PhotoObject { ...@@ -20,21 +21,26 @@ public class PhotoObject {
public TLRPC.PhotoSize photoOwner; public TLRPC.PhotoSize photoOwner;
public Bitmap image; public Bitmap image;
public PhotoObject(TLRPC.PhotoSize photo) { public PhotoObject(TLRPC.PhotoSize photo, int preview) {
photoOwner = photo; photoOwner = photo;
if (photo instanceof TLRPC.TL_photoCachedSize) { if (preview != 0 && photo instanceof TLRPC.TL_photoCachedSize) {
BitmapFactory.Options opts = new BitmapFactory.Options(); BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inPreferredConfig = Bitmap.Config.RGB_565; opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
opts.inDither = false; opts.inDither = false;
opts.outWidth = photo.w; opts.outWidth = photo.w;
opts.outHeight = photo.h; opts.outHeight = photo.h;
image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts); image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts);
if (image != null && FileLoader.getInstance().runtimeHack != null) { if (image != null) {
if (preview == 2) {
Utilities.blurBitmap(image, image.getWidth(), image.getHeight(), image.getRowBytes());
}
if (FileLoader.getInstance().runtimeHack != null) {
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight()); FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
} }
} }
} }
}
public static PhotoObject getClosestImageWithSize(ArrayList<PhotoObject> arr, int width, int height) { public static PhotoObject getClosestImageWithSize(ArrayList<PhotoObject> arr, int width, int height) {
if (arr == null) { if (arr == null) {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
View file @ 91ae97e2
...@@ -31,7 +31,7 @@ import org.telegram.objects.PhotoObject; ...@@ -31,7 +31,7 @@ import org.telegram.objects.PhotoObject;
import org.telegram.ui.PhotoViewer; import org.telegram.ui.PhotoViewer;
import org.telegram.ui.Views.GifDrawable; import org.telegram.ui.Views.GifDrawable;
import org.telegram.ui.Views.ImageReceiver; import org.telegram.ui.Views.ImageReceiver;
import org.telegram.ui.Views.ProgressView; import org.telegram.ui.Views.RoundProgressView;
import java.io.File; import java.io.File;
import java.util.Locale; import java.util.Locale;
...@@ -45,7 +45,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -45,7 +45,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
private static Drawable placeholderInDrawable; private static Drawable placeholderInDrawable;
private static Drawable placeholderOutDrawable; private static Drawable placeholderOutDrawable;
private static Drawable videoIconDrawable; private static Drawable videoIconDrawable;
private static Drawable[][] buttonStatesDrawables = new Drawable[4][2]; private static Drawable[] buttonStatesDrawables = new Drawable[4];
private static TextPaint infoPaint; private static TextPaint infoPaint;
private static MessageObject lastDownloadedGifMessage = null; private static MessageObject lastDownloadedGifMessage = null;
...@@ -57,10 +57,11 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -57,10 +57,11 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
private String currentUrl; private String currentUrl;
private String currentPhotoFilter; private String currentPhotoFilter;
private ImageReceiver photoImage; private ImageReceiver photoImage;
private ProgressView progressView; private RoundProgressView progressView;
public int downloadPhotos = 0; public int downloadPhotos = 0;
private boolean progressVisible = false; private boolean progressVisible = false;
private boolean photoNotSet = false; private boolean photoNotSet = false;
private boolean cancelLoading = false;
private int TAG; private int TAG;
...@@ -83,14 +84,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -83,14 +84,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
if (placeholderInDrawable == null) { if (placeholderInDrawable == null) {
placeholderInDrawable = getResources().getDrawable(R.drawable.photo_placeholder_in); placeholderInDrawable = getResources().getDrawable(R.drawable.photo_placeholder_in);
placeholderOutDrawable = getResources().getDrawable(R.drawable.photo_placeholder_out); placeholderOutDrawable = getResources().getDrawable(R.drawable.photo_placeholder_out);
buttonStatesDrawables[0][0] = getResources().getDrawable(R.drawable.photoload); buttonStatesDrawables[0] = getResources().getDrawable(R.drawable.photoload);
buttonStatesDrawables[0][1] = getResources().getDrawable(R.drawable.photoload_pressed); buttonStatesDrawables[1] = getResources().getDrawable(R.drawable.photocancel);
buttonStatesDrawables[1][0] = getResources().getDrawable(R.drawable.photocancel); buttonStatesDrawables[2] = getResources().getDrawable(R.drawable.photogif);
buttonStatesDrawables[1][1] = getResources().getDrawable(R.drawable.photocancel_pressed); buttonStatesDrawables[3] = getResources().getDrawable(R.drawable.playvideo);
buttonStatesDrawables[2][0] = getResources().getDrawable(R.drawable.photogif);
buttonStatesDrawables[2][1] = getResources().getDrawable(R.drawable.photogif_pressed);
buttonStatesDrawables[3][0] = getResources().getDrawable(R.drawable.playvideo);
buttonStatesDrawables[3][1] = getResources().getDrawable(R.drawable.playvideo_pressed);
videoIconDrawable = getResources().getDrawable(R.drawable.ic_video); videoIconDrawable = getResources().getDrawable(R.drawable.ic_video);
infoPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); infoPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
...@@ -102,8 +99,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -102,8 +99,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
photoImage = new ImageReceiver(); photoImage = new ImageReceiver();
photoImage.parentView = this; photoImage.parentView = this;
progressView = new ProgressView(); progressView = new RoundProgressView();
progressView.setProgressColors(0x802a2a2a, 0xffffffff);
} }
public void clearGifImage() { public void clearGifImage() {
...@@ -225,6 +221,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -225,6 +221,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
private void didPressedButton() { private void didPressedButton() {
if (buttonState == 0) { if (buttonState == 0) {
cancelLoading = false;
if (currentMessageObject.type == 1) { if (currentMessageObject.type == 1) {
if (currentMessageObject.imagePreview != null) { if (currentMessageObject.imagePreview != null) {
photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(currentMessageObject.imagePreview), currentPhotoObject.photoOwner.size); photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(currentMessageObject.imagePreview), currentPhotoObject.photoOwner.size);
...@@ -246,6 +243,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -246,6 +243,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
delegate.didPressedCancelSendButton(this); delegate.didPressedCancelSendButton(this);
} }
} else { } else {
cancelLoading = true;
if (currentMessageObject.type == 1) { if (currentMessageObject.type == 1) {
FileLoader.getInstance().cancelLoadingForImageView(photoImage); FileLoader.getInstance().cancelLoadingForImageView(photoImage);
} else if (currentMessageObject.type == 8) { } else if (currentMessageObject.type == 8) {
...@@ -304,6 +302,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -304,6 +302,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
public void setMessageObject(MessageObject messageObject) { public void setMessageObject(MessageObject messageObject) {
if (currentMessageObject != messageObject || isPhotoDataChanged(messageObject) || isUserDataChanged()) { if (currentMessageObject != messageObject || isPhotoDataChanged(messageObject) || isUserDataChanged()) {
super.setMessageObject(messageObject); super.setMessageObject(messageObject);
cancelLoading = false;
progressVisible = false; progressVisible = false;
buttonState = -1; buttonState = -1;
...@@ -395,6 +394,9 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -395,6 +394,9 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
photoHeight = h; photoHeight = h;
backgroundWidth = w + AndroidUtilities.dp(12); backgroundWidth = w + AndroidUtilities.dp(12);
currentPhotoFilter = String.format(Locale.US, "%d_%d", (int) (w / AndroidUtilities.density), (int) (h / AndroidUtilities.density)); currentPhotoFilter = String.format(Locale.US, "%d_%d", (int) (w / AndroidUtilities.density), (int) (h / AndroidUtilities.density));
if (messageObject.photoThumbs.size() > 1) {
currentPhotoFilter += "_b";
}
if (currentPhotoObject.image != null) { if (currentPhotoObject.image != null) {
photoImage.setImageBitmap(currentPhotoObject.image); photoImage.setImageBitmap(currentPhotoObject.image);
...@@ -485,20 +487,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -485,20 +487,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
if (!cacheFile.exists()) { if (!cacheFile.exists()) {
MediaController.getInstance().addLoadingFileObserver(fileName, this); MediaController.getInstance().addLoadingFileObserver(fileName, this);
if (!FileLoader.getInstance().isLoadingFile(fileName)) { if (!FileLoader.getInstance().isLoadingFile(fileName)) {
if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) { if (cancelLoading || currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
buttonState = 0; buttonState = 0;
progressVisible = false; progressVisible = false;
} else { } else {
buttonState = -1; buttonState = 1;
progressVisible = true; progressVisible = true;
} }
progressView.setProgress(0); progressView.setProgress(0);
} else { } else {
if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
buttonState = 1; buttonState = 1;
} else {
buttonState = -1;
}
progressVisible = true; progressVisible = true;
Float progress = FileLoader.getInstance().fileProgresses.get(fileName); Float progress = FileLoader.getInstance().fileProgresses.get(fileName);
if (progress != null) { if (progress != null) {
...@@ -544,13 +542,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -544,13 +542,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
photoImage.imageW = photoWidth; photoImage.imageW = photoWidth;
photoImage.imageH = photoHeight; photoImage.imageH = photoHeight;
progressView.width = timeX - photoImage.imageX - AndroidUtilities.dpf(23.0f);
progressView.height = AndroidUtilities.dp(3);
progressView.progressHeight = AndroidUtilities.dp(3);
int size = AndroidUtilities.dp(44); int size = AndroidUtilities.dp(44);
buttonX = (int)(photoImage.imageX + (photoWidth - size) / 2.0f); buttonX = (int)(photoImage.imageX + (photoWidth - size) / 2.0f);
buttonY = (int)(photoImage.imageY + (photoHeight - size) / 2.0f); buttonY = (int)(photoImage.imageY + (photoHeight - size) / 2.0f);
progressView.rect.set(buttonX + AndroidUtilities.dp(2), buttonY + AndroidUtilities.dp(2), buttonX + AndroidUtilities.dp(42), buttonY + AndroidUtilities.dp(42));
} }
@Override @Override
...@@ -566,22 +561,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD ...@@ -566,22 +561,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
drawTime = photoImage.getVisible(); drawTime = photoImage.getVisible();
} }
if (progressVisible) {
setDrawableBounds(mediaBackgroundDrawable, photoImage.imageX + AndroidUtilities.dp(4), layoutHeight - AndroidUtilities.dpf(27.5f), progressView.width + AndroidUtilities.dp(12), AndroidUtilities.dpf(16.5f));
mediaBackgroundDrawable.draw(canvas);
canvas.save();
canvas.translate(photoImage.imageX + AndroidUtilities.dp(10), layoutHeight - AndroidUtilities.dpf(21.0f));
progressView.draw(canvas);
canvas.restore();
}
if (buttonState >= 0 && buttonState < 4) { if (buttonState >= 0 && buttonState < 4) {
Drawable currentButtonDrawable = buttonStatesDrawables[buttonState][buttonPressed]; Drawable currentButtonDrawable = buttonStatesDrawables[buttonState];
setDrawableBounds(currentButtonDrawable, buttonX, buttonY); setDrawableBounds(currentButtonDrawable, buttonX, buttonY);
currentButtonDrawable.draw(canvas); currentButtonDrawable.draw(canvas);
} }
if (progressVisible) {
progressView.draw(canvas);
}
if (infoLayout != null && (buttonState == 1 || buttonState == 0 || buttonState == 3)) { if (infoLayout != null && (buttonState == 1 || buttonState == 0 || buttonState == 3)) {
setDrawableBounds(mediaBackgroundDrawable, photoImage.imageX + AndroidUtilities.dp(4), photoImage.imageY + AndroidUtilities.dp(4), infoWidth + AndroidUtilities.dp(8) + infoOffset, AndroidUtilities.dpf(16.5f)); setDrawableBounds(mediaBackgroundDrawable, photoImage.imageX + AndroidUtilities.dp(4), photoImage.imageY + AndroidUtilities.dp(4), infoWidth + AndroidUtilities.dp(8) + infoOffset, AndroidUtilities.dpf(16.5f));
mediaBackgroundDrawable.draw(canvas); mediaBackgroundDrawable.draw(canvas);
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @ 91ae97e2
...@@ -46,6 +46,7 @@ public class DialogCell extends BaseCell { ...@@ -46,6 +46,7 @@ public class DialogCell extends BaseCell {
private static Drawable lockDrawable; private static Drawable lockDrawable;
private static Drawable countDrawable; private static Drawable countDrawable;
private static Drawable groupDrawable; private static Drawable groupDrawable;
private static Drawable broadcastDrawable;
private TLRPC.TL_dialog currentDialog; private TLRPC.TL_dialog currentDialog;
private ImageReceiver avatarImage; private ImageReceiver avatarImage;
...@@ -130,6 +131,10 @@ public class DialogCell extends BaseCell { ...@@ -130,6 +131,10 @@ public class DialogCell extends BaseCell {
groupDrawable = getResources().getDrawable(R.drawable.grouplist); groupDrawable = getResources().getDrawable(R.drawable.grouplist);
} }
if (broadcastDrawable == null) {
broadcastDrawable = getResources().getDrawable(R.drawable.broadcast);
}
if (avatarImage == null) { if (avatarImage == null) {
avatarImage = new ImageReceiver(); avatarImage = new ImageReceiver();
avatarImage.parentView = this; avatarImage.parentView = this;
...@@ -227,10 +232,15 @@ public class DialogCell extends BaseCell { ...@@ -227,10 +232,15 @@ public class DialogCell extends BaseCell {
user = MessagesController.getInstance().users.get(lower_id); user = MessagesController.getInstance().users.get(lower_id);
} }
} else { } else {
encryptedChat = MessagesController.getInstance().encryptedChats.get((int)(currentDialog.id >> 32)); int high_id = (int)(currentDialog.id >> 32);
if (high_id > 0) {
encryptedChat = MessagesController.getInstance().encryptedChats.get(high_id);
if (encryptedChat != null) { if (encryptedChat != null) {
user = MessagesController.getInstance().users.get(encryptedChat.user_id); user = MessagesController.getInstance().users.get(encryptedChat.user_id);
} }
} else {
chat = MessagesController.getInstance().chats.get(high_id);
}
} }
int placeHolderId = 0; int placeHolderId = 0;
...@@ -274,6 +284,9 @@ public class DialogCell extends BaseCell { ...@@ -274,6 +284,9 @@ public class DialogCell extends BaseCell {
} else if (cellLayout.drawNameGroup) { } else if (cellLayout.drawNameGroup) {
setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop); setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
groupDrawable.draw(canvas); groupDrawable.draw(canvas);
} else if (cellLayout.drawNameBroadcast) {
setDrawableBounds(broadcastDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
broadcastDrawable.draw(canvas);
} }
canvas.save(); canvas.save();
...@@ -328,6 +341,7 @@ public class DialogCell extends BaseCell { ...@@ -328,6 +341,7 @@ public class DialogCell extends BaseCell {
private StaticLayout nameLayout; private StaticLayout nameLayout;
private boolean drawNameLock; private boolean drawNameLock;
private boolean drawNameGroup; private boolean drawNameGroup;
private boolean drawNameBroadcast;
private int nameLockLeft; private int nameLockLeft;
private int nameLockTop; private int nameLockTop;
...@@ -372,9 +386,12 @@ public class DialogCell extends BaseCell { ...@@ -372,9 +386,12 @@ public class DialogCell extends BaseCell {
TextPaint currentMessagePaint = messagePaint; TextPaint currentMessagePaint = messagePaint;
boolean checkMessage = true; boolean checkMessage = true;
drawNameGroup = false;
drawNameBroadcast = false;
drawNameLock = false;
if (encryptedChat != null) { if (encryptedChat != null) {
drawNameLock = true; drawNameLock = true;
drawNameGroup = false;
nameLockTop = AndroidUtilities.dp(13); nameLockTop = AndroidUtilities.dp(13);
if (!LocaleController.isRTL) { if (!LocaleController.isRTL) {
nameLockLeft = AndroidUtilities.dp(77); nameLockLeft = AndroidUtilities.dp(77);
...@@ -384,19 +401,21 @@ public class DialogCell extends BaseCell { ...@@ -384,19 +401,21 @@ public class DialogCell extends BaseCell {
nameLeft = AndroidUtilities.dp(14); nameLeft = AndroidUtilities.dp(14);
} }
} else { } else {
drawNameLock = false;
if (chat != null) { if (chat != null) {
if (chat.id < 0) {
drawNameBroadcast = true;
} else {
drawNameGroup = true; drawNameGroup = true;
}
nameLockTop = AndroidUtilities.dp(14); nameLockTop = AndroidUtilities.dp(14);
if (!LocaleController.isRTL) { if (!LocaleController.isRTL) {
nameLockLeft = AndroidUtilities.dp(77); nameLockLeft = AndroidUtilities.dp(77);
nameLeft = AndroidUtilities.dp(81) + groupDrawable.getIntrinsicWidth(); nameLeft = AndroidUtilities.dp(81) + (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
} else { } else {
nameLockLeft = width - AndroidUtilities.dp(77) - groupDrawable.getIntrinsicWidth(); nameLockLeft = width - AndroidUtilities.dp(77) - (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
nameLeft = AndroidUtilities.dp(14); nameLeft = AndroidUtilities.dp(14);
} }
} else { } else {
drawNameGroup = false;
if (!LocaleController.isRTL) { if (!LocaleController.isRTL) {
nameLeft = AndroidUtilities.dp(77); nameLeft = AndroidUtilities.dp(77);
} else { } else {
...@@ -461,7 +480,7 @@ public class DialogCell extends BaseCell { ...@@ -461,7 +480,7 @@ public class DialogCell extends BaseCell {
messageString = message.messageText; messageString = message.messageText;
currentMessagePaint = messagePrintingPaint; currentMessagePaint = messagePrintingPaint;
} else { } else {
if (chat != null) { if (chat != null && chat.id > 0) {
String name = ""; String name = "";
if (message.isFromMe()) { if (message.isFromMe()) {
name = LocaleController.getString("FromYou", R.string.FromYou); name = LocaleController.getString("FromYou", R.string.FromYou);
...@@ -505,7 +524,7 @@ public class DialogCell extends BaseCell { ...@@ -505,7 +524,7 @@ public class DialogCell extends BaseCell {
} }
} }
if (message.isFromMe()) { if (message.isFromMe() && message.isOut()) {
if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) { if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) {
drawCheck1 = false; drawCheck1 = false;
drawCheck2 = false; drawCheck2 = false;
...@@ -579,6 +598,8 @@ public class DialogCell extends BaseCell { ...@@ -579,6 +598,8 @@ public class DialogCell extends BaseCell {
nameWidth -= AndroidUtilities.dp(4) + lockDrawable.getIntrinsicWidth(); nameWidth -= AndroidUtilities.dp(4) + lockDrawable.getIntrinsicWidth();
} else if (drawNameGroup) { } else if (drawNameGroup) {
nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth(); nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth();
} else if (drawNameBroadcast) {
nameWidth -= AndroidUtilities.dp(4) + broadcastDrawable.getIntrinsicWidth();
} }
if (drawClock) { if (drawClock) {
int w = clockDrawable.getIntrinsicWidth() + AndroidUtilities.dp(2); int w = clockDrawable.getIntrinsicWidth() + AndroidUtilities.dp(2);
......
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @ 91ae97e2
...@@ -212,7 +212,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -212,7 +212,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
} }
MessagesController.getInstance().loadChatInfo(currentChat.id); MessagesController.getInstance().loadChatInfo(currentChat.id);
if (chatId > 0) {
dialog_id = -chatId; dialog_id = -chatId;
} else {
dialog_id = ((long)chatId) << 32;
}
} else if (userId != 0) { } else if (userId != 0) {
currentUser = MessagesController.getInstance().users.get(userId); currentUser = MessagesController.getInstance().users.get(userId);
if (currentUser == null) { if (currentUser == null) {
...@@ -528,6 +532,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -528,6 +532,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (currentEncryptedChat != null) { if (currentEncryptedChat != null) {
actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4)); actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4));
} else if (currentChat != null && currentChat.id < 0) {
actionBarLayer.setTitleIcon(R.drawable.broadcast2, AndroidUtilities.dp(4));
} }
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBarLayer.createMenu();
...@@ -1045,7 +1051,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1045,7 +1051,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private int getMessageType(MessageObject messageObject) { private int getMessageType(MessageObject messageObject) {
if (currentEncryptedChat == null) { if (currentEncryptedChat == null) {
if (messageObject.messageOwner.id <= 0 && messageObject.isOut()) { boolean isBroadcastError = (int)dialog_id == 0 && messageObject.messageOwner.id <= 0 && messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR;
if ((int)dialog_id != 0 && messageObject.messageOwner.id <= 0 && messageObject.isOut() || isBroadcastError) {
if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) { if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) {
if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) { if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
return 0; return 0;
...@@ -1771,7 +1778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1771,7 +1778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (messArr.size() != count) { if (messArr.size() != count) {
if (isCache) { if (isCache) {
cacheEndReaced = true; cacheEndReaced = true;
if (currentEncryptedChat != null) { if ((int)dialog_id == 0) {
endReached = true; endReached = true;
} }
} else { } else {
...@@ -2897,26 +2904,26 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2897,26 +2904,26 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private void forwardSelectedMessages(long did, boolean fromMyName) { private void forwardSelectedMessages(long did, boolean fromMyName) {
if (forwaringMessage != null) { if (forwaringMessage != null) {
if (forwaringMessage.messageOwner.id > 0) {
if (!fromMyName) { if (!fromMyName) {
if (forwaringMessage.messageOwner.id > 0) {
MessagesController.getInstance().sendMessage(forwaringMessage, did); MessagesController.getInstance().sendMessage(forwaringMessage, did);
}
} else { } else {
processForwardFromMe(forwaringMessage, did); processForwardFromMe(forwaringMessage, did);
} }
}
forwaringMessage = null; forwaringMessage = null;
} else { } else {
ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet()); ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
Collections.sort(ids); Collections.sort(ids);
for (Integer id : ids) { for (Integer id : ids) {
if (id > 0) {
if (!fromMyName) { if (!fromMyName) {
if (id > 0) {
MessagesController.getInstance().sendMessage(selectedMessagesIds.get(id), did); MessagesController.getInstance().sendMessage(selectedMessagesIds.get(id), did);
}
} else { } else {
processForwardFromMe(selectedMessagesIds.get(id), did); processForwardFromMe(selectedMessagesIds.get(id), did);
} }
} }
}
selectedMessagesCanCopyIds.clear(); selectedMessagesCanCopyIds.clear();
selectedMessagesIds.clear(); selectedMessagesIds.clear();
} }
...@@ -2925,7 +2932,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2925,7 +2932,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public void didSelectDialog(MessagesActivity activity, long did, boolean param) { public void didSelectDialog(MessagesActivity activity, long did, boolean param) {
if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) { if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) {
if ((int)dialog_id == 0 && currentEncryptedChat == null) {
param = true;
}
if (did != dialog_id) { if (did != dialog_id) {
int lower_part = (int)did; int lower_part = (int)did;
if (lower_part != 0) { if (lower_part != 0) {
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @ 91ae97e2
...@@ -112,7 +112,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -112,7 +112,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
NotificationCenter.getInstance().addObserver(this, MessagesController.closeChats); NotificationCenter.getInstance().addObserver(this, MessagesController.closeChats);
updateOnlineCount(); updateOnlineCount();
if (chat_id > 0) {
MessagesController.getInstance().getMediaCount(-chat_id, classGuid, true); MessagesController.getInstance().getMediaCount(-chat_id, classGuid, true);
}
avatarUpdater.delegate = new AvatarUpdater.AvatarUpdaterDelegate() { avatarUpdater.delegate = new AvatarUpdater.AvatarUpdaterDelegate() {
@Override @Override
public void didUploadedPhoto(TLRPC.InputFile file, TLRPC.PhotoSize small, TLRPC.PhotoSize big) { public void didUploadedPhoto(TLRPC.InputFile file, TLRPC.PhotoSize small, TLRPC.PhotoSize big) {
...@@ -131,10 +133,12 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -131,10 +133,12 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
private void updateRowsIds() { private void updateRowsIds() {
rowCount = 0; rowCount = 0;
avatarRow = rowCount++; avatarRow = rowCount++;
if (chat_id > 0) {
settingsSectionRow = rowCount++; settingsSectionRow = rowCount++;
settingsNotificationsRow = rowCount++; settingsNotificationsRow = rowCount++;
sharedMediaSectionRow = rowCount++; sharedMediaSectionRow = rowCount++;
sharedMediaRow = rowCount++; sharedMediaRow = rowCount++;
}
if (info != null && !(info instanceof TLRPC.TL_chatParticipantsForbidden)) { if (info != null && !(info instanceof TLRPC.TL_chatParticipantsForbidden)) {
membersSectionRow = rowCount++; membersSectionRow = rowCount++;
rowCount += info.participants.size(); rowCount += info.participants.size();
...@@ -149,8 +153,10 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -149,8 +153,10 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
addMemberRow = -1; addMemberRow = -1;
membersSectionRow = -1; membersSectionRow = -1;
} }
if (chat_id > 0) {
leaveGroupRow = rowCount++; leaveGroupRow = rowCount++;
} }
}
@Override @Override
public void onFragmentDestroy() { public void onFragmentDestroy() {
...@@ -166,7 +172,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -166,7 +172,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back); actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
if (chat_id > 0) {
actionBarLayer.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo)); actionBarLayer.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo));
} else {
actionBarLayer.setTitle(LocaleController.getString("BroadcastList", R.string.BroadcastList));
}
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
@Override @Override
public void onItemClick(int id) { public void onItemClick(int id) {
...@@ -181,7 +191,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -181,7 +191,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
View item = menu.addItemResource(done_button, R.layout.group_profile_add_member_layout); View item = menu.addItemResource(done_button, R.layout.group_profile_add_member_layout);
TextView textView = (TextView)item.findViewById(R.id.done_button); TextView textView = (TextView)item.findViewById(R.id.done_button);
if (textView != null) { if (textView != null) {
if (chat_id > 0) {
textView.setText(LocaleController.getString("AddMember", R.string.AddMember)); textView.setText(LocaleController.getString("AddMember", R.string.AddMember));
} else {
textView.setText(LocaleController.getString("AddRecipient", R.string.AddRecipient));
}
} }
fragmentView = inflater.inflate(R.layout.chat_profile_layout, container, false); fragmentView = inflater.inflate(R.layout.chat_profile_layout, container, false);
...@@ -206,7 +220,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -206,7 +220,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
selectedUser = user; selectedUser = user;
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
CharSequence[] items = new CharSequence[] {LocaleController.getString("KickFromGroup", R.string.KickFromGroup)}; CharSequence[] items = new CharSequence[] {chat_id > 0 ? LocaleController.getString("KickFromGroup", R.string.KickFromGroup) : LocaleController.getString("KickFromBroadcast", R.string.KickFromBroadcast)};
builder.setItems(items, new DialogInterface.OnClickListener() { builder.setItems(items, new DialogInterface.OnClickListener() {
@Override @Override
...@@ -259,7 +273,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -259,7 +273,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
@Override @Override
public void didSelectContact(TLRPC.User user, String param) { public void didSelectContact(TLRPC.User user, String param) {
MessagesController.getInstance().addUserToChat(chat_id, user, info, Utilities.parseInt(param)); MessagesController.getInstance().addUserToChat(chat_id, user, info, param != null ? Utilities.parseInt(param) : 0);
} }
@Override @Override
...@@ -461,7 +475,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -461,7 +475,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
args.putBoolean("destroyAfterSelect", true); args.putBoolean("destroyAfterSelect", true);
args.putBoolean("usersAsSections", true); args.putBoolean("usersAsSections", true);
args.putBoolean("returnAsResult", true); args.putBoolean("returnAsResult", true);
if (chat_id > 0) {
args.putString("selectAlertString", LocaleController.getString("AddToTheGroup", R.string.AddToTheGroup)); args.putString("selectAlertString", LocaleController.getString("AddToTheGroup", R.string.AddToTheGroup));
}
ContactsActivity fragment = new ContactsActivity(args); ContactsActivity fragment = new ContactsActivity(args);
fragment.setDelegate(this); fragment.setDelegate(this);
if (info != null) { if (info != null) {
...@@ -546,6 +562,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -546,6 +562,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
}); });
final ImageButton button2 = (ImageButton)view.findViewById(R.id.settings_change_avatar_button); final ImageButton button2 = (ImageButton)view.findViewById(R.id.settings_change_avatar_button);
if (chat_id > 0) {
button2.setOnClickListener(new View.OnClickListener() { button2.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
...@@ -557,10 +574,10 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -557,10 +574,10 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
int type; int type;
TLRPC.Chat chat = MessagesController.getInstance().chats.get(chat_id); TLRPC.Chat chat = MessagesController.getInstance().chats.get(chat_id);
if (chat.photo == null || chat.photo.photo_big == null || chat.photo instanceof TLRPC.TL_chatPhotoEmpty) { if (chat.photo == null || chat.photo.photo_big == null || chat.photo instanceof TLRPC.TL_chatPhotoEmpty) {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)}; items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
type = 0; type = 0;
} else { } else {
items = new CharSequence[] {LocaleController.getString("OpenPhoto", R.string.OpenPhoto), LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)}; items = new CharSequence[]{LocaleController.getString("OpenPhoto", R.string.OpenPhoto), LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
type = 1; type = 1;
} }
...@@ -592,6 +609,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -592,6 +609,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
showAlertDialog(builder); showAlertDialog(builder);
} }
}); });
} else {
button2.setVisibility(View.GONE);
}
} else { } else {
onlineText = (TextView)view.findViewById(R.id.settings_online); onlineText = (TextView)view.findViewById(R.id.settings_online);
} }
...@@ -665,7 +685,13 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -665,7 +685,13 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = li.inflate(R.layout.chat_profile_add_row, viewGroup, false); view = li.inflate(R.layout.chat_profile_add_row, viewGroup, false);
TextView textView = (TextView)view.findViewById(R.id.messages_list_row_name); TextView textView = (TextView)view.findViewById(R.id.messages_list_row_name);
if (chat_id > 0) {
textView.setText(LocaleController.getString("AddMember", R.string.AddMember)); textView.setText(LocaleController.getString("AddMember", R.string.AddMember));
} else {
textView.setText(LocaleController.getString("AddRecipient", R.string.AddRecipient));
View divider = view.findViewById(R.id.settings_row_divider);
divider.setVisibility(View.INVISIBLE);
}
} }
} else if (type == 5) { } else if (type == 5) {
if (view == null) { if (view == null) {
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
View file @ 91ae97e2
...@@ -90,6 +90,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -90,6 +90,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
private TextView emptyTextView; private TextView emptyTextView;
private EditText userSelectEditText; private EditText userSelectEditText;
private boolean ignoreChange = false; private boolean ignoreChange = false;
private boolean isBroadcast = false;
private HashMap<Integer, XImageSpan> selectedContacts = new HashMap<Integer, XImageSpan>(); private HashMap<Integer, XImageSpan> selectedContacts = new HashMap<Integer, XImageSpan>();
private ArrayList<XImageSpan> allSpans = new ArrayList<XImageSpan>(); private ArrayList<XImageSpan> allSpans = new ArrayList<XImageSpan>();
...@@ -105,6 +106,15 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -105,6 +106,15 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
private final static int done_button = 1; private final static int done_button = 1;
public GroupCreateActivity() {
super();
}
public GroupCreateActivity(Bundle args) {
super(args);
isBroadcast = args.getBoolean("broadcast", false);
}
@Override @Override
public boolean onFragmentCreate() { public boolean onFragmentCreate() {
NotificationCenter.getInstance().addObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.getInstance().addObserver(this, MessagesController.contactsDidLoaded);
...@@ -126,7 +136,11 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -126,7 +136,11 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back); actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
if (isBroadcast) {
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
} else {
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup)); actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
}
actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), 200)); actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), 200));
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
...@@ -140,6 +154,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -140,6 +154,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
result.addAll(selectedContacts.keySet()); result.addAll(selectedContacts.keySet());
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putIntegerArrayList("result", result); args.putIntegerArrayList("result", result);
args.putBoolean("broadcast", isBroadcast);
presentFragment(new GroupCreateFinalActivity(args)); presentFragment(new GroupCreateFinalActivity(args));
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
View file @ 91ae97e2
...@@ -54,11 +54,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -54,11 +54,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
private AvatarUpdater avatarUpdater = new AvatarUpdater(); private AvatarUpdater avatarUpdater = new AvatarUpdater();
private ProgressDialog progressDialog = null; private ProgressDialog progressDialog = null;
private String nameToSet = null; private String nameToSet = null;
private boolean isBroadcast = false;
private final static int done_button = 1; private final static int done_button = 1;
public GroupCreateFinalActivity(Bundle args) { public GroupCreateFinalActivity(Bundle args) {
super(args); super(args);
isBroadcast = args.getBoolean("broadcast", false);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -120,7 +122,11 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -120,7 +122,11 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
if (fragmentView == null) { if (fragmentView == null) {
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back); actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
actionBarLayer.setBackOverlay(R.layout.updating_state_layout); actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
if (isBroadcast) {
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
} else {
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup)); actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
}
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() { actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
@Override @Override
...@@ -136,6 +142,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -136,6 +142,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
} }
donePressed = true; donePressed = true;
if (isBroadcast) {
MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar, isBroadcast);
} else {
if (avatarUpdater.uploadingAvatar != null) { if (avatarUpdater.uploadingAvatar != null) {
createAfterUpload = true; createAfterUpload = true;
} else { } else {
...@@ -144,7 +153,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -144,7 +153,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
progressDialog.setCanceledOnTouchOutside(false); progressDialog.setCanceledOnTouchOutside(false);
progressDialog.setCancelable(false); progressDialog.setCancelable(false);
final long reqId = MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar); final long reqId = MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar, isBroadcast);
progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, LocaleController.getString("Cancel", R.string.Cancel), new DialogInterface.OnClickListener() { progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, LocaleController.getString("Cancel", R.string.Cancel), new DialogInterface.OnClickListener() {
@Override @Override
...@@ -162,6 +171,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -162,6 +171,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
} }
} }
} }
}
}); });
ActionBarMenu menu = actionBarLayer.createMenu(); ActionBarMenu menu = actionBarLayer.createMenu();
...@@ -173,6 +183,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -173,6 +183,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
fragmentView = inflater.inflate(R.layout.group_create_final_layout, container, false); fragmentView = inflater.inflate(R.layout.group_create_final_layout, container, false);
final ImageButton button2 = (ImageButton)fragmentView.findViewById(R.id.settings_change_avatar_button); final ImageButton button2 = (ImageButton)fragmentView.findViewById(R.id.settings_change_avatar_button);
if (isBroadcast) {
button2.setVisibility(View.GONE);
} else {
button2.setOnClickListener(new View.OnClickListener() { button2.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
...@@ -184,9 +197,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -184,9 +197,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
CharSequence[] items; CharSequence[] items;
if (avatar != null) { if (avatar != null) {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)}; items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
} else { } else {
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)}; items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
} }
builder.setItems(items, new DialogInterface.OnClickListener() { builder.setItems(items, new DialogInterface.OnClickListener() {
...@@ -206,12 +219,17 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -206,12 +219,17 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
showAlertDialog(builder); showAlertDialog(builder);
} }
}); });
}
avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image); avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image);
avatarImage.setImageResource(R.drawable.group_blue); avatarImage.setImageResource(R.drawable.group_blue);
nameTextView = (EditText)fragmentView.findViewById(R.id.bubble_input_text); nameTextView = (EditText)fragmentView.findViewById(R.id.bubble_input_text);
if (isBroadcast) {
nameTextView.setHint(LocaleController.getString("EnterListName", R.string.EnterListName));
} else {
nameTextView.setHint(LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder)); nameTextView.setHint(LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder));
}
if (nameToSet != null) { if (nameToSet != null) {
nameTextView.setText(nameToSet); nameTextView.setText(nameToSet);
nameToSet = null; nameToSet = null;
...@@ -237,7 +255,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -237,7 +255,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
avatarImage.setImage(avatar, "50_50", R.drawable.group_blue); avatarImage.setImage(avatar, "50_50", R.drawable.group_blue);
if (createAfterUpload) { if (createAfterUpload) {
FileLog.e("tmessages", "avatar did uploaded"); FileLog.e("tmessages", "avatar did uploaded");
MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar); MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar, false);
} }
} }
}); });
......
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @ 91ae97e2
...@@ -458,7 +458,12 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen ...@@ -458,7 +458,12 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
args.putInt("chat_id", -lower_part); args.putInt("chat_id", -lower_part);
} }
} else { } else {
args.putInt("enc_id", (int)(dialog_id >> 32)); int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
args.putInt("enc_id", high_id);
} else {
args.putInt("chat_id", high_id);
}
} }
ChatActivity fragment = new ChatActivity(args); ChatActivity fragment = new ChatActivity(args);
presentFragment(fragment, true); presentFragment(fragment, true);
......
TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java
View file @ 91ae97e2
...@@ -74,6 +74,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -74,6 +74,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
private final static int messages_list_menu_new_secret_chat = 3; private final static int messages_list_menu_new_secret_chat = 3;
private final static int messages_list_menu_contacts = 4; private final static int messages_list_menu_contacts = 4;
private final static int messages_list_menu_settings = 5; private final static int messages_list_menu_settings = 5;
private final static int messages_list_menu_new_broadcast = 6;
public static interface MessagesActivityDelegate { public static interface MessagesActivityDelegate {
public abstract void didSelectDialog(MessagesActivity fragment, long dialog_id, boolean param); public abstract void didSelectDialog(MessagesActivity fragment, long dialog_id, boolean param);
...@@ -175,6 +176,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -175,6 +176,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other); ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other);
item.addSubItem(messages_list_menu_new_chat, LocaleController.getString("NewGroup", R.string.NewGroup), 0); item.addSubItem(messages_list_menu_new_chat, LocaleController.getString("NewGroup", R.string.NewGroup), 0);
item.addSubItem(messages_list_menu_new_secret_chat, LocaleController.getString("NewSecretChat", R.string.NewSecretChat), 0); item.addSubItem(messages_list_menu_new_secret_chat, LocaleController.getString("NewSecretChat", R.string.NewSecretChat), 0);
item.addSubItem(messages_list_menu_new_broadcast, LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList), 0);
item.addSubItem(messages_list_menu_contacts, LocaleController.getString("Contacts", R.string.Contacts), 0); item.addSubItem(messages_list_menu_contacts, LocaleController.getString("Contacts", R.string.Contacts), 0);
item.addSubItem(messages_list_menu_settings, LocaleController.getString("Settings", R.string.Settings), 0); item.addSubItem(messages_list_menu_settings, LocaleController.getString("Settings", R.string.Settings), 0);
} }
...@@ -206,6 +208,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -206,6 +208,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
if (onlySelect) { if (onlySelect) {
finishFragment(); finishFragment();
} }
} else if (id == messages_list_menu_new_broadcast) {
Bundle args = new Bundle();
args.putBoolean("broadcast", true);
presentFragment(new GroupCreateActivity(args));
} }
} }
}); });
...@@ -289,7 +295,12 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -289,7 +295,12 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
args.putInt("chat_id", -lower_part); args.putInt("chat_id", -lower_part);
} }
} else { } else {
args.putInt("enc_id", (int)(dialog_id >> 32)); int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
args.putInt("enc_id", high_id);
} else {
args.putInt("chat_id", high_id);
}
} }
presentFragment(new ChatActivity(args)); presentFragment(new ChatActivity(args));
} }
...@@ -497,13 +508,21 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -497,13 +508,21 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title)); builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
} }
} else { } else {
int chat_id = (int)(dialog_id >> 32); int high_id = (int)(dialog_id >> 32);
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(chat_id); if (high_id > 0) {
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(high_id);
TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id); TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
if (user == null) { if (user == null) {
return; return;
} }
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name))); builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
} else {
TLRPC.Chat chat = MessagesController.getInstance().chats.get(high_id);
if (chat == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
}
} }
CheckBox checkBox = null; CheckBox checkBox = null;
/*if (delegate instanceof ChatActivity) { /*if (delegate instanceof ChatActivity) {
......
TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java
View file @ 91ae97e2
...@@ -874,9 +874,6 @@ public class PopupNotificationActivity extends Activity implements NotificationC ...@@ -874,9 +874,6 @@ public class PopupNotificationActivity extends Activity implements NotificationC
chatActivityEnterView.setFieldFocused(false); chatActivityEnterView.setFieldFocused(false);
} }
ConnectionsManager.getInstance().setAppPaused(true, false); ConnectionsManager.getInstance().setAppPaused(true, false);
if (wakeLock.isHeld()) {
wakeLock.release();
}
} }
@Override @Override
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @ 91ae97e2
...@@ -568,6 +568,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -568,6 +568,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
ArrayList<TLRPC.User> users = new ArrayList<TLRPC.User>();
users.add(res.user);
MessagesStorage.getInstance().putUsersAndChats(users, null, true, true);
MessagesController.getInstance().users.put(res.user.id, res.user); MessagesController.getInstance().users.put(res.user.id, res.user);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt("user_id", res.user.id); args.putInt("user_id", res.user.id);
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java
View file @ 91ae97e2
...@@ -406,7 +406,8 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -406,7 +406,8 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
} }
public void updateServerNotificationsSettings(boolean group) { public void updateServerNotificationsSettings(boolean group) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); //disable global settings sync
/*SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
TLRPC.TL_account_updateNotifySettings req = new TLRPC.TL_account_updateNotifySettings(); TLRPC.TL_account_updateNotifySettings req = new TLRPC.TL_account_updateNotifySettings();
req.settings = new TLRPC.TL_inputPeerNotifySettings(); req.settings = new TLRPC.TL_inputPeerNotifySettings();
req.settings.sound = "default"; req.settings.sound = "default";
...@@ -425,7 +426,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif ...@@ -425,7 +426,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
} }
}); });*/
} }
@Override @Override
......
TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java
View file @ 91ae97e2
...@@ -467,18 +467,15 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C ...@@ -467,18 +467,15 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
List<Track> tracks = movie.getTracks(); List<Track> tracks = movie.getTracks();
movie.setTracks(new LinkedList<Track>()); movie.setTracks(new LinkedList<Track>());
double startTime = videoTimelineView.getLeftProgress() * videoPlayer.getDuration() / 1000.0; double startTime = 0;
double endTime = videoTimelineView.getRightProgress() * videoPlayer.getDuration() / 1000.0; double endTime = 0;
boolean timeCorrected = false;
for (Track track : tracks) { for (Track track : tracks) {
if (track.getSyncSamples() != null && track.getSyncSamples().length > 0) { if (track.getSyncSamples() != null && track.getSyncSamples().length > 0) {
if (timeCorrected) { double duration = (double)track.getDuration() / (double)track.getTrackMetaData().getTimescale();
throw new RuntimeException("The startTime has already been corrected by another track with SyncSample. Not Supported."); startTime = correctTimeToSyncSample(track, videoTimelineView.getLeftProgress() * duration, false);
} endTime = videoTimelineView.getRightProgress() * duration;
startTime = correctTimeToSyncSample(track, startTime, false); break;
endTime = correctTimeToSyncSample(track, endTime, true);
timeCorrected = true;
} }
} }
...@@ -486,7 +483,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C ...@@ -486,7 +483,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
long currentSample = 0; long currentSample = 0;
double currentTime = 0; double currentTime = 0;
double lastTime = 0; double lastTime = 0;
long startSample = -1; long startSample = 0;
long endSample = -1; long endSample = -1;
for (int i = 0; i < track.getSampleDurations().length; i++) { for (int i = 0; i < track.getSampleDurations().length; i++) {
...@@ -503,9 +500,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C ...@@ -503,9 +500,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
} }
movie.addTrack(new CroppedTrack(track, startSample, endSample)); movie.addTrack(new CroppedTrack(track, startSample, endSample));
} }
long start1 = System.currentTimeMillis();
Container out = new DefaultMp4Builder().build(movie); Container out = new DefaultMp4Builder().build(movie);
long start2 = System.currentTimeMillis();
String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4"; String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4";
UserConfig.lastLocalId--; UserConfig.lastLocalId--;
...@@ -524,6 +519,11 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C ...@@ -524,6 +519,11 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
} }
} }
// private void startEncodeVideo() {
// MediaExtractor mediaExtractor = new MediaExtractor();
// mediaExtractor.s
// }
private static double correctTimeToSyncSample(Track track, double cutHere, boolean next) { private static double correctTimeToSyncSample(Track track, double cutHere, boolean next) {
double[] timeOfSyncSamples = new double[track.getSyncSamples().length]; double[] timeOfSyncSamples = new double[track.getSyncSamples().length];
long currentSample = 0; long currentSample = 0;
......
TMessagesProj/src/main/java/org/telegram/ui/Views/GifDrawable.java
View file @ 91ae97e2
...@@ -46,7 +46,7 @@ public class GifDrawable extends Drawable implements Animatable, MediaController ...@@ -46,7 +46,7 @@ public class GifDrawable extends Drawable implements Animatable, MediaController
private static native void renderFrame(int[] pixels, int gifFileInPtr, int[] metaData); private static native void renderFrame(int[] pixels, int gifFileInPtr, int[] metaData);
private static native int openFile(int[] metaData, String filePath); private static native int openFile(int[] metaData, String filePath);
private static native void free(int gifFileInPtr); private static native void free(int gifFileInPtr);
private static native boolean reset(int gifFileInPtr); private static native void reset(int gifFileInPtr);
private static native void setSpeedFactor(int gifFileInPtr, float factor); private static native void setSpeedFactor(int gifFileInPtr, float factor);
private static native String getComment(int gifFileInPtr); private static native String getComment(int gifFileInPtr);
private static native int getLoopCount(int gifFileInPtr); private static native int getLoopCount(int gifFileInPtr);
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ImageReceiver.java
View file @ 91ae97e2
...@@ -75,17 +75,20 @@ public class ImageReceiver { ...@@ -75,17 +75,20 @@ public class ImageReceiver {
if (filter != null) { if (filter != null) {
key += "@" + filter; key += "@" + filter;
} }
Bitmap img; Bitmap img = null;
if (currentPath != null) { if (currentPath != null) {
if (currentPath.equals(key)) { if (currentPath.equals(key)) {
if (currentImage != null) {
return; return;
} else { } else {
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true); img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
recycleBitmap(img);
} }
} else { } else {
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true); img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
recycleBitmap(img);
}
} }
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
currentPath = key; currentPath = key;
last_path = path; last_path = path;
last_httpUrl = httpUrl; last_httpUrl = httpUrl;
......
TMessagesProj/src/main/java/org/telegram/ui/Views/RoundProgressView.java 0 → 100644
View file @ 91ae97e2
/*
* This is the source code of Telegram for Android v. 1.7.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013-2014.
*/
package org.telegram.ui.Views;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
import org.telegram.android.AndroidUtilities;
public class RoundProgressView {
private Paint paint;
public float currentProgress = 0;
public RectF rect = new RectF();
public RoundProgressView() {
paint = new Paint();
paint.setColor(0xffffffff);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(AndroidUtilities.dp(1));
paint.setAntiAlias(true);
}
public void setProgress(float progress) {
currentProgress = progress;
if (currentProgress < 0) {
currentProgress = 0;
} else if (currentProgress > 1) {
currentProgress = 1;
}
}
public void draw(Canvas canvas) {
canvas.drawArc(rect, -90, 360 * currentProgress, false, paint);
}
}
TMessagesProj/src/main/res/drawable-hdpi/playvideo.png 100755 → 100644
View replaced file @ e5cb3685 View file @ 91ae97e2
TMessagesProj/src/main/res/drawable-hdpi/playvideo.png

2.59 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/playvideo.png

2.3 KB | W: | H:

TMessagesProj/src/main/res/drawable-hdpi/playvideo.png
TMessagesProj/src/main/res/drawable-hdpi/playvideo.png
TMessagesProj/src/main/res/drawable-hdpi/playvideo.png
TMessagesProj/src/main/res/drawable-hdpi/playvideo.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-ldpi/playvideo.png 100755 → 100644
View replaced file @ e5cb3685 View file @ 91ae97e2
TMessagesProj/src/main/res/drawable-ldpi/playvideo.png

785 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-ldpi/playvideo.png

1.59 KB | W: | H:

TMessagesProj/src/main/res/drawable-ldpi/playvideo.png
TMessagesProj/src/main/res/drawable-ldpi/playvideo.png
TMessagesProj/src/main/res/drawable-ldpi/playvideo.png
TMessagesProj/src/main/res/drawable-ldpi/playvideo.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-mdpi/playvideo.png 100755 → 100644
View replaced file @ e5cb3685 View file @ 91ae97e2
TMessagesProj/src/main/res/drawable-mdpi/playvideo.png

1.78 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/playvideo.png

1.84 KB | W: | H:

TMessagesProj/src/main/res/drawable-mdpi/playvideo.png
TMessagesProj/src/main/res/drawable-mdpi/playvideo.png
TMessagesProj/src/main/res/drawable-mdpi/playvideo.png
TMessagesProj/src/main/res/drawable-mdpi/playvideo.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png 100755 → 100644
View replaced file @ e5cb3685 View file @ 91ae97e2
TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png

3.45 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png

2.74 KB | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xhdpi/playvideo.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png 100755 → 100644
View replaced file @ e5cb3685 View file @ 91ae97e2
TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png

5.23 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png

3.63 KB | W: | H:

TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png
TMessagesProj/src/main/res/drawable-xxhdpi/playvideo.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/values-ar/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">الاسم مخفي</string> <string name="HiddenName">الاسم مخفي</string>
<string name="SelectChat">اختر محادثة</string> <string name="SelectChat">اختر محادثة</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">اختر ملف</string> <string name="SelectFile">اختر ملف</string>
<string name="FreeOfTotal">متاح %1$s من %2$s</string> <string name="FreeOfTotal">متاح %1$s من %2$s</string>
......
TMessagesProj/src/main/res/values-de/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Versteckter Name</string> <string name="HiddenName">Versteckter Name</string>
<string name="SelectChat">Chat auswählen</string> <string name="SelectChat">Chat auswählen</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Datei auswählen</string> <string name="SelectFile">Datei auswählen</string>
<string name="FreeOfTotal">Freier Speicher: %1$s von %2$s</string> <string name="FreeOfTotal">Freier Speicher: %1$s von %2$s</string>
......
TMessagesProj/src/main/res/values-es/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Nombre oculto</string> <string name="HiddenName">Nombre oculto</string>
<string name="SelectChat">Selecciona el chat</string> <string name="SelectChat">Selecciona el chat</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Seleccionar archivo</string> <string name="SelectFile">Seleccionar archivo</string>
<string name="FreeOfTotal">%1$s de %2$s libres</string> <string name="FreeOfTotal">%1$s de %2$s libres</string>
......
TMessagesProj/src/main/res/values-it/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Nome nascosto</string> <string name="HiddenName">Nome nascosto</string>
<string name="SelectChat">Seleziona chat</string> <string name="SelectChat">Seleziona chat</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Seleziona file</string> <string name="SelectFile">Seleziona file</string>
<string name="FreeOfTotal">Liberi %1$s di %2$s</string> <string name="FreeOfTotal">Liberi %1$s di %2$s</string>
......
TMessagesProj/src/main/res/values-nl/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Verborgen naam</string> <string name="HiddenName">Verborgen naam</string>
<string name="SelectChat">Kies een gesprek</string> <string name="SelectChat">Kies een gesprek</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Kies een bestand</string> <string name="SelectFile">Kies een bestand</string>
<string name="FreeOfTotal">Vrij: %1$s van %2$s</string> <string name="FreeOfTotal">Vrij: %1$s van %2$s</string>
......
TMessagesProj/src/main/res/values-pt-rBR/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Nome oculto</string> <string name="HiddenName">Nome oculto</string>
<string name="SelectChat">Selecione uma Conversa</string> <string name="SelectChat">Selecione uma Conversa</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Selecione um Arquivo</string> <string name="SelectFile">Selecione um Arquivo</string>
<string name="FreeOfTotal">Disponível %1$s de %2$s</string> <string name="FreeOfTotal">Disponível %1$s de %2$s</string>
......
TMessagesProj/src/main/res/values-pt-rPT/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Nome oculto</string> <string name="HiddenName">Nome oculto</string>
<string name="SelectChat">Selecionar chat</string> <string name="SelectChat">Selecionar chat</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Selecionar ficheiro</string> <string name="SelectFile">Selecionar ficheiro</string>
<string name="FreeOfTotal">%1$s de %2$s livres</string> <string name="FreeOfTotal">%1$s de %2$s livres</string>
......
TMessagesProj/src/main/res/values/strings.xml
View file @ 91ae97e2
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
<string name="HiddenName">Hidden Name</string> <string name="HiddenName">Hidden Name</string>
<string name="SelectChat">Select Chat</string> <string name="SelectChat">Select Chat</string>
<!--broadcasts-->
<string name="BroadcastList">Broadcast List</string>
<string name="NewBroadcastList">New Broadcast List</string>
<string name="EnterListName">Enter list name</string>
<string name="YouCreatedBroadcastList">You created a broadcast list</string>
<string name="AddRecipient">Add Recipient</string>
<string name="KickFromBroadcast">Remove from broadcast list</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Select File</string> <string name="SelectFile">Select File</string>
<string name="FreeOfTotal">Free %1$s of %2$s</string> <string name="FreeOfTotal">Free %1$s of %2$s</string>
...@@ -150,7 +158,7 @@ ...@@ -150,7 +158,7 @@
<string name="NotificationGroupKickYou">%1$s removed you from the group %2$s</string> <string name="NotificationGroupKickYou">%1$s removed you from the group %2$s</string>
<string name="NotificationGroupLeftMember">%1$s has left the group %2$s</string> <string name="NotificationGroupLeftMember">%1$s has left the group %2$s</string>
<string name="NotificationContactJoined">%1$s joined Telegram!</string> <string name="NotificationContactJoined">%1$s joined Telegram!</string>
<string name="NotificationUnrecognizedDevice">%1$s,\nWe detected a login into your account from a new device on %2$s\n\nDevice: %3$s\nLocation: %4$s\n\nIf this wasn’t you, you can go to Settings – Terminate all sessions.\n\nThanks,\nThe Telegram Team</string> <string name="NotificationUnrecognizedDevice">%1$s,\nWe detected a login into your account from a new device on %2$s\n\nDevice: %3$s\nLocation: %4$s\n\nIf this wasn\'t you, you can go to Settings - Terminate all sessions.\n\nSincerely,\nThe Telegram Team</string>
<string name="NotificationContactNewPhoto">%1$s updated profile photo</string> <string name="NotificationContactNewPhoto">%1$s updated profile photo</string>
<!--contacts view--> <!--contacts view-->
...@@ -263,19 +271,19 @@ ...@@ -263,19 +271,19 @@
<string name="Enabled">Enabled</string> <string name="Enabled">Enabled</string>
<string name="Disabled">Disabled</string> <string name="Disabled">Disabled</string>
<string name="NotificationsService">Notifications Service</string> <string name="NotificationsService">Notifications Service</string>
<string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string> <string name="NotificationsServiceDisableInfo">If Google Play Services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
<string name="SortBy">Sort By</string> <string name="SortBy">Sort By</string>
<string name="ImportContacts">Import Contacts</string> <string name="ImportContacts">Import Contacts</string>
<string name="WiFiOnly">Via WiFi only</string> <string name="WiFiOnly">Via WiFi only</string>
<string name="SortFirstName">First name</string> <string name="SortFirstName">First name</string>
<string name="SortLastName">Last name</string> <string name="SortLastName">Last name</string>
<string name="LedColor">LED Color</string> <string name="LedColor">LED Color</string>
<string name="PopupNotification">Popup Notification</string> <string name="PopupNotification">Popup Notifications</string>
<string name="NoPopup">No popup</string> <string name="NoPopup">No popup</string>
<string name="OnlyWhenScreenOn">Only when screen "on"</string> <string name="OnlyWhenScreenOn">Only when screen "on"</string>
<string name="OnlyWhenScreenOff">Only when screen "off"</string> <string name="OnlyWhenScreenOff">Only when screen "off"</string>
<string name="AlwaysShowPopup">Always show popup</string> <string name="AlwaysShowPopup">Always show popup</string>
<string name="BadgeNumber">Badge Number</string> <string name="BadgeNumber">Badge Counter</string>
<!--media view--> <!--media view-->
<string name="NoMedia">No shared media yet</string> <string name="NoMedia">No shared media yet</string>
...@@ -362,8 +370,8 @@ ...@@ -362,8 +370,8 @@
<string name="InvalidLastName">Invalid last name</string> <string name="InvalidLastName">Invalid last name</string>
<string name="Loading">Loading...</string> <string name="Loading">Loading...</string>
<string name="NoPlayerInstalled">You don\'t have a video player, please install one to continue</string> <string name="NoPlayerInstalled">You don\'t have a video player, please install one to continue</string>
<string name="NoMailInstalled">Please send an email to sms@telegram.org and explain your problem.</string> <string name="NoMailInstalled">Please send an email to sms@telegram.org and tell us about your problem.</string>
<string name="NoHandleAppInstalled">You don\'t have any application that can handle with mime type \'%1$s\', please install one to continue</string> <string name="NoHandleAppInstalled">You don\'t have applications that can handle the file type \'%1$s\', please install one to continue</string>
<string name="InviteUser">This user does not have Telegram yet, send an invitation?</string> <string name="InviteUser">This user does not have Telegram yet, send an invitation?</string>
<string name="AreYouSure">Are you sure?</string> <string name="AreYouSure">Are you sure?</string>
<string name="AddContactQ">Add contact?</string> <string name="AddContactQ">Add contact?</string>
...@@ -371,15 +379,15 @@ ...@@ -371,15 +379,15 @@
<string name="ForwardMessagesTo">Forward messages to %1$s?</string> <string name="ForwardMessagesTo">Forward messages to %1$s?</string>
<string name="DeleteChatQuestion">Delete this chat?</string> <string name="DeleteChatQuestion">Delete this chat?</string>
<string name="SendMessagesTo">Send messages to %1$s?</string> <string name="SendMessagesTo">Send messages to %1$s?</string>
<string name="AreYouSureLogout">Are you sure you want to logout?</string> <string name="AreYouSureLogout">Are you sure you want to log out?</string>
<string name="AreYouSureSessions">Are you sure you want to terminate all other sessions?</string> <string name="AreYouSureSessions">Are you sure you want to terminate all other sessions?</string>
<string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave group?</string> <string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave the group?</string>
<string name="AreYouSureDeleteThisChat">Are you sure you want to delete this chat?</string> <string name="AreYouSureDeleteThisChat">Are you sure you want to delete this chat?</string>
<string name="AreYouSureShareMyContactInfo">Are you sure that you want to share your contact info?</string> <string name="AreYouSureShareMyContactInfo">Are you sure you want to share your contact info?</string>
<string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string> <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
<string name="AreYouSureUnblockContact">Are you sure you want to unblock this contact?</string> <string name="AreYouSureUnblockContact">Are you sure you want to unblock this contact?</string>
<string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string> <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
<string name="AreYouSureSecretChat">Are you sure you want to start secret chat?</string> <string name="AreYouSureSecretChat">Are you sure you want to start a secret chat?</string>
<string name="ForwardFromMyName">forward from my name</string> <string name="ForwardFromMyName">forward from my name</string>
<!--Intro view--> <!--Intro view-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment