From 7326677be0e771f64ef9900a8f93fb281c87f4a7 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 18 Apr 2019 01:14:09 +0200 Subject: [PATCH] Revert "Update messenger-backend submodule." This reverts commit 2cf2505524f070de686f9f8926dfa16bf6093edb. --- .../securesms/ApplicationContext.java | 30 ---------------- .../securesms/BaseActionBarActivity.java | 34 ++----------------- .../securesms/ConversationListActivity.java | 23 ------------- .../PassphraseRequiredActionBarActivity.java | 26 ++++---------- .../securesms/mms/SignalGlideModule.java | 14 ++++---- 5 files changed, 16 insertions(+), 111 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index db7c5cbeb..9bd3f7bed 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -7,7 +7,6 @@ import android.arch.lifecycle.LifecycleOwner; import android.arch.lifecycle.ProcessLifecycleOwner; import android.content.Context; import android.support.annotation.NonNull; -import android.util.Log; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEventCenter; @@ -37,17 +36,10 @@ public class ApplicationContext extends Application implements DefaultLifecycleO return (ApplicationContext)context.getApplicationContext(); } - public static long startMillis; - @Override public void onCreate() { - - startMillis = System.currentTimeMillis(); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 1"); - super.onCreate(); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 2"); // if (LeakCanary.isInAnalyzerProcess(this)) { // // This process is dedicated to LeakCanary for heap analysis. // // You should not init your app in this process. @@ -58,32 +50,12 @@ public class ApplicationContext extends Application implements DefaultLifecycleO System.loadLibrary("native-utils"); dcContext = new ApplicationDcContext(this); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 3"); - initializeRandomNumberFix(); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 4"); - initializeLogging(); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 5"); - initializeJobManager(); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 6"); - initializeIncomingMessageNotifier(); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 7"); - ProcessLifecycleOwner.get().getLifecycle().addObserver(this); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 8"); - Mapbox.getInstance(getApplicationContext(), BuildConfig.MAP_ACCESS_TOKEN); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 9"); - dcLocationManager = new DcLocationManager(this); try { DynamicLanguage.setContextLocale(this, DynamicLanguage.getSelectedLocale(this)); @@ -91,8 +63,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO catch (Exception e) { e.printStackTrace(); } - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 10 - " + (System.currentTimeMillis() - startMillis) + "ms"); } @Override diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java index 13298743e..78952ea2b 100644 --- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java @@ -32,7 +32,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - Log.i("DeltaChat", "BaseActionBarActivity/onCreate"); if (BaseActivity.isMenuWorkaroundRequired()) { forceOverflowMenu(); } @@ -41,22 +40,17 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override protected void onStart() { - Log.i("DeltaChat", "BaseActionBarActivity/onStart"); - if (ScreenLockUtil.isScreenLockEnabled(this) && ScreenLockUtil.getShouldLockApp() && !isWaitingForResult) { + if (ScreenLockUtil.isScreenLockEnabled(this) && ScreenLockUtil.getShouldLockApp() && !isWaitingForResult) { ScreenLockUtil.applyScreenLock(this); } else if (isHiddenByScreenLock) { findViewById(android.R.id.content).setVisibility(View.VISIBLE); isHiddenByScreenLock = false; } - Log.i("DeltaChat", "BaseActionBarActivity/onStart/2"); super.onStart(); - Log.i("DeltaChat", "BaseActionBarActivity/onStart/3"); } @Override protected void onStop() { - Log.i("DeltaChat", "BaseActionBarActivity/onStop"); - if (ScreenLockUtil.isScreenLockEnabled(this)) { findViewById(android.R.id.content).setVisibility(View.GONE); isHiddenByScreenLock = true; @@ -66,8 +60,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.i("DeltaChat", "BaseActionBarActivity/onActivityResult"); - super.onActivityResult(requestCode, resultCode, data); + super.onActivityResult(requestCode, resultCode, data); isWaitingForResult = false; if (requestCode == ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS) { if (resultCode == RESULT_OK) { @@ -81,15 +74,12 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override protected void onResume() { - Log.i("DeltaChat", "BaseActionBarActivity/onResume"); super.onResume(); initializeScreenshotSecurity(); initializeScreenLockTimeout(); } private void initializeScreenLockTimeout() { - Log.i("DeltaChat", "BaseActionBarActivity/initializeScreenLockTimeout"); - if (ScreenLockUtil.isScreenLockTimeoutEnabled(this)) { timer = ScreenLockUtil.scheduleScreenLockTimer(timer, this); } @@ -97,37 +87,27 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override protected void onPause() { - Log.i("DeltaChat", "BaseActionBarActivity/onPause"); - - super.onPause(); + super.onPause(); tearDownScreenLockTimeout(); } private void tearDownScreenLockTimeout() { - Log.i("DeltaChat", "BaseActionBarActivity/tearDown..."); - ScreenLockUtil.cancelScreenLockTimer(timer); } @Override public void onUserInteraction() { - Log.i("DeltaChat", "BaseActionBarActivity/onUserInteraction"); - super.onUserInteraction(); initializeScreenLockTimeout(); } @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - Log.i("DeltaChat", "BaseActionBarActivity/onKeyDown"); - return (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event); } @Override public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) { - Log.i("DeltaChat", "BaseActionBarActivity/onKeyUp"); - if (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) { openOptionsMenu(); return true; @@ -136,8 +116,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { } private void initializeScreenshotSecurity() { - Log.i("DeltaChat", "BaseActionBarActivity/initializeScreenshotSecurity"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && Prefs.isScreenSecurityEnabled(this)) { @@ -151,8 +129,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { * Modified from: http://stackoverflow.com/a/13098824 */ private void forceOverflowMenu() { - Log.i("DeltaChat", "BaseActionBarActivity/forceOverflowMenu"); - try { ViewConfiguration config = ViewConfiguration.get(this); Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey"); @@ -168,8 +144,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { } protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) { - Log.i("DeltaChat", "BaseActionBarActivity/startActivitySceneTransition"); - Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName) .toBundle(); ActivityCompat.startActivity(this, intent, bundle); @@ -177,8 +151,6 @@ public abstract class BaseActionBarActivity extends AppCompatActivity { @Override public void startActivityForResult(Intent intent, int requestCode) { - Log.i("DeltaChat", "BaseActionBarActivity/startActivityForResult"); - super.startActivityForResult(intent, requestCode); if (requestCode != -1) { isWaitingForResult = true; diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 7e8f2d362..bf4e69f99 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -20,7 +20,6 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.support.v7.widget.TooltipCompat; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -59,51 +58,29 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit @Override protected void onPreCreate() { - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 11 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - - dynamicTheme.onCreate(this); dynamicLanguage.onCreate(this); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 12"); } @Override protected void onCreate(Bundle icicle, boolean ready) { - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 13 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - setContentView(R.layout.conversation_list_activity); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 14 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 15 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - searchToolbar = findViewById(R.id.search_toolbar); searchAction = findViewById(R.id.search_action); fragmentContainer = findViewById(R.id.fragment_container); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 16 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - conversationListFragment = initFragment(R.id.fragment_container, new ConversationListFragment(), dynamicLanguage.getCurrentLocale()); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 17 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - initializeSearchListener(); - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 18 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - TooltipCompat.setTooltipText(searchAction, getText(R.string.search_explain)); - - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 19 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); } @Override public void onResume() { - Log.i("DeltaChat", "////////////////////////////// STARTUPPPPP 20 - " + (System.currentTimeMillis() - ApplicationContext.startMillis) + "ms"); - super.onResume(); dynamicTheme.onResume(this); dynamicLanguage.onResume(this); diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 0c717f120..aa013fa5a 100644 --- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -22,7 +22,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA @Override protected final void onCreate(Bundle savedInstanceState) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onCreate"); + Log.w(TAG, "onCreate(" + savedInstanceState + ")"); onPreCreate(); routeApplicationState(); @@ -34,37 +34,30 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA } } - protected void onPreCreate() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onPreCreate"); - - } - protected void onCreate(Bundle savedInstanceState, boolean ready) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onCreate"); - - } + protected void onPreCreate() {} + protected void onCreate(Bundle savedInstanceState, boolean ready) {} @Override protected void onResume() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onResume"); + Log.w(TAG, "onResume()"); super.onResume(); } @Override protected void onPause() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onPause"); + Log.w(TAG, "onPause()"); super.onPause(); } @Override protected void onDestroy() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/onDestroy"); + Log.w(TAG, "onDestroy()"); super.onDestroy(); } protected T initFragment(@IdRes int target, @NonNull T fragment) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/initFragment"); return initFragment(target, fragment, null); } @@ -72,7 +65,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA @NonNull T fragment, @Nullable Locale locale) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/initFragment"); return initFragment(target, fragment, locale, null); } @@ -81,7 +73,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA @Nullable Locale locale, @Nullable Bundle extras) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/initFragment"); Bundle args = new Bundle(); args.putSerializable(LOCALE_EXTRA, locale); @@ -97,7 +88,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA } private void routeApplicationState() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/routeApplicationState"); Intent intent = getIntentForState(getApplicationState()); if (intent != null) { startActivity(intent); @@ -106,7 +96,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA } private Intent getIntentForState(int state) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/getIntentForState"); switch (state) { case STATE_NEEDS_CONFIGURE: return getWelcomeIntent(); default: return null; @@ -114,7 +103,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA } private int getApplicationState() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/getApplicationState"); boolean isConfigured = DcHelper.isConfigured(getApplicationContext()); if (!isConfigured) { return STATE_NEEDS_CONFIGURE; @@ -124,12 +112,10 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA } private Intent getWelcomeIntent() { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/getWelcomeIntent"); return getRoutedIntent(WelcomeActivity.class, null); } private Intent getRoutedIntent(Class destination, @Nullable Intent nextIntent) { - Log.i("DeltaChat", "PassphraseRequiredActionBarActivity/getRoutedIntent"); final Intent intent = new Intent(this, destination); if (nextIntent != null) intent.putExtra("next_intent", nextIntent); return intent; diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java index bc520173f..3b5c5c7e3 100644 --- a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java +++ b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java @@ -48,16 +48,16 @@ public class SignalGlideModule extends AppGlideModule { @Override public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) { - //AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(); - //byte[] secret = attachmentSecret.getModernKey(); + AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(); + byte[] secret = attachmentSecret.getModernKey(); registry.prepend(File.class, File.class, UnitModelLoader.Factory.getInstance()); - //registry.prepend(InputStream.class, new EncryptedCacheEncoder(secret, glide.getArrayPool())); - //registry.prepend(File.class, Bitmap.class, new EncryptedBitmapCacheDecoder(secret, new StreamBitmapDecoder(new Downsampler(registry.getImageHeaderParsers(), context.getResources().getDisplayMetrics(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); - //registry.prepend(File.class, GifDrawable.class, new EncryptedGifCacheDecoder(secret, new StreamGifDecoder(registry.getImageHeaderParsers(), new ByteBufferGifDecoder(context, registry.getImageHeaderParsers(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); + registry.prepend(InputStream.class, new EncryptedCacheEncoder(secret, glide.getArrayPool())); + registry.prepend(File.class, Bitmap.class, new EncryptedBitmapCacheDecoder(secret, new StreamBitmapDecoder(new Downsampler(registry.getImageHeaderParsers(), context.getResources().getDisplayMetrics(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); + registry.prepend(File.class, GifDrawable.class, new EncryptedGifCacheDecoder(secret, new StreamGifDecoder(registry.getImageHeaderParsers(), new ByteBufferGifDecoder(context, registry.getImageHeaderParsers(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); - //registry.prepend(Bitmap.class, new EncryptedBitmapResourceEncoder(secret)); - //registry.prepend(GifDrawable.class, new EncryptedGifDrawableResourceEncoder(secret)); + registry.prepend(Bitmap.class, new EncryptedBitmapResourceEncoder(secret)); + registry.prepend(GifDrawable.class, new EncryptedGifDrawableResourceEncoder(secret)); registry.append(ContactPhoto.class, InputStream.class, new ContactPhotoLoader.Factory(context)); registry.append(DecryptableUri.class, InputStream.class, new DecryptableStreamUriLoader.Factory(context));