Merge branch 'master' into master

This commit is contained in:
Hassan 2018-02-17 12:07:58 -06:00 committed by GitHub
commit b03e67dcd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 535 additions and 325 deletions

View file

@ -61,9 +61,7 @@ public class NotificationActivity extends NavigationBaseActivity {
.subscribe(notificationList -> {
Timber.d("Number of notifications is %d", notificationList.size());
setAdapter(notificationList);
}, throwable -> {
Timber.e(throwable, "Error occurred while loading notifications");
});
}, throwable -> Timber.e(throwable, "Error occurred while loading notifications"));
}
private void handleUrl(String url) {

View file

@ -8,13 +8,9 @@ import android.widget.TextView;
import com.pedrogomez.renderers.Renderer;
import java.util.Calendar;
import java.util.Date;
import butterknife.BindView;
import butterknife.ButterKnife;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.utils.DateUtils;
/**
* Created by root on 19.12.2017.