mirror of https://github.com/NekoX-Dev/NekoX.git
Broadcasts, updated gif lib, blur image\video preview
Note: untested, don’t upload to market
This commit is contained in:
DrKLO
parent
e5cb3685a0
commit
91ae97e257
|
|
@ -83,7 +83,7 @@ android {
|
|||
defaultConfig {
|
||||
minSdkVersion 8
|
||||
targetSdkVersion 19
|
||||
versionCode 290
|
||||
versionName "1.6.2"
|
||||
versionCode 291
|
||||
versionName "1.7.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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_CPPFLAGS := -DBSD=1 -ffast-math -O2 -funroll-loops
|
||||
#LOCAL_LDLIBS := -llog
|
||||
LOCAL_LDLIBS := -ljnigraphics
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
./opus/src/opus.c \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//tanks to https://github.com/koral--/android-gif-drawable
|
||||
//thanks to https://github.com/koral--/android-gif-drawable
|
||||
/*
|
||||
MIT License
|
||||
Copyright (c)
|
||||
|
|
@ -73,7 +73,7 @@ typedef struct {
|
|||
|
||||
typedef struct {
|
||||
unsigned int duration;
|
||||
short transpIndex;
|
||||
int transpIndex;
|
||||
unsigned char disposalMethod;
|
||||
} FrameInfo;
|
||||
|
||||
|
|
@ -121,19 +121,20 @@ void gifOnJNIUnload(JavaVM *vm, void *reserved) {
|
|||
}
|
||||
|
||||
static int fileReadFunc(GifFileType *gif, GifByteType *bytes, int size) {
|
||||
FILE *file = (FILE *)gif->UserData;
|
||||
FILE *file = (FILE *)gif->UserData;
|
||||
return fread(bytes, 1, size, file);
|
||||
}
|
||||
|
||||
static int fileRewindFun(GifInfo *info) {
|
||||
return fseek(info->gifFilePtr->UserData, info->startPos, SEEK_SET);
|
||||
return fseek(info->gifFilePtr->UserData, info->startPos, SEEK_SET);
|
||||
}
|
||||
|
||||
static unsigned long getRealTime() {
|
||||
struct timespec ts;
|
||||
const clockid_t id = CLOCK_MONOTONIC;
|
||||
if (id != (clockid_t) - 1 && clock_gettime(id, &ts) != -1)
|
||||
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
|
||||
if (id != (clockid_t) - 1 && clock_gettime(id, &ts) != -1) {
|
||||
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -195,7 +196,7 @@ static void packARGB32(argb *pixel, GifByteType alpha, GifByteType red, GifByteT
|
|||
}
|
||||
|
||||
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];
|
||||
packARGB32(dst, 0xFF, col->Red, col->Green, col->Blue);
|
||||
}
|
||||
|
|
@ -218,7 +219,7 @@ static inline bool setupBackupBmp(GifInfo *info, short transpIndex) {
|
|||
if (transpIndex == -1) {
|
||||
getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap);
|
||||
} else {
|
||||
packARGB32(&paintingColor,0,0,0,0);
|
||||
packARGB32(&paintingColor, 0, 0, 0, 0);
|
||||
}
|
||||
eraseColor(info->backupPtr, fGIF->SWidth, fGIF->SHeight, paintingColor);
|
||||
return true;
|
||||
|
|
@ -231,14 +232,15 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info)
|
|||
if (ExtFunction == GRAPHICS_EXT_FUNC_CODE && ExtData[0] == 4) {
|
||||
FrameInfo *fi = &info->infos[info->gifFilePtr->ImageCount];
|
||||
fi->transpIndex = -1;
|
||||
char *b = (char *)ExtData + 1;
|
||||
char *b = (char*) ExtData + 1;
|
||||
short delay = ((b[2] << 8) | b[1]);
|
||||
fi->duration = delay > 1 ? delay * 10 : 100;
|
||||
fi->disposalMethod = ((b[0] >> 2) & 7);
|
||||
if (ExtData[1] & 1)
|
||||
fi->transpIndex = (short) b[3];
|
||||
if (ExtData[1] & 1) {
|
||||
fi->transpIndex = 0xff & b[3];
|
||||
}
|
||||
if (fi->disposalMethod == 3 && info->backupPtr == NULL) {
|
||||
if (!setupBackupBmp(info,fi->transpIndex)) {
|
||||
if (!setupBackupBmp(info, fi->transpIndex)) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
|
|
@ -260,7 +262,7 @@ static int readExtensions(int ExtFunction, GifByteType *ExtData, GifInfo *info)
|
|||
return GIF_OK;
|
||||
}
|
||||
|
||||
static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
|
||||
static int DDGifSlurp(GifFileType *GifFile, GifInfo* info, bool shouldDecode) {
|
||||
GifRecordType RecordType;
|
||||
GifByteType *ExtData;
|
||||
int codeSize;
|
||||
|
|
@ -268,103 +270,109 @@ static int DDGifSlurp(GifFileType *GifFile, GifInfo *info, bool shouldDecode) {
|
|||
size_t ImageSize;
|
||||
do {
|
||||
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
switch (RecordType) {
|
||||
case IMAGE_DESC_RECORD_TYPE: {
|
||||
if (DGifGetImageDesc(GifFile, !shouldDecode) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
int i = shouldDecode ? info->currentIndex : GifFile->ImageCount - 1;
|
||||
SavedImage *sp = &GifFile->SavedImages[i];
|
||||
ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height;
|
||||
|
||||
if (sp->ImageDesc.Width < 1 || sp->ImageDesc.Height < 1 || ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
|
||||
GifFile->Error = D_GIF_ERR_INVALID_IMG_DIMS;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
if (sp->ImageDesc.Width > GifFile->SWidth || sp->ImageDesc.Height > GifFile->SHeight) {
|
||||
GifFile->Error = D_GIF_ERR_IMG_NOT_CONFINED;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
if (shouldDecode) {
|
||||
sp->RasterBits = info->rasterBits;
|
||||
if (sp->ImageDesc.Interlace) {
|
||||
int i, j;
|
||||
int InterlacedOffset[] = { 0, 4, 2, 1 };
|
||||
int InterlacedJumps[] = { 8, 8, 4, 2 };
|
||||
for (i = 0; i < 4; i++) {
|
||||
for (j = InterlacedOffset[i]; j < sp->ImageDesc.Height; j += InterlacedJumps[i]) {
|
||||
if (DGifGetLine(GifFile, sp->RasterBits + j * sp->ImageDesc.Width, sp->ImageDesc.Width) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
case IMAGE_DESC_RECORD_TYPE:
|
||||
|
||||
if (DGifGetImageDesc(GifFile, !shouldDecode) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
int i = shouldDecode ? info->currentIndex : GifFile->ImageCount - 1;
|
||||
SavedImage *sp = &GifFile->SavedImages[i];
|
||||
ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height;
|
||||
|
||||
if (sp->ImageDesc.Width < 1 || sp->ImageDesc.Height < 1 || ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
|
||||
GifFile->Error = D_GIF_ERR_INVALID_IMG_DIMS;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
if (sp->ImageDesc.Width > GifFile->SWidth || sp->ImageDesc.Height > GifFile->SHeight) {
|
||||
GifFile->Error = D_GIF_ERR_IMG_NOT_CONFINED;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
if (shouldDecode) {
|
||||
sp->RasterBits = info->rasterBits;
|
||||
if (sp->ImageDesc.Interlace) {
|
||||
int i, j;
|
||||
int InterlacedOffset[] = { 0, 4, 2, 1 };
|
||||
int InterlacedJumps[] = { 8, 8, 4, 2 };
|
||||
for (i = 0; i < 4; i++) {
|
||||
for (j = InterlacedOffset[i]; j < sp->ImageDesc.Height; j += InterlacedJumps[i]) {
|
||||
if (DGifGetLine(GifFile, sp->RasterBits + j * sp->ImageDesc.Width, sp->ImageDesc.Width) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (DGifGetLine(GifFile, sp->RasterBits, ImageSize) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
if (info->currentIndex >= GifFile->ImageCount - 1) {
|
||||
if (info->loopCount > 0)
|
||||
} else {
|
||||
if (DGifGetLine(GifFile, sp->RasterBits, ImageSize) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
}
|
||||
if (info->currentIndex >= GifFile->ImageCount - 1) {
|
||||
if (info->loopCount > 0) {
|
||||
info->currentLoop++;
|
||||
if (fileRewindFun(info) != 0) {
|
||||
info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
return GIF_OK;
|
||||
} else {
|
||||
if (DGifGetCode(GifFile, &codeSize, &ExtData) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
while (ExtData) {
|
||||
if (DGifGetCodeNext(GifFile, &ExtData) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
if (fileRewindFun(info) != 0) {
|
||||
info->gifFilePtr->Error = D_GIF_ERR_READ_FAILED;
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
return GIF_OK;
|
||||
} else {
|
||||
if (DGifGetCode(GifFile, &codeSize, &ExtData) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
break;
|
||||
while (ExtData != NULL) {
|
||||
if (DGifGetCodeNext(GifFile, &ExtData) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case EXTENSION_RECORD_TYPE:
|
||||
if (DGifGetExtension(GifFile, &ExtFunction, &ExtData) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
|
||||
case EXTENSION_RECORD_TYPE: {
|
||||
if (DGifGetExtension(GifFile, &ExtFunction, &ExtData) == GIF_ERROR) {
|
||||
if (!shouldDecode) {
|
||||
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) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
while (ExtData != NULL) {
|
||||
if (DGifGetExtensionNext(GifFile, &ExtData, &ExtFunction) == GIF_ERROR) {
|
||||
return (GIF_ERROR);
|
||||
}
|
||||
if (!shouldDecode) {
|
||||
if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
if (!shouldDecode) {
|
||||
info->infos = realloc(info->infos, (GifFile->ImageCount + 1) * sizeof(FrameInfo));
|
||||
if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
while (ExtData) {
|
||||
if (DGifGetExtensionNext(GifFile, &ExtData, &ExtFunction) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
if (!shouldDecode) {
|
||||
if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
|
||||
return GIF_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case TERMINATE_RECORD_TYPE:
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
} while (RecordType != TERMINATE_RECORD_TYPE);
|
||||
|
||||
bool ok = true;
|
||||
if (shouldDecode) {
|
||||
ok = (fileRewindFun(info) == 0);
|
||||
}
|
||||
if (ok) {
|
||||
return GIF_OK;
|
||||
return (GIF_OK);
|
||||
} else {
|
||||
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) {
|
|||
}
|
||||
|
||||
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);
|
||||
GifWord copyWidth = frame->ImageDesc.Width;
|
||||
if (frame->ImageDesc.Left + copyWidth > width) {
|
||||
|
|
@ -393,9 +401,6 @@ static void blitNormal(argb *bm, int width, int height, const SavedImage *frame,
|
|||
copyHeight = height - frame->ImageDesc.Top;
|
||||
}
|
||||
|
||||
int srcPad, dstPad;
|
||||
dstPad = width - copyWidth;
|
||||
srcPad = frame->ImageDesc.Width - copyWidth;
|
||||
for (; copyHeight > 0; copyHeight--) {
|
||||
copyLine(dst, src, cmap, transparent, copyWidth);
|
||||
src += frame->ImageDesc.Width;
|
||||
|
|
@ -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) {
|
||||
uint32_t *dst = (uint32_t *)getAddr(bm, bmWidth, left, top);
|
||||
uint32_t* dst = (uint32_t*) getAddr(bm, bmWidth, left, top);
|
||||
GifWord copyWidth = width;
|
||||
if (left + copyWidth > bmWidth) {
|
||||
copyWidth = bmWidth - left;
|
||||
|
|
@ -414,7 +419,7 @@ static void fillRect(argb *bm, int bmWidth, int bmHeight, GifWord left, GifWord
|
|||
if (top + copyHeight > bmHeight) {
|
||||
copyHeight = bmHeight - top;
|
||||
}
|
||||
uint32_t *pColor = (uint32_t *)(&col);
|
||||
uint32_t* pColor = (uint32_t *) (&col);
|
||||
for (; copyHeight > 0; copyHeight--) {
|
||||
memset(dst, *pColor, copyWidth * sizeof(argb));
|
||||
dst += bmWidth;
|
||||
|
|
@ -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) {
|
||||
if (frame->ImageDesc.ColorMap != NULL) {
|
||||
cmap = frame->ImageDesc.ColorMap;
|
||||
if (cmap == NULL || cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
|
||||
if (cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
|
||||
cmap = defaultCmap;
|
||||
}
|
||||
}
|
||||
|
||||
blitNormal(bm, bmWidth, bmHeight, frame, cmap, (int) transpIndex);
|
||||
blitNormal(bm, bmWidth, bmHeight, frame, cmap, transpIndex);
|
||||
}
|
||||
|
||||
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) {
|
||||
argb *backup = info->backupPtr;
|
||||
argb* backup = info->backupPtr;
|
||||
argb color;
|
||||
packARGB32(&color, 0, 0, 0, 0);
|
||||
GifFileType *fGif = info->gifFilePtr;
|
||||
SavedImage *cur = &fGif->SavedImages[idx - 1];
|
||||
SavedImage *next = &fGif->SavedImages[idx];
|
||||
SavedImage* cur = &fGif->SavedImages[idx - 1];
|
||||
SavedImage* next = &fGif->SavedImages[idx];
|
||||
bool curTrans = info->infos[idx - 1].transpIndex != -1;
|
||||
int curDisposal = info->infos[idx - 1].disposalMethod;
|
||||
bool nextTrans = info->infos[idx].transpIndex != -1;
|
||||
int nextDisposal = info->infos[idx].disposalMethod;
|
||||
|
||||
argb *tmp;
|
||||
if ((curDisposal == 2 || curDisposal == 3) && (nextTrans || !checkIfCover(next, cur))) {
|
||||
switch (curDisposal) {
|
||||
case 2: {
|
||||
fillRect(bm, fGif->SWidth, fGif->SHeight, cur->ImageDesc.Left, cur->ImageDesc.Top, cur->ImageDesc.Width, cur->ImageDesc.Height, color);
|
||||
}
|
||||
case 2:
|
||||
|
||||
fillRect(bm, fGif->SWidth, fGif->SHeight, cur->ImageDesc.Left, cur->ImageDesc.Top, cur->ImageDesc.Width, cur->ImageDesc.Height, color);
|
||||
break;
|
||||
|
||||
case 3: {
|
||||
tmp = bm;
|
||||
bm = backup;
|
||||
backup = tmp;
|
||||
}
|
||||
case 3:
|
||||
tmp = bm;
|
||||
bm = backup;
|
||||
backup = tmp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -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) {
|
||||
return JNI_FALSE;
|
||||
return;
|
||||
}
|
||||
info->nextStartTime = 0;
|
||||
info->currentLoop = -1;
|
||||
info->currentIndex = -1;
|
||||
return JNI_TRUE;
|
||||
}
|
||||
|
||||
static void getBitmap(argb *bm, GifInfo *info) {
|
||||
GifFileType *fGIF = info->gifFilePtr;
|
||||
GifFileType* fGIF = info->gifFilePtr;
|
||||
|
||||
argb paintingColor;
|
||||
int i = info->currentIndex;
|
||||
if (DDGifSlurp(fGIF, info, true) == GIF_ERROR) {
|
||||
return; //TODO add leniency support
|
||||
return;
|
||||
}
|
||||
SavedImage *cur = &fGIF->SavedImages[i];
|
||||
|
||||
short transpIndex = info->infos[i].transpIndex;
|
||||
SavedImage* cur = &fGIF->SavedImages[i];
|
||||
int transpIndex = info->infos[i].transpIndex;
|
||||
if (i == 0) {
|
||||
if (transpIndex == -1) {
|
||||
getColorFromTable(fGIF->SBackGroundColor, &paintingColor, fGIF->SColorMap);
|
||||
|
|
@ -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) {
|
||||
jint *ints = (*env)->GetIntArrayElements(env, metaData, 0);
|
||||
*ints++ = width;
|
||||
*ints++ = height;
|
||||
*ints++ = ImageCount;
|
||||
*ints = errorCode;
|
||||
jint *const ints = (*env)->GetIntArrayElements(env, metaData, 0);
|
||||
if (ints == NULL) {
|
||||
return;
|
||||
}
|
||||
ints[0] = width;
|
||||
ints[1] = height;
|
||||
ints[2] = ImageCount;
|
||||
ints[3] = errorCode;
|
||||
(*env)->ReleaseIntArrayElements(env, metaData, ints, 0);
|
||||
}
|
||||
|
||||
|
|
@ -554,9 +557,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j
|
|||
info->speedFactor = 1.0;
|
||||
info->rasterBits = calloc(GifFileIn->SHeight * GifFileIn->SWidth, sizeof(GifPixelType));
|
||||
info->infos = malloc(sizeof(FrameInfo));
|
||||
info->infos->duration = 0;
|
||||
info->infos->disposalMethod = 0;
|
||||
info->infos->transpIndex = -1;
|
||||
info->backupPtr = NULL;
|
||||
|
||||
if (info->rasterBits == NULL || info->infos == NULL) {
|
||||
|
|
@ -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);
|
||||
return (jint) NULL;
|
||||
}
|
||||
|
||||
if (DDGifSlurp(GifFileIn, info, false) == GIF_ERROR) {
|
||||
Error = GifFileIn->Error;
|
||||
}
|
||||
info->infos->duration = 0;
|
||||
info->infos->disposalMethod = 0;
|
||||
info->infos->transpIndex = -1;
|
||||
if (GifFileIn->SColorMap == NULL || GifFileIn->SColorMap->ColorCount != (1 << GifFileIn->SColorMap->BitsPerPixel)) {
|
||||
GifFreeMapObject(GifFileIn->SColorMap);
|
||||
GifFileIn->SColorMap = defaultCmap;
|
||||
}
|
||||
|
||||
DDGifSlurp(GifFileIn, info, false);
|
||||
|
||||
int imgCount = GifFileIn->ImageCount;
|
||||
|
||||
if (imgCount < 1) {
|
||||
Error = D_GIF_ERR_NO_FRAMES;
|
||||
}
|
||||
|
|
@ -583,7 +586,6 @@ static jint open(GifFileType *GifFileIn, int Error, int startPos, JNIEnv *env, j
|
|||
cleanUp(info);
|
||||
}
|
||||
setMetaData(width, height, imgCount, Error, env, metaData);
|
||||
|
||||
return (jint)(Error == 0 ? info : NULL);
|
||||
}
|
||||
|
||||
|
|
@ -600,12 +602,12 @@ JNIEXPORT jlong JNICALL Java_org_telegram_ui_Views_GifDrawable_getAllocationByte
|
|||
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;
|
||||
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) {
|
||||
|
|
@ -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) {
|
||||
GifInfo *info = (GifInfo *)gifInfo;
|
||||
if (info == NULL) {
|
||||
if (info == NULL || jPixels == NULL) {
|
||||
return;
|
||||
}
|
||||
int imgCount = info->gifFilePtr->ImageCount;
|
||||
|
|
@ -643,25 +645,29 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToTime(JNIEnv
|
|||
if (i == imgCount - 1 && lastFrameRemainder > info->infos[i].duration) {
|
||||
lastFrameRemainder = info->infos[i].duration;
|
||||
}
|
||||
info->lastFrameReaminder = lastFrameRemainder;
|
||||
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) {
|
||||
info->currentIndex++;
|
||||
getBitmap((argb *)pixels, info);
|
||||
getBitmap((argb*) pixels, info);
|
||||
}
|
||||
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
|
||||
}
|
||||
info->lastFrameReaminder = lastFrameRemainder;
|
||||
|
||||
if (info->speedFactor == 1.0) {
|
||||
info->nextStartTime = getRealTime() + lastFrameRemainder;
|
||||
} else {
|
||||
} else {
|
||||
info->nextStartTime = getRealTime() + lastFrameRemainder * info->speedFactor;
|
||||
}
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv *env, jclass class, jobject gifInfo, jint desiredIdx, jintArray jPixels) {
|
||||
GifInfo *info = (GifInfo *)gifInfo;
|
||||
if (info == NULL) {
|
||||
if (info == NULL|| jPixels==NULL) {
|
||||
return;
|
||||
}
|
||||
if (desiredIdx <= info->currentIndex) {
|
||||
|
|
@ -673,15 +679,19 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv
|
|||
return;
|
||||
}
|
||||
|
||||
jint *const pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
|
||||
if (pixels == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
info->lastFrameReaminder = 0;
|
||||
if (desiredIdx >= imgCount) {
|
||||
desiredIdx = imgCount - 1;
|
||||
}
|
||||
|
||||
info->lastFrameReaminder = 0;
|
||||
jint *pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
|
||||
while (info->currentIndex < desiredIdx) {
|
||||
info->currentIndex++;
|
||||
getBitmap((argb *)pixels, info);
|
||||
getBitmap((argb *) pixels, info);
|
||||
}
|
||||
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
|
||||
if (info->speedFactor == 1.0) {
|
||||
|
|
@ -689,16 +699,13 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_seekToFrame(JNIEnv
|
|||
} else {
|
||||
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) {
|
||||
|
||||
GifInfo *info = (GifInfo *)gifInfo;
|
||||
if (info == NULL) {
|
||||
if (info == NULL || jPixels == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool needRedraw = false;
|
||||
unsigned long rt = getRealTime();
|
||||
|
||||
|
|
@ -708,24 +715,40 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_renderFrame(JNIEnv
|
|||
}
|
||||
needRedraw = true;
|
||||
}
|
||||
jint *rawMetaData = (*env)->GetIntArrayElements(env, metaData, 0);
|
||||
jint *const rawMetaData = (*env)->GetIntArrayElements(env, metaData, 0);
|
||||
if (rawMetaData == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (needRedraw) {
|
||||
jint *pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
|
||||
if (needRedraw) {
|
||||
jint *const pixels = (*env)->GetIntArrayElements(env, jPixels, 0);
|
||||
if (pixels == NULL) {
|
||||
(*env)->ReleaseIntArrayElements(env, metaData, rawMetaData, 0);
|
||||
return;
|
||||
}
|
||||
getBitmap((argb *)pixels, info);
|
||||
rawMetaData[3] = info->gifFilePtr->Error;
|
||||
|
||||
(*env)->ReleaseIntArrayElements(env, jPixels, pixels, 0);
|
||||
|
||||
int scaledDuration = info->infos[info->currentIndex].duration;
|
||||
unsigned int scaledDuration = info->infos[info->currentIndex].duration;
|
||||
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;
|
||||
rawMetaData[4] = scaledDuration;
|
||||
} 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);
|
||||
}
|
||||
|
||||
|
|
@ -794,9 +817,6 @@ JNIEXPORT void JNICALL Java_org_telegram_ui_Views_GifDrawable_saveRemainder(JNIE
|
|||
return;
|
||||
}
|
||||
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) {
|
||||
|
|
@ -814,7 +834,7 @@ JNIEXPORT jint JNICALL Java_org_telegram_ui_Views_GifDrawable_openFile(JNIEnv *e
|
|||
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");
|
||||
(*env)->ReleaseStringUTFChars(env, jfname, fname);
|
||||
if (file == NULL) {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,101 @@
|
|||
#include <stdio.h>
|
||||
#include <setjmp.h>
|
||||
#include <libjpeg/jpeglib.h>
|
||||
#include <android/bitmap.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 {
|
||||
struct jpeg_error_mgr pub;
|
||||
jmp_buf setjmp_buffer;
|
||||
|
|
@ -16,6 +109,15 @@ METHODDEF(void) my_error_exit(j_common_ptr cinfo) {
|
|||
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) {
|
||||
|
||||
int i;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -367,6 +367,7 @@ public class MessagesStorage {
|
|||
database.executeFast("DELETE FROM dialogs WHERE did = " + 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 messages WHERE uid = " + did).stepThis().dispose();
|
||||
database.executeFast("DELETE FROM media WHERE uid = " + did).stepThis().dispose();
|
||||
|
|
@ -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 {
|
||||
if (withTransaction) {
|
||||
database.beginTransaction();
|
||||
|
|
@ -1949,10 +1950,21 @@ public class MessagesStorage {
|
|||
state.dispose();
|
||||
state2.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()) {
|
||||
state.requery();
|
||||
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();
|
||||
Integer unread_count = messagesCounts.get(key);
|
||||
if (unread_count == null) {
|
||||
|
|
@ -1963,10 +1975,13 @@ public class MessagesStorage {
|
|||
messageId = value.local_id;
|
||||
}
|
||||
state.bindLong(1, key);
|
||||
state.bindInteger(2, value.date);
|
||||
state.bindLong(3, key);
|
||||
state.bindInteger(4, unread_count);
|
||||
state.bindInteger(5, messageId);
|
||||
if (!isBroadcast) {
|
||||
state.bindInteger(2, value.date);
|
||||
} else {
|
||||
state.bindInteger(2, dialog_date != 0 ? dialog_date : value.date);
|
||||
}
|
||||
state.bindInteger(3, unread_count);
|
||||
state.bindInteger(4, messageId);
|
||||
state.step();
|
||||
}
|
||||
state.dispose();
|
||||
|
|
@ -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) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -2010,11 +2025,11 @@ public class MessagesStorage {
|
|||
storageQueue.postRunnable(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
putMessagesInternal(messages, withTransaction);
|
||||
putMessagesInternal(messages, withTransaction, isBroadcast);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
putMessagesInternal(messages, withTransaction);
|
||||
putMessagesInternal(messages, withTransaction, isBroadcast);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2425,9 +2440,15 @@ public class MessagesStorage {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
int encryptedId = (int)(dialog.id >> 32);
|
||||
if (!encryptedToLoad.contains(encryptedId)) {
|
||||
encryptedToLoad.add(encryptedId);
|
||||
int high_id = (int)(dialog.id >> 32);
|
||||
if (high_id > 0) {
|
||||
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 {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
int encryptedId = (int)(dialog.id >> 32);
|
||||
if (!encryptedToLoad.contains(encryptedId)) {
|
||||
encryptedToLoad.add(encryptedId);
|
||||
int high_id = (int)(dialog.id >> 32);
|
||||
if (high_id > 0) {
|
||||
if (!encryptedToLoad.contains(high_id)) {
|
||||
encryptedToLoad.add(high_id);
|
||||
}
|
||||
} else {
|
||||
if (!chatsToLoad.contains(high_id)) {
|
||||
chatsToLoad.add(high_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ public class NativeLoader {
|
|||
|
||||
private static final long sizes[] = new long[] {
|
||||
799376, //armeabi
|
||||
848548, //armeabi-v7a
|
||||
1246260, //x86
|
||||
852644, //armeabi-v7a
|
||||
1250356, //x86
|
||||
0, //mips
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ public class NotificationsController {
|
|||
}
|
||||
|
||||
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) {
|
||||
mBuilder.setLargeIcon(img);
|
||||
}
|
||||
|
|
@ -536,7 +536,7 @@ public class NotificationsController {
|
|||
|
||||
Boolean value = settingsCache.get(dialog_id);
|
||||
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) {
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -248,10 +248,14 @@ public class FileLoadOperation {
|
|||
|
||||
float w_filter = 0;
|
||||
float h_filter = 0;
|
||||
boolean blur = false;
|
||||
if (filter != null) {
|
||||
String args[] = filter.split("_");
|
||||
w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
|
||||
h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
|
||||
if (args.length > 2) {
|
||||
blur = true;
|
||||
}
|
||||
opts.inJustDecodeBounds = true;
|
||||
|
||||
if (mediaIdFinal != null) {
|
||||
|
|
@ -270,7 +274,7 @@ public class FileLoadOperation {
|
|||
opts.inSampleSize = (int)scaleFactor;
|
||||
}
|
||||
|
||||
if (filter == null) {
|
||||
if (filter == null || blur) {
|
||||
opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
|
||||
} else {
|
||||
opts.inPreferredConfig = Bitmap.Config.RGB_565;
|
||||
|
|
@ -300,7 +304,9 @@ public class FileLoadOperation {
|
|||
image = scaledBitmap;
|
||||
}
|
||||
}
|
||||
|
||||
if (image != null && blur && bitmapH < 100 && bitmapW < 100) {
|
||||
Utilities.blurBitmap(image, (int)bitmapW, (int)bitmapH, image.getRowBytes());
|
||||
}
|
||||
}
|
||||
if (FileLoader.getInstance().runtimeHack != null) {
|
||||
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
|
||||
|
|
@ -494,10 +500,14 @@ public class FileLoadOperation {
|
|||
|
||||
float w_filter = 0;
|
||||
float h_filter;
|
||||
boolean blur = false;
|
||||
if (filter != null) {
|
||||
String args[] = filter.split("_");
|
||||
w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
|
||||
h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
|
||||
if (args.length > 2) {
|
||||
blur = true;
|
||||
}
|
||||
|
||||
opts.inJustDecodeBounds = true;
|
||||
BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts);
|
||||
|
|
@ -511,7 +521,7 @@ public class FileLoadOperation {
|
|||
opts.inSampleSize = (int) scaleFactor;
|
||||
}
|
||||
|
||||
if (filter == null) {
|
||||
if (filter == null || blur) {
|
||||
opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
|
||||
} else {
|
||||
opts.inPreferredConfig = Bitmap.Config.RGB_565;
|
||||
|
|
@ -540,7 +550,9 @@ public class FileLoadOperation {
|
|||
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) {
|
||||
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class FileLoader {
|
|||
private long lastProgressUpdateTime = 0;
|
||||
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 FileDidFailUpload = 10001;
|
||||
|
|
@ -717,15 +717,15 @@ public class FileLoader {
|
|||
});
|
||||
}
|
||||
|
||||
public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter, boolean cancel) {
|
||||
return getImageFromMemory(url, null, imageView, filter, cancel);
|
||||
public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter) {
|
||||
return getImageFromMemory(url, null, imageView, filter);
|
||||
}
|
||||
|
||||
public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter, boolean cancel) {
|
||||
return getImageFromMemory(null, url, imageView, filter, cancel);
|
||||
public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter) {
|
||||
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) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -739,11 +739,7 @@ public class FileLoader {
|
|||
key += "@" + filter;
|
||||
}
|
||||
|
||||
Bitmap img = imageFromKey(key);
|
||||
if (imageView != null && img != null && cancel) {
|
||||
cancelLoadingForImageView(imageView);
|
||||
}
|
||||
return img;
|
||||
return imageFromKey(key);
|
||||
}
|
||||
|
||||
private void performReplace(String oldKey, String newKey) {
|
||||
|
|
|
|||
|
|
@ -439,6 +439,7 @@ public class TLClassStore {
|
|||
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_video_old.constructor, TLRPC.TL_video_old.class);
|
||||
classStore.put(TLRPC.TL_messageActionCreatedBroadcastList.constructor, TLRPC.TL_messageActionCreatedBroadcastList.class);
|
||||
}
|
||||
|
||||
static TLClassStore store = null;
|
||||
|
|
|
|||
|
|
@ -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 int constructor = 0x55555556;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ public class UserConfig {
|
|||
public static String pushString = "";
|
||||
public static int lastSendMessageId = -210000;
|
||||
public static int lastLocalId = -210000;
|
||||
public static int lastBroadcastId = -1;
|
||||
public static String contactsHash = "";
|
||||
public static String importHash = "";
|
||||
private final static Integer sync = 1;
|
||||
|
|
@ -56,6 +57,7 @@ public class UserConfig {
|
|||
editor.putString("importHash", importHash);
|
||||
editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos);
|
||||
editor.putInt("contactsVersion", contactsVersion);
|
||||
editor.putInt("lastBroadcastId", lastBroadcastId);
|
||||
editor.putBoolean("registeredForInternalPush", registeredForInternalPush);
|
||||
if (currentUser != null) {
|
||||
if (withFile) {
|
||||
|
|
@ -174,6 +176,7 @@ public class UserConfig {
|
|||
importHash = preferences.getString("importHash", "");
|
||||
saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false);
|
||||
contactsVersion = preferences.getInt("contactsVersion", 0);
|
||||
lastBroadcastId = preferences.getInt("lastBroadcastId", -1);
|
||||
registeredForInternalPush = preferences.getBoolean("registeredForInternalPush", false);
|
||||
String user = preferences.getString("user", null);
|
||||
if (user != null) {
|
||||
|
|
@ -196,6 +199,7 @@ public class UserConfig {
|
|||
lastLocalId = -210000;
|
||||
lastSendMessageId = -210000;
|
||||
contactsVersion = 1;
|
||||
lastBroadcastId = -1;
|
||||
saveIncomingPhotos = false;
|
||||
saveConfig(true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ public class Utilities {
|
|||
|
||||
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 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);
|
||||
|
||||
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 {
|
|||
}
|
||||
|
||||
public static Integer parseInt(String value) {
|
||||
if (value == null) {
|
||||
return 0;
|
||||
}
|
||||
Integer val = 0;
|
||||
try {
|
||||
Matcher matcher = pattern.matcher(value);
|
||||
|
|
@ -548,7 +552,7 @@ public class Utilities {
|
|||
}
|
||||
|
||||
public static int getGroupAvatarForId(int id) {
|
||||
return arrGroupsAvatars[getColorIndex(-id)];
|
||||
return arrGroupsAvatars[getColorIndex(-Math.abs(id))];
|
||||
}
|
||||
|
||||
public static String MD5(String md5) {
|
||||
|
|
|
|||
|
|
@ -63,6 +63,10 @@ public class MessageObject {
|
|||
public ArrayList<TextLayoutBlock> textLayoutBlocks;
|
||||
|
||||
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) {
|
||||
textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
|
||||
textPaint.setColor(0xff000000);
|
||||
|
|
@ -136,7 +140,7 @@ public class MessageObject {
|
|||
} else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) {
|
||||
photoThumbs = new ArrayList<PhotoObject>();
|
||||
for (TLRPC.PhotoSize size : message.action.photo.sizes) {
|
||||
photoThumbs.add(new PhotoObject(size));
|
||||
photoThumbs.add(new PhotoObject(size, preview));
|
||||
}
|
||||
if (isFromMe()) {
|
||||
messageText = LocaleController.getString("ActionYouChangedPhoto", R.string.ActionYouChangedPhoto);
|
||||
|
|
@ -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)) {
|
||||
if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
|
||||
photoThumbs = new ArrayList<PhotoObject>();
|
||||
for (TLRPC.PhotoSize size : message.media.photo.sizes) {
|
||||
PhotoObject obj = new PhotoObject(size);
|
||||
PhotoObject obj = new PhotoObject(size, preview);
|
||||
photoThumbs.add(obj);
|
||||
if (imagePreview == null && obj.image != null) {
|
||||
imagePreview = obj.image;
|
||||
|
|
@ -247,7 +253,7 @@ public class MessageObject {
|
|||
messageText = LocaleController.getString("AttachPhoto", R.string.AttachPhoto);
|
||||
} else if (message.media instanceof TLRPC.TL_messageMediaVideo) {
|
||||
photoThumbs = new ArrayList<PhotoObject>();
|
||||
PhotoObject obj = new PhotoObject(message.media.video.thumb);
|
||||
PhotoObject obj = new PhotoObject(message.media.video.thumb, preview);
|
||||
photoThumbs.add(obj);
|
||||
if (imagePreview == null && obj.image != null) {
|
||||
imagePreview = obj.image;
|
||||
|
|
@ -262,7 +268,7 @@ public class MessageObject {
|
|||
} else if (message.media instanceof TLRPC.TL_messageMediaDocument) {
|
||||
if (!(message.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty)) {
|
||||
photoThumbs = new ArrayList<PhotoObject>();
|
||||
PhotoObject obj = new PhotoObject(message.media.document.thumb);
|
||||
PhotoObject obj = new PhotoObject(message.media.document.thumb, preview);
|
||||
photoThumbs.add(obj);
|
||||
}
|
||||
messageText = LocaleController.getString("AttachDocument", R.string.AttachDocument);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import android.graphics.BitmapFactory;
|
|||
|
||||
import org.telegram.messenger.TLRPC;
|
||||
import org.telegram.messenger.FileLoader;
|
||||
import org.telegram.messenger.Utilities;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
|
@ -20,18 +21,23 @@ public class PhotoObject {
|
|||
public TLRPC.PhotoSize photoOwner;
|
||||
public Bitmap image;
|
||||
|
||||
public PhotoObject(TLRPC.PhotoSize photo) {
|
||||
public PhotoObject(TLRPC.PhotoSize photo, int preview) {
|
||||
photoOwner = photo;
|
||||
|
||||
if (photo instanceof TLRPC.TL_photoCachedSize) {
|
||||
if (preview != 0 && photo instanceof TLRPC.TL_photoCachedSize) {
|
||||
BitmapFactory.Options opts = new BitmapFactory.Options();
|
||||
opts.inPreferredConfig = Bitmap.Config.RGB_565;
|
||||
opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
|
||||
opts.inDither = false;
|
||||
opts.outWidth = photo.w;
|
||||
opts.outHeight = photo.h;
|
||||
image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts);
|
||||
if (image != null && FileLoader.getInstance().runtimeHack != null) {
|
||||
FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import org.telegram.objects.PhotoObject;
|
|||
import org.telegram.ui.PhotoViewer;
|
||||
import org.telegram.ui.Views.GifDrawable;
|
||||
import org.telegram.ui.Views.ImageReceiver;
|
||||
import org.telegram.ui.Views.ProgressView;
|
||||
import org.telegram.ui.Views.RoundProgressView;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Locale;
|
||||
|
|
@ -45,7 +45,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
private static Drawable placeholderInDrawable;
|
||||
private static Drawable placeholderOutDrawable;
|
||||
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 MessageObject lastDownloadedGifMessage = null;
|
||||
|
||||
|
|
@ -57,10 +57,11 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
private String currentUrl;
|
||||
private String currentPhotoFilter;
|
||||
private ImageReceiver photoImage;
|
||||
private ProgressView progressView;
|
||||
private RoundProgressView progressView;
|
||||
public int downloadPhotos = 0;
|
||||
private boolean progressVisible = false;
|
||||
private boolean photoNotSet = false;
|
||||
private boolean cancelLoading = false;
|
||||
|
||||
private int TAG;
|
||||
|
||||
|
|
@ -83,14 +84,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
if (placeholderInDrawable == null) {
|
||||
placeholderInDrawable = getResources().getDrawable(R.drawable.photo_placeholder_in);
|
||||
placeholderOutDrawable = getResources().getDrawable(R.drawable.photo_placeholder_out);
|
||||
buttonStatesDrawables[0][0] = getResources().getDrawable(R.drawable.photoload);
|
||||
buttonStatesDrawables[0][1] = getResources().getDrawable(R.drawable.photoload_pressed);
|
||||
buttonStatesDrawables[1][0] = getResources().getDrawable(R.drawable.photocancel);
|
||||
buttonStatesDrawables[1][1] = getResources().getDrawable(R.drawable.photocancel_pressed);
|
||||
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);
|
||||
buttonStatesDrawables[0] = getResources().getDrawable(R.drawable.photoload);
|
||||
buttonStatesDrawables[1] = getResources().getDrawable(R.drawable.photocancel);
|
||||
buttonStatesDrawables[2] = getResources().getDrawable(R.drawable.photogif);
|
||||
buttonStatesDrawables[3] = getResources().getDrawable(R.drawable.playvideo);
|
||||
videoIconDrawable = getResources().getDrawable(R.drawable.ic_video);
|
||||
|
||||
infoPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
|
||||
|
|
@ -102,8 +99,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
|
||||
photoImage = new ImageReceiver();
|
||||
photoImage.parentView = this;
|
||||
progressView = new ProgressView();
|
||||
progressView.setProgressColors(0x802a2a2a, 0xffffffff);
|
||||
progressView = new RoundProgressView();
|
||||
}
|
||||
|
||||
public void clearGifImage() {
|
||||
|
|
@ -225,6 +221,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
|
||||
private void didPressedButton() {
|
||||
if (buttonState == 0) {
|
||||
cancelLoading = false;
|
||||
if (currentMessageObject.type == 1) {
|
||||
if (currentMessageObject.imagePreview != null) {
|
||||
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
|
|||
delegate.didPressedCancelSendButton(this);
|
||||
}
|
||||
} else {
|
||||
cancelLoading = true;
|
||||
if (currentMessageObject.type == 1) {
|
||||
FileLoader.getInstance().cancelLoadingForImageView(photoImage);
|
||||
} else if (currentMessageObject.type == 8) {
|
||||
|
|
@ -304,6 +302,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
public void setMessageObject(MessageObject messageObject) {
|
||||
if (currentMessageObject != messageObject || isPhotoDataChanged(messageObject) || isUserDataChanged()) {
|
||||
super.setMessageObject(messageObject);
|
||||
cancelLoading = false;
|
||||
|
||||
progressVisible = false;
|
||||
buttonState = -1;
|
||||
|
|
@ -395,6 +394,9 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
photoHeight = h;
|
||||
backgroundWidth = w + AndroidUtilities.dp(12);
|
||||
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) {
|
||||
photoImage.setImageBitmap(currentPhotoObject.image);
|
||||
|
|
@ -485,20 +487,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
if (!cacheFile.exists()) {
|
||||
MediaController.getInstance().addLoadingFileObserver(fileName, this);
|
||||
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;
|
||||
progressVisible = false;
|
||||
} else {
|
||||
buttonState = -1;
|
||||
buttonState = 1;
|
||||
progressVisible = true;
|
||||
}
|
||||
progressView.setProgress(0);
|
||||
} else {
|
||||
if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
|
||||
buttonState = 1;
|
||||
} else {
|
||||
buttonState = -1;
|
||||
}
|
||||
buttonState = 1;
|
||||
progressVisible = true;
|
||||
Float progress = FileLoader.getInstance().fileProgresses.get(fileName);
|
||||
if (progress != null) {
|
||||
|
|
@ -544,13 +542,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
photoImage.imageW = photoWidth;
|
||||
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);
|
||||
buttonX = (int)(photoImage.imageX + (photoWidth - 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
|
||||
|
|
@ -566,22 +561,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
|
|||
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) {
|
||||
Drawable currentButtonDrawable = buttonStatesDrawables[buttonState][buttonPressed];
|
||||
Drawable currentButtonDrawable = buttonStatesDrawables[buttonState];
|
||||
setDrawableBounds(currentButtonDrawable, buttonX, buttonY);
|
||||
currentButtonDrawable.draw(canvas);
|
||||
}
|
||||
|
||||
if (progressVisible) {
|
||||
progressView.draw(canvas);
|
||||
}
|
||||
|
||||
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));
|
||||
mediaBackgroundDrawable.draw(canvas);
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ public class DialogCell extends BaseCell {
|
|||
private static Drawable lockDrawable;
|
||||
private static Drawable countDrawable;
|
||||
private static Drawable groupDrawable;
|
||||
private static Drawable broadcastDrawable;
|
||||
|
||||
private TLRPC.TL_dialog currentDialog;
|
||||
private ImageReceiver avatarImage;
|
||||
|
|
@ -130,6 +131,10 @@ public class DialogCell extends BaseCell {
|
|||
groupDrawable = getResources().getDrawable(R.drawable.grouplist);
|
||||
}
|
||||
|
||||
if (broadcastDrawable == null) {
|
||||
broadcastDrawable = getResources().getDrawable(R.drawable.broadcast);
|
||||
}
|
||||
|
||||
if (avatarImage == null) {
|
||||
avatarImage = new ImageReceiver();
|
||||
avatarImage.parentView = this;
|
||||
|
|
@ -227,9 +232,14 @@ public class DialogCell extends BaseCell {
|
|||
user = MessagesController.getInstance().users.get(lower_id);
|
||||
}
|
||||
} else {
|
||||
encryptedChat = MessagesController.getInstance().encryptedChats.get((int)(currentDialog.id >> 32));
|
||||
if (encryptedChat != null) {
|
||||
user = MessagesController.getInstance().users.get(encryptedChat.user_id);
|
||||
int high_id = (int)(currentDialog.id >> 32);
|
||||
if (high_id > 0) {
|
||||
encryptedChat = MessagesController.getInstance().encryptedChats.get(high_id);
|
||||
if (encryptedChat != null) {
|
||||
user = MessagesController.getInstance().users.get(encryptedChat.user_id);
|
||||
}
|
||||
} else {
|
||||
chat = MessagesController.getInstance().chats.get(high_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -274,6 +284,9 @@ public class DialogCell extends BaseCell {
|
|||
} else if (cellLayout.drawNameGroup) {
|
||||
setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
|
||||
groupDrawable.draw(canvas);
|
||||
} else if (cellLayout.drawNameBroadcast) {
|
||||
setDrawableBounds(broadcastDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
|
||||
broadcastDrawable.draw(canvas);
|
||||
}
|
||||
|
||||
canvas.save();
|
||||
|
|
@ -328,6 +341,7 @@ public class DialogCell extends BaseCell {
|
|||
private StaticLayout nameLayout;
|
||||
private boolean drawNameLock;
|
||||
private boolean drawNameGroup;
|
||||
private boolean drawNameBroadcast;
|
||||
private int nameLockLeft;
|
||||
private int nameLockTop;
|
||||
|
||||
|
|
@ -372,9 +386,12 @@ public class DialogCell extends BaseCell {
|
|||
TextPaint currentMessagePaint = messagePaint;
|
||||
boolean checkMessage = true;
|
||||
|
||||
drawNameGroup = false;
|
||||
drawNameBroadcast = false;
|
||||
drawNameLock = false;
|
||||
|
||||
if (encryptedChat != null) {
|
||||
drawNameLock = true;
|
||||
drawNameGroup = false;
|
||||
nameLockTop = AndroidUtilities.dp(13);
|
||||
if (!LocaleController.isRTL) {
|
||||
nameLockLeft = AndroidUtilities.dp(77);
|
||||
|
|
@ -384,19 +401,21 @@ public class DialogCell extends BaseCell {
|
|||
nameLeft = AndroidUtilities.dp(14);
|
||||
}
|
||||
} else {
|
||||
drawNameLock = false;
|
||||
if (chat != null) {
|
||||
drawNameGroup = true;
|
||||
if (chat.id < 0) {
|
||||
drawNameBroadcast = true;
|
||||
} else {
|
||||
drawNameGroup = true;
|
||||
}
|
||||
nameLockTop = AndroidUtilities.dp(14);
|
||||
if (!LocaleController.isRTL) {
|
||||
nameLockLeft = AndroidUtilities.dp(77);
|
||||
nameLeft = AndroidUtilities.dp(81) + groupDrawable.getIntrinsicWidth();
|
||||
nameLeft = AndroidUtilities.dp(81) + (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
|
||||
} else {
|
||||
nameLockLeft = width - AndroidUtilities.dp(77) - groupDrawable.getIntrinsicWidth();
|
||||
nameLockLeft = width - AndroidUtilities.dp(77) - (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
|
||||
nameLeft = AndroidUtilities.dp(14);
|
||||
}
|
||||
} else {
|
||||
drawNameGroup = false;
|
||||
if (!LocaleController.isRTL) {
|
||||
nameLeft = AndroidUtilities.dp(77);
|
||||
} else {
|
||||
|
|
@ -461,7 +480,7 @@ public class DialogCell extends BaseCell {
|
|||
messageString = message.messageText;
|
||||
currentMessagePaint = messagePrintingPaint;
|
||||
} else {
|
||||
if (chat != null) {
|
||||
if (chat != null && chat.id > 0) {
|
||||
String name = "";
|
||||
if (message.isFromMe()) {
|
||||
name = LocaleController.getString("FromYou", R.string.FromYou);
|
||||
|
|
@ -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) {
|
||||
drawCheck1 = false;
|
||||
drawCheck2 = false;
|
||||
|
|
@ -579,6 +598,8 @@ public class DialogCell extends BaseCell {
|
|||
nameWidth -= AndroidUtilities.dp(4) + lockDrawable.getIntrinsicWidth();
|
||||
} else if (drawNameGroup) {
|
||||
nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth();
|
||||
} else if (drawNameBroadcast) {
|
||||
nameWidth -= AndroidUtilities.dp(4) + broadcastDrawable.getIntrinsicWidth();
|
||||
}
|
||||
if (drawClock) {
|
||||
int w = clockDrawable.getIntrinsicWidth() + AndroidUtilities.dp(2);
|
||||
|
|
|
|||
|
|
@ -212,7 +212,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
}
|
||||
}
|
||||
MessagesController.getInstance().loadChatInfo(currentChat.id);
|
||||
dialog_id = -chatId;
|
||||
if (chatId > 0) {
|
||||
dialog_id = -chatId;
|
||||
} else {
|
||||
dialog_id = ((long)chatId) << 32;
|
||||
}
|
||||
} else if (userId != 0) {
|
||||
currentUser = MessagesController.getInstance().users.get(userId);
|
||||
if (currentUser == null) {
|
||||
|
|
@ -528,6 +532,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
|
||||
if (currentEncryptedChat != null) {
|
||||
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();
|
||||
|
|
@ -1045,7 +1051,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
|
||||
private int getMessageType(MessageObject messageObject) {
|
||||
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.media instanceof TLRPC.TL_messageMediaEmpty)) {
|
||||
return 0;
|
||||
|
|
@ -1771,7 +1778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
if (messArr.size() != count) {
|
||||
if (isCache) {
|
||||
cacheEndReaced = true;
|
||||
if (currentEncryptedChat != null) {
|
||||
if ((int)dialog_id == 0) {
|
||||
endReached = true;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -2897,24 +2904,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
|
||||
private void forwardSelectedMessages(long did, boolean fromMyName) {
|
||||
if (forwaringMessage != null) {
|
||||
if (forwaringMessage.messageOwner.id > 0) {
|
||||
if (!fromMyName) {
|
||||
if (!fromMyName) {
|
||||
if (forwaringMessage.messageOwner.id > 0) {
|
||||
MessagesController.getInstance().sendMessage(forwaringMessage, did);
|
||||
} else {
|
||||
processForwardFromMe(forwaringMessage, did);
|
||||
}
|
||||
} else {
|
||||
processForwardFromMe(forwaringMessage, did);
|
||||
}
|
||||
forwaringMessage = null;
|
||||
} else {
|
||||
ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
|
||||
Collections.sort(ids);
|
||||
for (Integer id : ids) {
|
||||
if (id > 0) {
|
||||
if (!fromMyName) {
|
||||
if (!fromMyName) {
|
||||
if (id > 0) {
|
||||
MessagesController.getInstance().sendMessage(selectedMessagesIds.get(id), did);
|
||||
} else {
|
||||
processForwardFromMe(selectedMessagesIds.get(id), did);
|
||||
}
|
||||
} else {
|
||||
processForwardFromMe(selectedMessagesIds.get(id), did);
|
||||
}
|
||||
}
|
||||
selectedMessagesCanCopyIds.clear();
|
||||
|
|
@ -2925,7 +2932,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
|||
@Override
|
||||
public void didSelectDialog(MessagesActivity activity, long did, boolean param) {
|
||||
if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) {
|
||||
|
||||
if ((int)dialog_id == 0 && currentEncryptedChat == null) {
|
||||
param = true;
|
||||
}
|
||||
if (did != dialog_id) {
|
||||
int lower_part = (int)did;
|
||||
if (lower_part != 0) {
|
||||
|
|
|
|||
|
|
@ -112,7 +112,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
NotificationCenter.getInstance().addObserver(this, MessagesController.closeChats);
|
||||
|
||||
updateOnlineCount();
|
||||
MessagesController.getInstance().getMediaCount(-chat_id, classGuid, true);
|
||||
if (chat_id > 0) {
|
||||
MessagesController.getInstance().getMediaCount(-chat_id, classGuid, true);
|
||||
}
|
||||
avatarUpdater.delegate = new AvatarUpdater.AvatarUpdaterDelegate() {
|
||||
@Override
|
||||
public void didUploadedPhoto(TLRPC.InputFile file, TLRPC.PhotoSize small, TLRPC.PhotoSize big) {
|
||||
|
|
@ -131,10 +133,12 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
private void updateRowsIds() {
|
||||
rowCount = 0;
|
||||
avatarRow = rowCount++;
|
||||
settingsSectionRow = rowCount++;
|
||||
settingsNotificationsRow = rowCount++;
|
||||
sharedMediaSectionRow = rowCount++;
|
||||
sharedMediaRow = rowCount++;
|
||||
if (chat_id > 0) {
|
||||
settingsSectionRow = rowCount++;
|
||||
settingsNotificationsRow = rowCount++;
|
||||
sharedMediaSectionRow = rowCount++;
|
||||
sharedMediaRow = rowCount++;
|
||||
}
|
||||
if (info != null && !(info instanceof TLRPC.TL_chatParticipantsForbidden)) {
|
||||
membersSectionRow = rowCount++;
|
||||
rowCount += info.participants.size();
|
||||
|
|
@ -149,7 +153,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
addMemberRow = -1;
|
||||
membersSectionRow = -1;
|
||||
}
|
||||
leaveGroupRow = rowCount++;
|
||||
if (chat_id > 0) {
|
||||
leaveGroupRow = rowCount++;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -166,7 +172,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
if (fragmentView == null) {
|
||||
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
|
||||
actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
|
||||
actionBarLayer.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo));
|
||||
if (chat_id > 0) {
|
||||
actionBarLayer.setTitle(LocaleController.getString("GroupInfo", R.string.GroupInfo));
|
||||
} else {
|
||||
actionBarLayer.setTitle(LocaleController.getString("BroadcastList", R.string.BroadcastList));
|
||||
}
|
||||
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
|
||||
@Override
|
||||
public void onItemClick(int id) {
|
||||
|
|
@ -181,7 +191,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
View item = menu.addItemResource(done_button, R.layout.group_profile_add_member_layout);
|
||||
TextView textView = (TextView)item.findViewById(R.id.done_button);
|
||||
if (textView != null) {
|
||||
textView.setText(LocaleController.getString("AddMember", R.string.AddMember));
|
||||
if (chat_id > 0) {
|
||||
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);
|
||||
|
|
@ -206,7 +220,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
selectedUser = user;
|
||||
|
||||
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() {
|
||||
@Override
|
||||
|
|
@ -259,7 +273,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
|
||||
@Override
|
||||
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
|
||||
|
|
@ -461,7 +475,9 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
args.putBoolean("destroyAfterSelect", true);
|
||||
args.putBoolean("usersAsSections", true);
|
||||
args.putBoolean("returnAsResult", true);
|
||||
args.putString("selectAlertString", LocaleController.getString("AddToTheGroup", R.string.AddToTheGroup));
|
||||
if (chat_id > 0) {
|
||||
args.putString("selectAlertString", LocaleController.getString("AddToTheGroup", R.string.AddToTheGroup));
|
||||
}
|
||||
ContactsActivity fragment = new ContactsActivity(args);
|
||||
fragment.setDelegate(this);
|
||||
if (info != null) {
|
||||
|
|
@ -546,52 +562,56 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
});
|
||||
|
||||
final ImageButton button2 = (ImageButton)view.findViewById(R.id.settings_change_avatar_button);
|
||||
button2.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if (getParentActivity() == null) {
|
||||
return;
|
||||
}
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
|
||||
CharSequence[] items;
|
||||
int type;
|
||||
TLRPC.Chat chat = MessagesController.getInstance().chats.get(chat_id);
|
||||
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)};
|
||||
type = 0;
|
||||
} 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)};
|
||||
type = 1;
|
||||
}
|
||||
|
||||
final int arg0 = type;
|
||||
builder.setItems(items, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
int action = 0;
|
||||
if (arg0 == 1) {
|
||||
if (i == 0) {
|
||||
action = 0;
|
||||
} else if (i == 1) {
|
||||
action = 1;
|
||||
} else if (i == 2) {
|
||||
action = 2;
|
||||
} else if (i == 3) {
|
||||
action = 3;
|
||||
}
|
||||
} else if (arg0 == 0) {
|
||||
if (i == 0) {
|
||||
action = 1;
|
||||
} else if (i == 1) {
|
||||
action = 2;
|
||||
}
|
||||
}
|
||||
processPhotoMenu(action);
|
||||
if (chat_id > 0) {
|
||||
button2.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if (getParentActivity() == null) {
|
||||
return;
|
||||
}
|
||||
});
|
||||
showAlertDialog(builder);
|
||||
}
|
||||
});
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
|
||||
CharSequence[] items;
|
||||
int type;
|
||||
TLRPC.Chat chat = MessagesController.getInstance().chats.get(chat_id);
|
||||
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)};
|
||||
type = 0;
|
||||
} 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)};
|
||||
type = 1;
|
||||
}
|
||||
|
||||
final int arg0 = type;
|
||||
builder.setItems(items, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
int action = 0;
|
||||
if (arg0 == 1) {
|
||||
if (i == 0) {
|
||||
action = 0;
|
||||
} else if (i == 1) {
|
||||
action = 1;
|
||||
} else if (i == 2) {
|
||||
action = 2;
|
||||
} else if (i == 3) {
|
||||
action = 3;
|
||||
}
|
||||
} else if (arg0 == 0) {
|
||||
if (i == 0) {
|
||||
action = 1;
|
||||
} else if (i == 1) {
|
||||
action = 2;
|
||||
}
|
||||
}
|
||||
processPhotoMenu(action);
|
||||
}
|
||||
});
|
||||
showAlertDialog(builder);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
button2.setVisibility(View.GONE);
|
||||
}
|
||||
} else {
|
||||
onlineText = (TextView)view.findViewById(R.id.settings_online);
|
||||
}
|
||||
|
|
@ -665,7 +685,13 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
|
|||
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
view = li.inflate(R.layout.chat_profile_add_row, viewGroup, false);
|
||||
TextView textView = (TextView)view.findViewById(R.id.messages_list_row_name);
|
||||
textView.setText(LocaleController.getString("AddMember", R.string.AddMember));
|
||||
if (chat_id > 0) {
|
||||
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) {
|
||||
if (view == null) {
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
|
|||
private TextView emptyTextView;
|
||||
private EditText userSelectEditText;
|
||||
private boolean ignoreChange = false;
|
||||
private boolean isBroadcast = false;
|
||||
|
||||
private HashMap<Integer, XImageSpan> selectedContacts = new HashMap<Integer, XImageSpan>();
|
||||
private ArrayList<XImageSpan> allSpans = new ArrayList<XImageSpan>();
|
||||
|
|
@ -105,6 +106,15 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
|
|||
|
||||
private final static int done_button = 1;
|
||||
|
||||
public GroupCreateActivity() {
|
||||
super();
|
||||
}
|
||||
|
||||
public GroupCreateActivity(Bundle args) {
|
||||
super(args);
|
||||
isBroadcast = args.getBoolean("broadcast", false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onFragmentCreate() {
|
||||
NotificationCenter.getInstance().addObserver(this, MessagesController.contactsDidLoaded);
|
||||
|
|
@ -126,7 +136,11 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
|
|||
if (fragmentView == null) {
|
||||
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
|
||||
actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
|
||||
if (isBroadcast) {
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
|
||||
} else {
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
|
||||
}
|
||||
actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), 200));
|
||||
|
||||
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
|
||||
|
|
@ -140,6 +154,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
|
|||
result.addAll(selectedContacts.keySet());
|
||||
Bundle args = new Bundle();
|
||||
args.putIntegerArrayList("result", result);
|
||||
args.putBoolean("broadcast", isBroadcast);
|
||||
presentFragment(new GroupCreateFinalActivity(args));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,11 +54,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
|
|||
private AvatarUpdater avatarUpdater = new AvatarUpdater();
|
||||
private ProgressDialog progressDialog = null;
|
||||
private String nameToSet = null;
|
||||
private boolean isBroadcast = false;
|
||||
|
||||
private final static int done_button = 1;
|
||||
|
||||
public GroupCreateFinalActivity(Bundle args) {
|
||||
super(args);
|
||||
isBroadcast = args.getBoolean("broadcast", false);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -120,7 +122,11 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
|
|||
if (fragmentView == null) {
|
||||
actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
|
||||
actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
|
||||
if (isBroadcast) {
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
|
||||
} else {
|
||||
actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
|
||||
}
|
||||
|
||||
actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
|
||||
@Override
|
||||
|
|
@ -136,29 +142,33 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
|
|||
}
|
||||
donePressed = true;
|
||||
|
||||
if (avatarUpdater.uploadingAvatar != null) {
|
||||
createAfterUpload = true;
|
||||
if (isBroadcast) {
|
||||
MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar, isBroadcast);
|
||||
} else {
|
||||
progressDialog = new ProgressDialog(getParentActivity());
|
||||
progressDialog.setMessage(LocaleController.getString("Loading", R.string.Loading));
|
||||
progressDialog.setCanceledOnTouchOutside(false);
|
||||
progressDialog.setCancelable(false);
|
||||
if (avatarUpdater.uploadingAvatar != null) {
|
||||
createAfterUpload = true;
|
||||
} else {
|
||||
progressDialog = new ProgressDialog(getParentActivity());
|
||||
progressDialog.setMessage(LocaleController.getString("Loading", R.string.Loading));
|
||||
progressDialog.setCanceledOnTouchOutside(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() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
ConnectionsManager.getInstance().cancelRpc(reqId, true);
|
||||
donePressed = false;
|
||||
try {
|
||||
dialog.dismiss();
|
||||
} catch (Exception e) {
|
||||
FileLog.e("tmessages", e);
|
||||
progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, LocaleController.getString("Cancel", R.string.Cancel), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
ConnectionsManager.getInstance().cancelRpc(reqId, true);
|
||||
donePressed = false;
|
||||
try {
|
||||
dialog.dismiss();
|
||||
} catch (Exception e) {
|
||||
FileLog.e("tmessages", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
progressDialog.show();
|
||||
});
|
||||
progressDialog.show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -173,45 +183,53 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
|
|||
fragmentView = inflater.inflate(R.layout.group_create_final_layout, container, false);
|
||||
|
||||
final ImageButton button2 = (ImageButton)fragmentView.findViewById(R.id.settings_change_avatar_button);
|
||||
button2.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if (getParentActivity() == null) {
|
||||
return;
|
||||
}
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
|
||||
|
||||
CharSequence[] items;
|
||||
|
||||
if (avatar != null) {
|
||||
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
|
||||
} else {
|
||||
items = new CharSequence[] {LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
|
||||
}
|
||||
|
||||
builder.setItems(items, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
if (i == 0) {
|
||||
avatarUpdater.openCamera();
|
||||
} else if (i == 1) {
|
||||
avatarUpdater.openGallery();
|
||||
} else if (i == 2) {
|
||||
avatar = null;
|
||||
uploadedAvatar = null;
|
||||
avatarImage.setImage(avatar, "50_50", R.drawable.group_blue);
|
||||
}
|
||||
if (isBroadcast) {
|
||||
button2.setVisibility(View.GONE);
|
||||
} else {
|
||||
button2.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
if (getParentActivity() == null) {
|
||||
return;
|
||||
}
|
||||
});
|
||||
showAlertDialog(builder);
|
||||
}
|
||||
});
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
|
||||
|
||||
CharSequence[] items;
|
||||
|
||||
if (avatar != null) {
|
||||
items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)};
|
||||
} else {
|
||||
items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)};
|
||||
}
|
||||
|
||||
builder.setItems(items, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
if (i == 0) {
|
||||
avatarUpdater.openCamera();
|
||||
} else if (i == 1) {
|
||||
avatarUpdater.openGallery();
|
||||
} else if (i == 2) {
|
||||
avatar = null;
|
||||
uploadedAvatar = null;
|
||||
avatarImage.setImage(avatar, "50_50", R.drawable.group_blue);
|
||||
}
|
||||
}
|
||||
});
|
||||
showAlertDialog(builder);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image);
|
||||
avatarImage.setImageResource(R.drawable.group_blue);
|
||||
|
||||
nameTextView = (EditText)fragmentView.findViewById(R.id.bubble_input_text);
|
||||
nameTextView.setHint(LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder));
|
||||
if (isBroadcast) {
|
||||
nameTextView.setHint(LocaleController.getString("EnterListName", R.string.EnterListName));
|
||||
} else {
|
||||
nameTextView.setHint(LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder));
|
||||
}
|
||||
if (nameToSet != null) {
|
||||
nameTextView.setText(nameToSet);
|
||||
nameToSet = null;
|
||||
|
|
@ -237,7 +255,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
|
|||
avatarImage.setImage(avatar, "50_50", R.drawable.group_blue);
|
||||
if (createAfterUpload) {
|
||||
FileLog.e("tmessages", "avatar did uploaded");
|
||||
MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar);
|
||||
MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, uploadedAvatar, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -458,7 +458,12 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
|
|||
args.putInt("chat_id", -lower_part);
|
||||
}
|
||||
} 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);
|
||||
presentFragment(fragment, true);
|
||||
|
|
|
|||
|
|
@ -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_contacts = 4;
|
||||
private final static int messages_list_menu_settings = 5;
|
||||
private final static int messages_list_menu_new_broadcast = 6;
|
||||
|
||||
public static interface MessagesActivityDelegate {
|
||||
public abstract void didSelectDialog(MessagesActivity fragment, long dialog_id, boolean param);
|
||||
|
|
@ -175,6 +176,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
|
|||
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_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_settings, LocaleController.getString("Settings", R.string.Settings), 0);
|
||||
}
|
||||
|
|
@ -206,6 +208,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
|
|||
if (onlySelect) {
|
||||
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
|
|||
args.putInt("chat_id", -lower_part);
|
||||
}
|
||||
} 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));
|
||||
}
|
||||
|
|
@ -497,13 +508,21 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
|
|||
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
|
||||
}
|
||||
} else {
|
||||
int chat_id = (int)(dialog_id >> 32);
|
||||
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(chat_id);
|
||||
TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
|
||||
if (user == null) {
|
||||
return;
|
||||
int high_id = (int)(dialog_id >> 32);
|
||||
if (high_id > 0) {
|
||||
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(high_id);
|
||||
TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
|
||||
if (user == null) {
|
||||
return;
|
||||
}
|
||||
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));
|
||||
}
|
||||
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
|
||||
}
|
||||
CheckBox checkBox = null;
|
||||
/*if (delegate instanceof ChatActivity) {
|
||||
|
|
|
|||
|
|
@ -874,9 +874,6 @@ public class PopupNotificationActivity extends Activity implements NotificationC
|
|||
chatActivityEnterView.setFieldFocused(false);
|
||||
}
|
||||
ConnectionsManager.getInstance().setAppPaused(true, false);
|
||||
if (wakeLock.isHeld()) {
|
||||
wakeLock.release();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -568,6 +568,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||
} catch (Exception 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);
|
||||
Bundle args = new Bundle();
|
||||
args.putInt("user_id", res.user.id);
|
||||
|
|
|
|||
|
|
@ -406,7 +406,8 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
|
|||
}
|
||||
|
||||
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();
|
||||
req.settings = new TLRPC.TL_inputPeerNotifySettings();
|
||||
req.settings.sound = "default";
|
||||
|
|
@ -425,7 +426,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
|
|||
public void run(TLObject response, TLRPC.TL_error error) {
|
||||
|
||||
}
|
||||
});
|
||||
});*/
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -467,18 +467,15 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
|
|||
List<Track> tracks = movie.getTracks();
|
||||
movie.setTracks(new LinkedList<Track>());
|
||||
|
||||
double startTime = videoTimelineView.getLeftProgress() * videoPlayer.getDuration() / 1000.0;
|
||||
double endTime = videoTimelineView.getRightProgress() * videoPlayer.getDuration() / 1000.0;
|
||||
double startTime = 0;
|
||||
double endTime = 0;
|
||||
|
||||
boolean timeCorrected = false;
|
||||
for (Track track : tracks) {
|
||||
if (track.getSyncSamples() != null && track.getSyncSamples().length > 0) {
|
||||
if (timeCorrected) {
|
||||
throw new RuntimeException("The startTime has already been corrected by another track with SyncSample. Not Supported.");
|
||||
}
|
||||
startTime = correctTimeToSyncSample(track, startTime, false);
|
||||
endTime = correctTimeToSyncSample(track, endTime, true);
|
||||
timeCorrected = true;
|
||||
double duration = (double)track.getDuration() / (double)track.getTrackMetaData().getTimescale();
|
||||
startTime = correctTimeToSyncSample(track, videoTimelineView.getLeftProgress() * duration, false);
|
||||
endTime = videoTimelineView.getRightProgress() * duration;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -486,7 +483,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
|
|||
long currentSample = 0;
|
||||
double currentTime = 0;
|
||||
double lastTime = 0;
|
||||
long startSample = -1;
|
||||
long startSample = 0;
|
||||
long endSample = -1;
|
||||
|
||||
for (int i = 0; i < track.getSampleDurations().length; i++) {
|
||||
|
|
@ -503,9 +500,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
|
|||
}
|
||||
movie.addTrack(new CroppedTrack(track, startSample, endSample));
|
||||
}
|
||||
long start1 = System.currentTimeMillis();
|
||||
Container out = new DefaultMp4Builder().build(movie);
|
||||
long start2 = System.currentTimeMillis();
|
||||
|
||||
String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4";
|
||||
UserConfig.lastLocalId--;
|
||||
|
|
@ -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) {
|
||||
double[] timeOfSyncSamples = new double[track.getSyncSamples().length];
|
||||
long currentSample = 0;
|
||||
|
|
|
|||
|
|
@ -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 int openFile(int[] metaData, String filePath);
|
||||
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 String getComment(int gifFileInPtr);
|
||||
private static native int getLoopCount(int gifFileInPtr);
|
||||
|
|
|
|||
|
|
@ -75,17 +75,20 @@ public class ImageReceiver {
|
|||
if (filter != null) {
|
||||
key += "@" + filter;
|
||||
}
|
||||
Bitmap img;
|
||||
Bitmap img = null;
|
||||
if (currentPath != null) {
|
||||
if (currentPath.equals(key)) {
|
||||
return;
|
||||
if (currentImage != null) {
|
||||
return;
|
||||
} else {
|
||||
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
|
||||
}
|
||||
} else {
|
||||
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true);
|
||||
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
|
||||
recycleBitmap(img);
|
||||
}
|
||||
} else {
|
||||
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true);
|
||||
}
|
||||
img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
|
||||
currentPath = key;
|
||||
last_path = path;
|
||||
last_httpUrl = httpUrl;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
* 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);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1018 B |
Binary file not shown.
|
Before Width: | Height: | Size: 806 B After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 805 B |
Binary file not shown.
|
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 857 B |
Binary file not shown.
|
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 591 B |
Binary file not shown.
|
Before Width: | Height: | Size: 785 B After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 793 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB |
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">الاسم مخفي</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-->
|
||||
<string name="SelectFile">اختر ملف</string>
|
||||
<string name="FreeOfTotal">متاح %1$s من %2$s</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Versteckter Name</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-->
|
||||
<string name="SelectFile">Datei auswählen</string>
|
||||
<string name="FreeOfTotal">Freier Speicher: %1$s von %2$s</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Nombre oculto</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-->
|
||||
<string name="SelectFile">Seleccionar archivo</string>
|
||||
<string name="FreeOfTotal">%1$s de %2$s libres</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Nome nascosto</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-->
|
||||
<string name="SelectFile">Seleziona file</string>
|
||||
<string name="FreeOfTotal">Liberi %1$s di %2$s</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Verborgen naam</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-->
|
||||
<string name="SelectFile">Kies een bestand</string>
|
||||
<string name="FreeOfTotal">Vrij: %1$s van %2$s</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Nome oculto</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-->
|
||||
<string name="SelectFile">Selecione um Arquivo</string>
|
||||
<string name="FreeOfTotal">Disponível %1$s de %2$s</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Nome oculto</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-->
|
||||
<string name="SelectFile">Selecionar ficheiro</string>
|
||||
<string name="FreeOfTotal">%1$s de %2$s livres</string>
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@
|
|||
<string name="HiddenName">Hidden Name</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-->
|
||||
<string name="SelectFile">Select File</string>
|
||||
<string name="FreeOfTotal">Free %1$s of %2$s</string>
|
||||
|
|
@ -150,7 +158,7 @@
|
|||
<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="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>
|
||||
|
||||
<!--contacts view-->
|
||||
|
|
@ -263,19 +271,19 @@
|
|||
<string name="Enabled">Enabled</string>
|
||||
<string name="Disabled">Disabled</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="ImportContacts">Import Contacts</string>
|
||||
<string name="WiFiOnly">Via WiFi only</string>
|
||||
<string name="SortFirstName">First name</string>
|
||||
<string name="SortLastName">Last name</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="OnlyWhenScreenOn">Only when screen "on"</string>
|
||||
<string name="OnlyWhenScreenOff">Only when screen "off"</string>
|
||||
<string name="AlwaysShowPopup">Always show popup</string>
|
||||
<string name="BadgeNumber">Badge Number</string>
|
||||
<string name="BadgeNumber">Badge Counter</string>
|
||||
|
||||
<!--media view-->
|
||||
<string name="NoMedia">No shared media yet</string>
|
||||
|
|
@ -362,8 +370,8 @@
|
|||
<string name="InvalidLastName">Invalid last name</string>
|
||||
<string name="Loading">Loading...</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="NoHandleAppInstalled">You don\'t have any application that can handle with mime type \'%1$s\', please install one to continue</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 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="AreYouSure">Are you sure?</string>
|
||||
<string name="AddContactQ">Add contact?</string>
|
||||
|
|
@ -371,15 +379,15 @@
|
|||
<string name="ForwardMessagesTo">Forward messages to %1$s?</string>
|
||||
<string name="DeleteChatQuestion">Delete this chat?</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="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="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="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="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>
|
||||
|
||||
<!--Intro view-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue