diff --git a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java index 3e5157ade..263836b14 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java @@ -51,6 +51,7 @@ import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; import android.util.DisplayMetrics; +import android.util.Log; import android.util.StateSet; import android.view.Display; import android.view.Surface; @@ -301,11 +302,10 @@ public class AndroidUtilities { if (display != null) { display.getMetrics(displayMetrics); display.getSize(displaySize); - FileLog.e("messenger", "display size = " + displaySize.x + " " + displaySize.y + " " + displayMetrics.xdpi + "x" + displayMetrics.ydpi); + Log.i("DeltaChat", "Display size: " + displaySize.x + " x " + displaySize.y + ", DPI: " + displayMetrics.xdpi + " x " + displayMetrics.ydpi); } } } catch (Exception e) { - } } @@ -652,12 +652,12 @@ public class AndroidUtilities { storageDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), "Delta Chat"); if (!storageDir.mkdirs()) { if (!storageDir.exists()){ - FileLog.d("messenger", "failed to create directory"); + Log.w("DeltaChat", "failed to create directory"); return null; } } } else { - FileLog.d("messenger", "External storage is not mounted READ/WRITE."); + Log.w("DeltaChat", "External storage is not mounted READ/WRITE."); } return storageDir; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java index 4873e3836..fa7b6c20b 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java @@ -195,7 +195,7 @@ public class ApplicationLoader extends Application { try { PowerManager pm = (PowerManager)ApplicationLoader.applicationContext.getSystemService(Context.POWER_SERVICE); isScreenOn = pm.isScreenOn(); - FileLog.e("messenger", "screen state = " + isScreenOn); + //Log.i("DeltaChat", "screen state = " + isScreenOn); } catch (Exception e) { } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/Emoji.java b/MessengerProj/src/main/java/com/b44t/messenger/Emoji.java index 07feb3f09..a5797adb8 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/Emoji.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/Emoji.java @@ -158,7 +158,7 @@ public class Emoji { } }); } catch (Throwable x) { - FileLog.e("messenger", "Error loading emoji", x); + //Log.i("DeltaChat", "Error loading emoji", x); } } @@ -209,7 +209,7 @@ public class Emoji { public static EmojiDrawable getEmojiDrawable(CharSequence code) { DrawableInfo info = rects.get(code); if (info == null) { - FileLog.e("messenger", "No drawable for emoji " + code); + //Log.i("DeltaChat", "No drawable for emoji " + code); return null; } EmojiDrawable ed = new EmojiDrawable(info); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java index 217ec9a28..3158d3b40 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java @@ -37,6 +37,7 @@ import android.media.ThumbnailUtils; import android.net.Uri; import android.os.Build; import android.provider.MediaStore; +import android.util.Log; import com.b44t.ui.Components.AnimatedFileDrawable; @@ -752,7 +753,7 @@ public class ImageLoader { BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context arg0, Intent intent) { - FileLog.e("messenger", "file system changed"); + Log.i("DeltaChat", "file system changed"); Runnable r = new Runnable() { public void run() { checkMediaPaths(); @@ -1261,7 +1262,6 @@ public class ImageLoader { } } } catch (Throwable e2) { - FileLog.e("messenger", e2); } } } else if (uri != null) { @@ -1392,7 +1392,6 @@ public class ImageLoader { try { return scaleAndSaveImageInternal(cacheFile, bitmap, w, h, photoW, photoH, scaleFactor, quality, cache, scaleAnyway); } catch (Throwable e2) { - FileLog.e("messenger", e2); return null; } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java index 4d4fe4457..4fabf138c 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java @@ -182,7 +182,7 @@ public class LocaleController { } applyLanguage(currentInfo, override); } catch (Exception e) { - + } try { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java index b6a8b2074..ed9c4dda3 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java @@ -504,7 +504,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, linearSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION); gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY); if (linearSensor == null || gravitySensor == null) { - FileLog.e("messenger", "gravity or linear sensor not found"); + //Log.i("DeltaChat", "gravity or linear sensor not found"); accelerometerSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); linearSensor = null; gravitySensor = null; @@ -931,7 +931,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, return; } if (event.sensor == proximitySensor) { - FileLog.e("messenger", "proximity changed to " + event.values[0]); + //Log.i("DeltaChat", "proximity changed to " + event.values[0]); if (lastProximityValue == -100) { lastProximityValue = event.values[0]; } else if (lastProximityValue != event.values[0]) { @@ -996,7 +996,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, raisedToTop = 0; countLess = 0; timeSinceRaise = System.currentTimeMillis(); - //FileLog.e("messenger", "motion detected"); + //Log.i("DeltaChat", "motion detected"); } } } else { @@ -1013,13 +1013,13 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } previousAccValue = val; accelerometerVertical = gravityFast[1] > 2.5f && Math.abs(gravityFast[2]) < 4.0f && /*Math.abs(gravityFast[0]) < 9.0f &&*/ Math.abs(gravityFast[0]) > 1.5f; - //FileLog.e("messenger", accelerometerVertical + " val = " + val + " acc (" + linearAcceleration[0] + ", " + linearAcceleration[1] + ", " + linearAcceleration[2] + ") grav (" + gravityFast[0] + ", " + gravityFast[1] + ", " + gravityFast[2] + ")"); + //Log.i("DeltaChat", accelerometerVertical + " val = " + val + " acc (" + linearAcceleration[0] + ", " + linearAcceleration[1] + ", " + linearAcceleration[2] + ") grav (" + gravityFast[0] + ", " + gravityFast[1] + ", " + gravityFast[2] + ")"); } if (raisedToBack == minCount && accelerometerVertical && proximityTouched && !NotificationsController.getInstance().audioManager.isWiredHeadsetOn()) { - FileLog.e("messenger", "sensor values reached"); + //Log.i("DeltaChat", "sensor values reached"); if (playingMessageObject == null && recordStartRunnable == null && recordingAudio == null && !PhotoViewer.getInstance().isVisible() && ApplicationLoader.isScreenOn && !inputFieldHasText && allowStartRecord && raiseChat != null && !callInProgress) { if (!raiseToEarRecord) { - FileLog.e("messenger", "start record"); + //Log.i("DeltaChat", "start record"); useFrontSpeaker = true; if (!raiseChat.playFirstUnreadVoiceMessage() /*if there is nothing to play, the function checks for record permission*/ ) { raiseToEarRecord = true; @@ -1033,7 +1033,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } } /*else if (playingMessageObject != null && playingMessageObject.isVoice()) { if (!useFrontSpeaker) { - FileLog.e("messenger", "start listen"); + //Log.i("DeltaChat", "start listen"); if (proximityHasDifferentValues && proximityWakeLock != null && !proximityWakeLock.isHeld()) { proximityWakeLock.acquire(); } @@ -1048,7 +1048,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } else if (proximityTouched) { /*if (playingMessageObject != null && playingMessageObject.isVoice()) { if (!useFrontSpeaker) { - FileLog.e("messenger", "start listen by proximity only"); + //Log.i("DeltaChat", "start listen by proximity only"); if (proximityHasDifferentValues && proximityWakeLock != null && !proximityWakeLock.isHeld()) { proximityWakeLock.acquire(); } @@ -1059,7 +1059,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, }*/ } else if (!proximityTouched) { if (raiseToEarRecord) { - FileLog.e("messenger", "stop record"); + //Log.i("DeltaChat", "stop record"); stopRecording(2); raiseToEarRecord = false; ignoreOnPause = false; @@ -1067,7 +1067,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, proximityWakeLock.release(); } } else if (useFrontSpeaker) { - FileLog.e("messenger", "stop listen"); + //Log.i("DeltaChat", "stop listen"); useFrontSpeaker = false; startAudioAgain(true); ignoreOnPause = false; @@ -1526,7 +1526,6 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, playingMessageObject.audioProgress = 0; playingMessageObject.audioProgressSec = 0; NotificationCenter.getInstance().postNotificationName(NotificationCenter.audioProgressDidChanged, playingMessageObject.getId(), 0); - FileLog.e("messenger", e2); } } else if (audioTrackPlayer != null) { if (playingMessageObject.audioProgress == 1) { @@ -1730,7 +1729,6 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, audioRecorder.release(); audioRecorder = null; } catch (Exception e2) { - FileLog.e("messenger", e2); } AndroidUtilities.runOnUIThread(new Runnable() { @@ -1921,7 +1919,6 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, inputStream.close(); } } catch (Exception e2) { - FileLog.e("messenger", e2); } } return false; @@ -1946,7 +1943,6 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, inputStream.close(); } } catch (Exception e2) { - FileLog.e("messenger", e2); } } return false; @@ -2007,14 +2003,12 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, inputStream.close(); } } catch (Exception e2) { - FileLog.e("messenger", e2); } try { if (output != null) { output.close(); } } catch (Exception e2) { - FileLog.e("messenger", e2); } } return null; @@ -2569,11 +2563,11 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } else if (codecName.equals("OMX.TI.DUCATI1.VIDEO.H264E")) { processorType = PROCESSOR_TYPE_TI; } - FileLog.e("messenger", "codec = " + codecInfo.getName() + " manufacturer = " + manufacturer + "device = " + Build.MODEL); + //Log.i("DeltaChat", "codec = " + codecInfo.getName() + " manufacturer = " + manufacturer + "device = " + Build.MODEL); } else { colorFormat = MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface; } - FileLog.e("messenger", "colorFormat = " + colorFormat); + //Log.i("DeltaChat", "colorFormat = " + colorFormat); int resultHeightAligned = resultHeight; int padding = 0; @@ -2765,7 +2759,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } else if (decoderStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) { MediaFormat newFormat = decoder.getOutputFormat(); - FileLog.e("messenger", "newFormat = " + newFormat); + //Log.i("DeltaChat", "newFormat = " + newFormat); } else if (decoderStatus < 0) { throw new RuntimeException("unexpected result from decoder.dequeueOutputBuffer: " + decoderStatus); } else { @@ -2784,7 +2778,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, if (startTime > 0 && videoTime == -1) { if (info.presentationTimeUs < startTime) { doRender = false; - FileLog.e("messenger", "drop frame startTime = " + startTime + " present time = " + info.presentationTimeUs); + //Log.i("DeltaChat", "drop frame startTime = " + startTime + " present time = " + info.presentationTimeUs); } else { videoTime = info.presentationTimeUs; } @@ -2813,14 +2807,14 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, Utilities.convertVideoFrame(rgbBuf, yuvBuf, colorFormat, resultWidth, resultHeight, padding, swapUV); encoder.queueInputBuffer(inputBufIndex, 0, bufferSize, info.presentationTimeUs, 0); } else { - FileLog.e("messenger", "input buffer not available"); + //Log.i("DeltaChat", "input buffer not available"); } } } } if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) { decoderOutputAvailable = false; - FileLog.e("messenger", "decoder stream end"); + //Log.i("DeltaChat", "decoder stream end"); if (Build.VERSION.SDK_INT >= 18) { encoder.signalEndOfInputStream(); } else { @@ -2884,7 +2878,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } } - FileLog.e("messenger", "time = " + (System.currentTimeMillis() - time)); + //Log.i("DeltaChat", "time = " + (System.currentTimeMillis() - time)); } } else { preferences.edit().putBoolean("isPreviousOk", true).apply(); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java index 0561ac46e..87a207da6 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java @@ -159,7 +159,7 @@ public class NotificationCenter { DelayedPost delayedPost = new DelayedPost(id, args); delayedPosts.add(delayedPost); if (BuildVars.DEBUG_VERSION) { - FileLog.e("messenger", "delay post notification " + id + " with args count = " + args.length); + //Log.i("DeltaChat", "delay post notification " + id + " with args count = " + args.length); } return; } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java index 04683aba4..b75ebc2ec 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java @@ -132,7 +132,7 @@ public class NotificationsController { notificationDelayRunnable = new Runnable() { @Override public void run() { - FileLog.e("messenger", "delay reached"); + //Log.i("DeltaChat", "delay reached"); if (!delayedPushMessages.isEmpty()) { showOrUpdateNotification(true); delayedPushMessages.clear(); @@ -936,7 +936,7 @@ public class NotificationsController { /*private void scheduleNotificationDelay(boolean onlineReason) { try { - FileLog.e("messenger", "delay notification start, onlineReason = " + onlineReason); + //Log.i("DeltaChat", "delay notification start, onlineReason = " + onlineReason); notificationDelayWakelock.acquire(10000); AndroidUtilities.cancelRunOnUIThread(notificationDelayRunnable); AndroidUtilities.runOnUIThread(notificationDelayRunnable, (onlineReason ? 3 * 1000 : 1000)); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/browser/Browser.java b/MessengerProj/src/main/java/com/b44t/messenger/browser/Browser.java index c5297561c..0d9f4137a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/browser/Browser.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/browser/Browser.java @@ -28,7 +28,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import com.b44t.messenger.FileLog; import com.b44t.ui.LaunchActivity; public class Browser { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/support/widget/RecyclerView.java b/MessengerProj/src/main/java/com/b44t/messenger/support/widget/RecyclerView.java index aeea63b9b..85748d59b 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/support/widget/RecyclerView.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/support/widget/RecyclerView.java @@ -47,7 +47,6 @@ import android.support.v4.view.accessibility.AccessibilityRecordCompat; import android.support.v4.widget.EdgeEffectCompat; import android.support.v4.widget.ScrollerCompat; -import com.b44t.messenger.FileLog; import com.b44t.messenger.support.widget.RecyclerView.ItemAnimator.ItemHolderInfo; import android.util.AttributeSet; import android.util.Log; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarPopupWindow.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarPopupWindow.java index a048949fb..6d03bc9cd 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarPopupWindow.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarPopupWindow.java @@ -43,7 +43,6 @@ import android.widget.PopupWindow; import android.widget.ScrollView; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java index fad0c797b..401b3aefc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java @@ -34,7 +34,6 @@ import android.view.View; import android.view.ViewGroup; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; public class BaseFragment { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BottomSheet.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BottomSheet.java index 962cbd5a0..f05e368d0 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BottomSheet.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BottomSheet.java @@ -59,7 +59,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.AnimatorListenerAdapterProxy; import com.b44t.messenger.LocaleController; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/DrawerLayoutContainer.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/DrawerLayoutContainer.java index 314192d18..d316dea71 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/DrawerLayoutContainer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/DrawerLayoutContainer.java @@ -44,7 +44,6 @@ import android.widget.FrameLayout; import android.widget.ListView; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.AnimatorListenerAdapterProxy; @@ -407,7 +406,7 @@ public class DrawerLayoutContainer extends FrameLayout { if (!inLayout) { /*StackTraceElement[] elements = Thread.currentThread().getStackTrace(); for (int a = 0; a < elements.length; a++) { - FileLog.d("messenger", "on " + elements[a]); + Log.d("DeltaChat", "on " + elements[a]); }*/ super.requestLayout(); } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java index 1ca066fc3..1269ce0cd 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java @@ -29,7 +29,6 @@ import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.Utilities; import com.b44t.messenger.support.widget.RecyclerView; diff --git a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java index 675d55f22..27cc1b082 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java @@ -40,10 +40,8 @@ import com.b44t.messenger.MrContact; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.TLRPC; -import com.b44t.messenger.UserConfig; import com.b44t.messenger.Utilities; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.BaseFragment; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java index 568be926a..e3a8cab29 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java @@ -35,7 +35,6 @@ import android.view.MotionEvent; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.MessageObject; -import com.b44t.messenger.FileLog; import com.b44t.ui.ActionBar.Theme; public class ChatActionCell extends BaseCell { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java index c889cb647..add4e6350 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -51,7 +51,6 @@ import com.b44t.messenger.ImageReceiver; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MediaController; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.MessageObject; import com.b44t.messenger.MrChat; import com.b44t.messenger.MrContact; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java index 57503dc83..de5abee81 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java @@ -40,7 +40,6 @@ import android.view.View; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.Emoji; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.ImageLoader; import com.b44t.messenger.ImageReceiver; import com.b44t.messenger.LocaleController; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java index af99b347c..b58a10a9d 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java @@ -44,7 +44,6 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.MessageObject; import com.b44t.messenger.MrChat; import com.b44t.messenger.MrMailbox; -import com.b44t.messenger.FileLog; import com.b44t.messenger.MrMsg; import com.b44t.messenger.MrPoortext; import com.b44t.messenger.TLRPC; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerActionCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerActionCell.java index 2bb9e91c3..79b4cf699 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerActionCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerActionCell.java @@ -30,7 +30,6 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.ui.Components.LayoutHelper; public class DrawerActionCell extends FrameLayout { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java index e10cfe77a..093b7a3eb 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java @@ -45,9 +45,7 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; -import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.LayoutHelper; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 9930162e9..25c9640a6 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -74,7 +74,6 @@ import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.TLRPC; -import com.b44t.messenger.FileLog; import com.b44t.messenger.MessageObject; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; @@ -1731,7 +1730,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not m_mrChat.cleanDraft(); */ } else if (requestCode == RC2_CHAT_VIDEO_CAPTURE) { String videoPath = null; - FileLog.d("messenger", "pic path " + currentPicturePath); + //Log.i("DeltaChat", "pic path " + currentPicturePath); if (data != null && currentPicturePath != null) { if (new File(currentPicturePath).exists()) { data = null; @@ -1740,9 +1739,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (data != null) { Uri uri = data.getData(); if (uri != null) { - FileLog.d("messenger", "video record uri " + uri.toString()); + //Log.i("DeltaChat", "video record uri " + uri.toString()); videoPath = AndroidUtilities.getPath(uri); - FileLog.d("messenger", "resolved path = " + videoPath); + //Log.i("DeltaChat", "resolved path = " + videoPath); if (!(new File(videoPath).exists())) { videoPath = currentPicturePath; } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/AnimatedFileDrawable.java b/MessengerProj/src/main/java/com/b44t/ui/Components/AnimatedFileDrawable.java index e631f6f76..0a3077ff3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/AnimatedFileDrawable.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/AnimatedFileDrawable.java @@ -39,7 +39,6 @@ import android.os.Looper; import android.view.View; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import java.io.File; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java index d21975a30..60a1ceea9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java @@ -35,7 +35,6 @@ import android.text.StaticLayout; import android.text.TextPaint; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.TLRPC; import com.b44t.messenger.ApplicationLoader; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java index 671176ed8..36716cbd6 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java @@ -39,7 +39,6 @@ import com.b44t.messenger.ImageLoader; import com.b44t.messenger.MediaController; import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.UserConfig; import com.b44t.ui.LaunchActivity; import com.b44t.ui.PhotoAlbumPickerActivity; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index ef70bf99c..90e16ffe2 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -68,7 +68,6 @@ import com.b44t.messenger.MessageObject; import com.b44t.messenger.MrContact; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.SendMessagesHelper; -import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.TLRPC; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java index 47b821164..f67d2290e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java @@ -49,7 +49,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MediaController; import com.b44t.messenger.MessageObject; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ClippingImageView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ClippingImageView.java index 6f491cd83..e410e9cbd 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ClippingImageView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ClippingImageView.java @@ -33,8 +33,6 @@ import android.graphics.RectF; import android.graphics.Shader; import android.view.View; -import com.b44t.messenger.FileLog; - public class ClippingImageView extends View { private int clipBottom; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java index b1896da87..d6a46effc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java @@ -62,7 +62,6 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.MediaController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.Utilities; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.support.widget.GridLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ForegroundDetector.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ForegroundDetector.java index 0dc84e33c..ebb9c0c23 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ForegroundDetector.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ForegroundDetector.java @@ -29,8 +29,6 @@ import android.app.Application; import android.os.Build; import android.os.Bundle; -import com.b44t.messenger.FileLog; - import java.util.concurrent.CopyOnWriteArrayList; @SuppressLint("NewApi") @@ -78,7 +76,7 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback if (System.currentTimeMillis() - enterBackgroundTime < 200) { wasInBackground = false; } - FileLog.e("messenger", "switch to foreground"); + //Log.i("DeltaChat", "switch to foreground"); for (Listener listener : listeners) { try { listener.onBecameForeground(); @@ -105,7 +103,7 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback if (--refs == 0) { enterBackgroundTime = System.currentTimeMillis(); wasInBackground = true; - FileLog.e("messenger", "switch to background"); + //Log.i("DeltaChat", "switch to background"); for (Listener listener : listeners) { try { listener.onBecameBackground(); diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/LetterDrawable.java b/MessengerProj/src/main/java/com/b44t/ui/Components/LetterDrawable.java index 0cc6c3121..8fa5c1259 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/LetterDrawable.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/LetterDrawable.java @@ -34,7 +34,6 @@ import android.text.StaticLayout; import android.text.TextPaint; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; public class LetterDrawable extends Drawable { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/PasscodeView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/PasscodeView.java index 2eb10db37..c26a9fc93 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/PasscodeView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/PasscodeView.java @@ -64,7 +64,6 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.UserConfig; import com.b44t.messenger.AnimatorListenerAdapterProxy; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoCropView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoCropView.java index b20acb212..556272699 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoCropView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoCropView.java @@ -33,7 +33,6 @@ import android.view.MotionEvent; import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; public class PhotoCropView extends FrameLayout { @@ -560,12 +559,10 @@ public class PhotoCropView extends FrameLayout { try { return createBitmap(x, y, sizeX, sizeY); } catch (Throwable e) { - FileLog.e("tmessags", e); System.gc(); try { return createBitmap(x, y, sizeX, sizeY); } catch (Throwable e2) { - FileLog.e("messenger", e2); } } return null; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoFilterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoFilterView.java index 3db9021d0..f683d2173 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoFilterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/PhotoFilterView.java @@ -52,7 +52,6 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.DispatchQueue; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.Utilities; import com.b44t.messenger.AnimatorListenerAdapterProxy; @@ -1211,7 +1210,7 @@ public class PhotoFilterView extends FrameLayout { int[] compileStatus = new int[1]; GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compileStatus, 0); if (compileStatus[0] == 0) { - FileLog.e("messenger", GLES20.glGetShaderInfoLog(shader)); + //Log.i("DeltaChat", GLES20.glGetShaderInfoLog(shader)); GLES20.glDeleteShader(shader); shader = 0; } @@ -1223,14 +1222,14 @@ public class PhotoFilterView extends FrameLayout { eglDisplay = egl10.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY); if (eglDisplay == EGL10.EGL_NO_DISPLAY) { - FileLog.e("messenger", "eglGetDisplay failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglGetDisplay failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } int[] version = new int[2]; if (!egl10.eglInitialize(eglDisplay, version)) { - FileLog.e("messenger", "eglInitialize failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglInitialize failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } @@ -1248,13 +1247,13 @@ public class PhotoFilterView extends FrameLayout { EGL10.EGL_NONE }; if (!egl10.eglChooseConfig(eglDisplay, configSpec, configs, 1, configsCount)) { - FileLog.e("messenger", "eglChooseConfig failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglChooseConfig failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } else if (configsCount[0] > 0) { eglConfig = configs[0]; } else { - FileLog.e("messenger", "eglConfig not initialized"); + //Log.i("DeltaChat", "eglConfig not initialized"); finish(); return false; } @@ -1262,7 +1261,7 @@ public class PhotoFilterView extends FrameLayout { int[] attrib_list = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE }; eglContext = egl10.eglCreateContext(eglDisplay, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list); if (eglContext == null) { - FileLog.e("messenger", "eglCreateContext failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglCreateContext failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } @@ -1275,12 +1274,12 @@ public class PhotoFilterView extends FrameLayout { } if (eglSurface == null || eglSurface == EGL10.EGL_NO_SURFACE) { - FileLog.e("messenger", "createWindowSurface failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "createWindowSurface failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } if (!egl10.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext)) { - FileLog.e("messenger", "eglMakeCurrent failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglMakeCurrent failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); finish(); return false; } @@ -1342,7 +1341,7 @@ public class PhotoFilterView extends FrameLayout { GLES20.glGetProgramiv(toolsShaderProgram, GLES20.GL_LINK_STATUS, linkStatus, 0); if (linkStatus[0] == 0) { /*String infoLog = GLES20.glGetProgramInfoLog(toolsShaderProgram); - FileLog.e("messenger", "link error = " + infoLog);*/ + Log.w("DeltaChat", "link error = " + infoLog);*/ GLES20.glDeleteProgram(toolsShaderProgram); toolsShaderProgram = 0; } else { @@ -1825,7 +1824,7 @@ public class PhotoFilterView extends FrameLayout { if (!eglContext.equals(egl10.eglGetCurrentContext()) || !eglSurface.equals(egl10.eglGetCurrentSurface(EGL10.EGL_DRAW))) { if (!egl10.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext)) { - FileLog.e("messenger", "eglMakeCurrent failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); + //Log.i("DeltaChat", "eglMakeCurrent failed " + GLUtils.getEGLErrorString(egl10.eglGetError())); return; } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/RadioButton.java b/MessengerProj/src/main/java/com/b44t/ui/Components/RadioButton.java index 1b243f18f..ab192ab18 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/RadioButton.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/RadioButton.java @@ -34,7 +34,6 @@ import android.graphics.PorterDuffXfermode; import android.view.View; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.ui.ActionBar.Theme; public class RadioButton extends View { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/RecyclerListView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/RecyclerListView.java index acf4b8d5c..b69afab6c 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/RecyclerListView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/RecyclerListView.java @@ -35,7 +35,6 @@ import android.view.ViewGroup; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.messenger.FileLog; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/SizeNotifierFrameLayout.java b/MessengerProj/src/main/java/com/b44t/ui/Components/SizeNotifierFrameLayout.java index 000990b45..7fa1c4421 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/SizeNotifierFrameLayout.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/SizeNotifierFrameLayout.java @@ -32,7 +32,6 @@ import android.view.View; import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; public class SizeNotifierFrameLayout extends FrameLayout { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/StaticLayoutEx.java b/MessengerProj/src/main/java/com/b44t/ui/Components/StaticLayoutEx.java index c512bab25..c1c1a582c 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/StaticLayoutEx.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/StaticLayoutEx.java @@ -32,8 +32,6 @@ import android.text.TextDirectionHeuristics; import android.text.TextPaint; import android.text.TextUtils; -import com.b44t.messenger.FileLog; - import java.lang.reflect.Constructor; public class StaticLayoutEx { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/VideoTimelineView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/VideoTimelineView.java index ef67f8d0b..31c4603b9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/VideoTimelineView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/VideoTimelineView.java @@ -37,7 +37,6 @@ import android.view.MotionEvent; import android.view.View; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java index c198ea56f..ada54e333 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java @@ -62,7 +62,6 @@ import com.b44t.messenger.MrContact; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.Utilities; import com.b44t.messenger.TLRPC; -import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.ui.Adapters.ContactsAdapter; diff --git a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java index bbb563f59..bfd4e864a 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java @@ -58,7 +58,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.ImageLoader; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrChat; diff --git a/MessengerProj/src/main/java/com/b44t/ui/DocumentSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/DocumentSelectActivity.java index 9e4336c55..791414481 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/DocumentSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/DocumentSelectActivity.java @@ -45,7 +45,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; import com.b44t.ui.ActionBar.BackDrawable; @@ -529,7 +528,7 @@ public class DocumentSelectActivity extends BaseFragment { String line; while ((line = bufferedReader.readLine()) != null) { if (line.contains("vfat") || line.contains("/mnt")) { - FileLog.e("messenger", line); + //Log.i("DeltaChat", line); StringTokenizer tokens = new StringTokenizer(line, " "); String unused = tokens.nextToken(); String path = tokens.nextToken(); diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java index 3445eff51..a96549ef7 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java @@ -303,7 +303,6 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati avatar = small.location; avatarImage.setImage(avatar, "50_50", avatarDrawable); if (createAfterUpload) { - FileLog.e("messenger", "avatar did uploaded"); MessagesController.getInstance().createChat(nameTextView.getText().toString(), selectedContacts, null, chatType, GroupCreateFinalActivity.this); } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java index 3648e8af1..e88c5a3fc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java @@ -38,7 +38,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; import com.b44t.messenger.Utilities; diff --git a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java index f285cabe1..127290006 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java @@ -65,7 +65,6 @@ import com.b44t.messenger.MrChat; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.SendMessagesHelper; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; @@ -304,7 +303,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa intent.putExtra(Intent.EXTRA_TEXT, MrMailbox.getInviteText()); startActivity(Intent.createChooser(intent, LocaleController.getString("InviteMenuEntry", R.string.InviteMenuEntry))); } catch (Exception e) { - FileLog.e("tmessages", e); } drawerLayoutContainer.closeDrawer(false); } @@ -421,7 +419,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa int height = view.getMeasuredHeight(); if (height > AndroidUtilities.dp(100) && height < AndroidUtilities.displaySize.y && height + AndroidUtilities.dp(100) > AndroidUtilities.displaySize.y) { AndroidUtilities.displaySize.y = height; - FileLog.e("messenger", "fix display size y to " + AndroidUtilities.displaySize.y); + Log.w("DeltaChat", "fix display size y to " + AndroidUtilities.displaySize.y); } } }); @@ -513,7 +511,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream, "UTF-8")); String line; while ((line = bufferedReader.readLine()) != null) { - FileLog.e("messenger", line); String[] args = line.split(":"); if (args.length != 2) { continue; @@ -1295,10 +1292,10 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa public void run() { if (lockRunnable == this) { if (AndroidUtilities.needShowPasscode(true)) { - FileLog.e("messenger", "lock app"); + //Log.i("DeltaChat", "lock app"); showPasscodeActivity(); } else { - FileLog.e("messenger", "didn't pass lock check"); + //Log.i("DeltaChat", "didn't pass lock check"); } lockRunnable = null; } diff --git a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java index 4aec68f49..be90caed0 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java @@ -59,7 +59,6 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.UserConfig; import com.b44t.messenger.Utilities; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoCropActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoCropActivity.java index 41c9e6916..70d75f62a 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoCropActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoCropActivity.java @@ -37,7 +37,6 @@ import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.Bitmaps; import com.b44t.messenger.ImageLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; import com.b44t.ui.ActionBar.ActionBar; @@ -323,12 +322,10 @@ public class PhotoCropActivity extends BaseFragment { try { return Bitmaps.createBitmap(imageToCrop, x, y, sizeX, sizeY); } catch (Throwable e) { - FileLog.e("tmessags", e); System.gc(); try { return Bitmaps.createBitmap(imageToCrop, x, y, sizeX, sizeY); } catch (Throwable e2) { - FileLog.e("messenger", e2); } } return null; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java index 376784e6e..9497c9be7 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java @@ -67,7 +67,6 @@ import com.b44t.messenger.MrContact; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MediaController; import com.b44t.messenger.NotificationCenter; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java index 06db8a369..7c73848be 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java @@ -64,7 +64,6 @@ import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.TLRPC; -import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.MessageObject; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index bd19d0034..c01c75b10 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -49,11 +49,9 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.MrChat; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; -import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Adapters.BaseFragmentAdapter; import com.b44t.ui.Cells.HeaderCell; import com.b44t.ui.Cells.TextColorCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java index 67a0e492d..d7be446be 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java @@ -46,7 +46,6 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationsController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.ui.Adapters.BaseFragmentAdapter; import com.b44t.ui.Cells.HeaderCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java b/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java index 8f5f4ded8..2519a7150 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java @@ -40,7 +40,6 @@ import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ImageReceiver; -import com.b44t.messenger.FileLog; import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.ContextLinkCell; import com.b44t.ui.Cells.StickerCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/VideoEditorActivity.java b/MessengerProj/src/main/java/com/b44t/ui/VideoEditorActivity.java index b682cc8a3..d767992dc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/VideoEditorActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/VideoEditorActivity.java @@ -55,7 +55,6 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.MediaController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.ActionBarMenu; diff --git a/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java b/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java index 752bbda02..2650688d1 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java @@ -59,7 +59,6 @@ import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R;