Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit b932f2c

Browse files
committed
More dead code cleanup
1 parent 3c0cb8b commit b932f2c

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

app/src/main/java/com/zulip/android/activities/MessageListFragment.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public interface Listener {
7373

7474
private Listener mListener;
7575
private RecyclerView recyclerView;
76-
private View bottom_list_spacer;
7776

7877
public ZulipApp app;
7978

@@ -84,7 +83,6 @@ public interface Listener {
8483
private boolean loadedToTop = false;
8584
private boolean loadedToBottom = false;
8685

87-
private List<Message> mutedMessages;
8886
private int firstMessageId = -1;
8987
private int lastMessageId = -1;
9088

@@ -113,7 +111,6 @@ public void onCreate(Bundle savedInstanceState) {
113111
if (getArguments() != null) {
114112
filter = getArguments().getParcelable(PARAM_FILTER);
115113
}
116-
mutedMessages = new ArrayList<>();
117114
messageIndex = new SparseArray<>();
118115
messageList = new ArrayList<>();
119116
}

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,12 @@ public class ZulipActivity extends BaseActivity implements
126126
private static final int PERMISSION_REQUEST_READ_CONTACTS = 1;
127127
private ZulipApp app;
128128

129-
private boolean suspended = false;
130129
private boolean logged_in = false;
131130

132131
private ZulipActivity that = this; // self-ref
133132

134133
private DrawerLayout drawerLayout;
135134
private ActionBarDrawerToggle drawerToggle;
136-
private ExpandableListView streamsDrawer;
137135
private static final Interpolator FAST_OUT_SLOW_IN_INTERPOLATOR = new FastOutSlowInInterpolator();
138136
private SwipeRemoveLinearLayout chatBox;
139137
FloatingActionButton fab;
@@ -175,7 +173,6 @@ public void onReceive(Context contenxt, Intent intent) {
175173
}
176174
};
177175
private ExpandableStreamDrawerAdapter streamsDrawerAdapter;
178-
private boolean mReadExternalStorage;
179176
private Uri mImageUri;
180177

181178
@Override
@@ -956,14 +953,7 @@ public void onClick(View v) {
956953
* Initiates the streams Drawer if the streams in the drawer is 0.
957954
*/
958955
public void checkAndSetupStreamsDrawer() {
959-
try {
960-
if (streamsDrawer.getAdapter().getCount() != 0) {
961-
return;
962-
}
963-
setupListViewAdapter();
964-
} catch (NullPointerException npe) {
965-
setupListViewAdapter();
966-
}
956+
setupListViewAdapter();
967957
}
968958

969959
private void sendMessage() {
@@ -1627,7 +1617,6 @@ public void onConfigurationChanged(Configuration newConfig) {
16271617
protected void onPause() {
16281618
super.onPause();
16291619
Log.i("status", "suspend");
1630-
this.suspended = true;
16311620

16321621
unregisterReceiver(onGcmMessage);
16331622

@@ -1644,7 +1633,6 @@ protected void onPause() {
16441633
protected void onResume() {
16451634
super.onResume();
16461635
Log.i("status", "resume");
1647-
this.suspended = false;
16481636

16491637
// Set up the BroadcastReceiver to trap GCM messages so notifications
16501638
// don't show while in the app

0 commit comments

Comments
 (0)