From f8affc698e01704e784a91d787d5619250d7e2bd Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 26 Nov 2018 02:08:43 +0100 Subject: [PATCH] remove dependencies from KeyCachingService --- .../ApplicationPreferencesActivity.java | 4 --- .../securesms/ConversationActivity.java | 17 ------------- .../securesms/ConversationListActivity.java | 7 ------ .../PassphraseRequiredActionBarActivity.java | 23 ----------------- .../securesms/crypto/SecurityEvent.java | 25 ------------------- .../service/PanicResponderListener.java | 7 +++--- 6 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/crypto/SecurityEvent.java diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index ae84315e2..0789c8295 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -127,10 +127,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA recreate(); } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) { recreate(); - - Intent intent = new Intent(this, KeyCachingService.class); - intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT); - startService(intent); } } diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 629677a1b..09a2f1f95 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -22,7 +22,6 @@ import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Color; @@ -93,7 +92,6 @@ import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.contactshare.ContactShareEditActivity; import org.thoughtcrime.securesms.contactshare.ContactUtil; -import org.thoughtcrime.securesms.crypto.SecurityEvent; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DraftDatabase; @@ -121,7 +119,6 @@ import org.thoughtcrime.securesms.providers.PersistentBlobProvider; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientFormattingException; import org.thoughtcrime.securesms.scribbles.ScribbleActivity; -import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicTheme; @@ -204,7 +201,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private AttachmentTypeSelector attachmentTypeSelector; private AttachmentManager attachmentManager; private AudioRecorder audioRecorder; - private BroadcastReceiver securityUpdateReceiver; private Stub emojiDrawerStub; protected HidingLinearLayout quickAttachmentToggle; private QuickAttachmentDrawer quickAttachmentDrawer; @@ -247,7 +243,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale()); - initializeReceivers(); initializeActionBar(); initializeViews(); initializeResources(); @@ -363,7 +358,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity @Override protected void onDestroy() { saveDraft(); - if (securityUpdateReceiver != null) unregisterReceiver(securityUpdateReceiver); dcContext.eventCenter.removeObservers(this); super.onDestroy(); } @@ -874,17 +868,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } private void initializeReceivers() { - securityUpdateReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - initializeSecurity(isSecureText, isDefaultSms); - calculateCharactersRemaining(); - } - }; - - registerReceiver(securityUpdateReceiver, - new IntentFilter(SecurityEvent.SECURITY_UPDATE_EVENT), - KeyCachingService.KEY_PERMISSION, null); } //////// Helper Methods diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index ae98664aa..38a3bcaba 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -154,7 +154,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit switch (item.getItemId()) { case R.id.menu_new_chat: createChat(); return true; case R.id.menu_settings: handleDisplaySettings(); return true; - case R.id.menu_clear_passphrase: handleClearPassphrase(); return true; case R.id.menu_qr_scan: handleQrScan(); return true; case R.id.menu_qr_show: handleQrShow(); return true; case R.id.menu_deaddrop: handleDeaddrop(); return true; @@ -217,12 +216,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit startActivity(preferencesIntent); } - private void handleClearPassphrase() { - Intent intent = new Intent(this, KeyCachingService.class); - intent.setAction(KeyCachingService.CLEAR_KEY_ACTION); - startService(intent); - } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 976506d59..421a54921 100644 --- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -37,7 +37,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA super.onCreate(savedInstanceState); if (!isFinishing()) { - initializeClearKeyReceiver(); onCreate(savedInstanceState, true); } } @@ -67,7 +66,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA protected void onDestroy() { Log.w(TAG, "onDestroy()"); super.onDestroy(); - removeClearKeyReceiver(this); } @Override @@ -142,25 +140,4 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA if (nextIntent != null) intent.putExtra("next_intent", nextIntent); return intent; } - - private void initializeClearKeyReceiver() { - Log.w(TAG, "initializeClearKeyReceiver()"); - this.clearKeyReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - Log.w(TAG, "onReceive() for clear key event"); - onMasterSecretCleared(); - } - }; - - IntentFilter filter = new IntentFilter(KeyCachingService.CLEAR_KEY_EVENT); - registerReceiver(clearKeyReceiver, filter, KeyCachingService.KEY_PERMISSION, null); - } - - private void removeClearKeyReceiver(Context context) { - if (clearKeyReceiver != null) { - context.unregisterReceiver(clearKeyReceiver); - clearKeyReceiver = null; - } - } } diff --git a/src/org/thoughtcrime/securesms/crypto/SecurityEvent.java b/src/org/thoughtcrime/securesms/crypto/SecurityEvent.java deleted file mode 100644 index 2933cfbf9..000000000 --- a/src/org/thoughtcrime/securesms/crypto/SecurityEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.thoughtcrime.securesms.crypto; - -import android.content.Context; -import android.content.Intent; - -import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.service.KeyCachingService; - -/** - * This class processes key exchange interactions. - * - * @author Moxie Marlinspike - */ - -public class SecurityEvent { - - public static final String SECURITY_UPDATE_EVENT = "org.thoughtcrime.securesms.KEY_EXCHANGE_UPDATE"; - - public static void broadcastSecurityUpdateEvent(Context context) { - Intent intent = new Intent(SECURITY_UPDATE_EVENT); - intent.setPackage(context.getPackageName()); - context.sendBroadcast(intent, KeyCachingService.KEY_PERMISSION); - } - -} diff --git a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java b/src/org/thoughtcrime/securesms/service/PanicResponderListener.java index c6cefc659..4d0d007b5 100644 --- a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java +++ b/src/org/thoughtcrime/securesms/service/PanicResponderListener.java @@ -21,9 +21,10 @@ public class PanicResponderListener extends BroadcastReceiver { if (intent != null && !TextSecurePreferences.isPasswordDisabled(context) && "info.guardianproject.panic.action.TRIGGER".equals(intent.getAction())) { - Intent lockIntent = new Intent(context, KeyCachingService.class); - lockIntent.setAction(KeyCachingService.CLEAR_KEY_ACTION); - context.startService(lockIntent); + // as delta is protected with the system credentials, + // the current suggestion on "panic" would probably just be to lock the device. + // this would also lock delta chat. + // however, we leave this class to allow easy changes on this. } } } \ No newline at end of file