Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cad49b8 authored by linyuh's avatar linyuh Committed by Copybara-Service
Browse files

Register ShowBlockReportSpamDialogReceiver in MainActivity.

Bug: 73830902
Test: Manual
PiperOrigin-RevId: 189222303
Change-Id: I0397986d784d28e7948b39778319e3936f6c55e9
parent 8012611f
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.dialer.main.impl;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager;
import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogReceiver;
import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
import com.android.dialer.configprovider.ConfigProviderBindings;
@@ -39,6 +41,12 @@ public class MainActivity extends TransactionSafeActivity

  private MainActivityPeer activePeer;

  /**
   * {@link android.content.BroadcastReceiver} that shows a dialog to block a number and/or report
   * it as spam when notified.
   */
  private ShowBlockReportSpamDialogReceiver showBlockReportSpamDialogReceiver;

  public static Intent getShowCallLogIntent(Context context) {
    return getShowTabIntent(context, TabIndex.CALL_LOG);
  }
@@ -69,6 +77,8 @@ public class MainActivity extends TransactionSafeActivity
    // If peer was set by the super, don't reset it.
    activePeer = getNewPeer();
    activePeer.onActivityCreate(savedInstanceState);

    showBlockReportSpamDialogReceiver = new ShowBlockReportSpamDialogReceiver(getFragmentManager());
  }

  protected MainActivityPeer getNewPeer() {
@@ -90,6 +100,10 @@ public class MainActivity extends TransactionSafeActivity
  protected void onResume() {
    super.onResume();
    activePeer.onActivityResume();

    LocalBroadcastManager.getInstance(this)
        .registerReceiver(
            showBlockReportSpamDialogReceiver, ShowBlockReportSpamDialogReceiver.getIntentFilter());
  }

  @Override
@@ -102,6 +116,8 @@ public class MainActivity extends TransactionSafeActivity
  protected void onPause() {
    super.onPause();
    activePeer.onActivityPause();

    LocalBroadcastManager.getInstance(this).unregisterReceiver(showBlockReportSpamDialogReceiver);
  }

  @Override
+2 −14
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.LocalBroadcastManager;
import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogReceiver;
import com.android.dialer.calllog.CallLogComponent;
import com.android.dialer.calllog.ui.NewCallLogFragment;
import com.android.dialer.common.concurrent.DefaultFutureCallback;
@@ -39,12 +37,9 @@ import com.google.common.util.concurrent.MoreExecutors;
public class NewMainActivityPeer implements MainActivityPeer {

  private final MainActivity mainActivity;
  private final ShowBlockReportSpamDialogReceiver showBlockReportSpamDialogReceiver;

  public NewMainActivityPeer(MainActivity mainActivity) {
    this.mainActivity = mainActivity;
    this.showBlockReportSpamDialogReceiver =
        new ShowBlockReportSpamDialogReceiver(mainActivity.getFragmentManager());
  }

  @Override
@@ -59,20 +54,13 @@ public class NewMainActivityPeer implements MainActivityPeer {
  }

  @Override
  public void onActivityResume() {
    LocalBroadcastManager.getInstance(mainActivity)
        .registerReceiver(
            showBlockReportSpamDialogReceiver, ShowBlockReportSpamDialogReceiver.getIntentFilter());
  }
  public void onActivityResume() {}

  @Override
  public void onUserLeaveHint() {}

  @Override
  public void onActivityPause() {
    LocalBroadcastManager.getInstance(mainActivity)
        .unregisterReceiver(showBlockReportSpamDialogReceiver);
  }
  public void onActivityPause() {}

  @Override
  public void onActivityStop() {}