Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

make reminder a custom view, make push reminder

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty
2014-08-04 13:13:47 -07:00
parent eb4ac40051
commit de63b0dd96
12 changed files with 293 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@@ -21,28 +21,19 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.provider.Telephony;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.CursorAdapter;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.actionbarsherlock.app.SherlockListFragment;
import com.actionbarsherlock.view.ActionMode;
@@ -51,15 +42,17 @@ import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.widget.SearchView;
import org.thoughtcrime.securesms.components.DefaultSmsReminder;
import org.thoughtcrime.securesms.components.PushRegistrationReminder;
import org.thoughtcrime.securesms.components.ReminderView;
import org.thoughtcrime.securesms.components.SystemSmsImportReminder;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.service.ApplicationMigrationService;
import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.textsecure.crypto.MasterSecret;
import org.thoughtcrime.securesms.util.Util;
import java.util.Set;
@@ -71,13 +64,13 @@ public class ConversationListFragment extends SherlockListFragment
private ConversationSelectedListener listener;
private MasterSecret masterSecret;
private ActionMode actionMode;
private View reminderView;
private String queryFilter = "";
private ReminderView reminderView;
private String queryFilter = "";
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
final View view = inflater.inflate(R.layout.conversation_list_fragment, container, false);
reminderView = LayoutInflater.from(getActivity()).inflate(R.layout.reminder_header, null);
reminderView = new ReminderView(getActivity());
return view;
}
@@ -203,17 +196,14 @@ public class ConversationListFragment extends SherlockListFragment
}
private void initializeReminders() {
final boolean isDefault = Util.isDefaultSmsProvider(getActivity());
if (isDefault) {
TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), false);
}
if (!isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(getActivity())) {
showDefaultSmsReminder();
} else if (isDefault && !ApplicationMigrationService.isDatabaseImported(getActivity())) {
showSystemSmsImportReminder();
if (DefaultSmsReminder.isEligible(getActivity())) {
reminderView.showReminder(new DefaultSmsReminder(getActivity()));
} else if (SystemSmsImportReminder.isEligible(getActivity())) {
reminderView.showReminder(new SystemSmsImportReminder(getActivity(), masterSecret));
} else if (PushRegistrationReminder.isEligible(getActivity())) {
reminderView.showReminder(new PushRegistrationReminder(getActivity(), masterSecret));
} else {
reminderView.findViewById(R.id.container).setVisibility(View.GONE);
reminderView.hide();
}
}
@@ -339,79 +329,6 @@ public class ConversationListFragment extends SherlockListFragment
actionMode = null;
}
@TargetApi(VERSION_CODES.KITKAT)
private void showDefaultSmsReminder() {
final ViewGroup container = (ViewGroup) reminderView.findViewById(R.id.container);
setReminderData(R.drawable.sms_selection_icon,
R.string.reminder_header_sms_default_title,
R.string.reminder_header_sms_default_text,
new OnClickListener() {
@Override
public void onClick(View v) {
TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), true);
Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getActivity().getPackageName());
startActivity(intent);
}
},
new OnClickListener() {
@Override
public void onClick(View v) {
TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), true);
container.setVisibility(View.GONE);
}
});
container.setVisibility(View.VISIBLE);
}
private void showSystemSmsImportReminder() {
final ViewGroup container = (ViewGroup) reminderView.findViewById(R.id.container);
setReminderData(R.drawable.sms_system_import_icon,
R.string.reminder_header_sms_import_title,
R.string.reminder_header_sms_import_text,
new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), ApplicationMigrationService.class);
intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
intent.putExtra("master_secret", masterSecret);
getActivity().startService(intent);
Intent nextIntent = new Intent(getActivity(), ConversationListActivity.class);
intent.putExtra("master_secret", masterSecret);
Intent activityIntent = new Intent(getActivity(), DatabaseMigrationActivity.class);
activityIntent.putExtra("master_secret", masterSecret);
activityIntent.putExtra("next_intent", nextIntent);
getActivity().startActivity(activityIntent);
}
},
new OnClickListener() {
@Override
public void onClick(View v) {
ApplicationMigrationService.setDatabaseImported(getActivity());
container.setVisibility(View.GONE);
}
});
container.setVisibility(View.VISIBLE);
}
private void setReminderData(int iconResId, int titleResId, int textResId, OnClickListener okListener, OnClickListener cancelListener) {
final ImageButton cancel = (ImageButton) reminderView.findViewById(R.id.cancel);
final Button ok = (Button ) reminderView.findViewById(R.id.ok);
final TextView title = (TextView ) reminderView.findViewById(R.id.reminder_title);
final TextView text = (TextView ) reminderView.findViewById(R.id.reminder_text);
final ImageView icon = (ImageView ) reminderView.findViewById(R.id.icon);
icon.setImageResource(iconResId);
title.setText(titleResId);
text.setText(textResId);
ok.setOnClickListener(okListener);
cancel.setOnClickListener(cancelListener);
}
}