From c54be0884502c8cc4fdba1721199653210d6bb1a Mon Sep 17 00:00:00 2001
From: hismaeel <hismaeel@macalester.edu>
Date: Wed, 21 Feb 2018 13:39:26 -0500
Subject: [PATCH 01/22] Fixed Hard Coded Column issue. #1119

---
 .../nrw/commons/category/CategoryDao.java     |  8 ++--
 .../contributions/ContributionDao.java        | 40 +++++++++++--------
 .../modifications/ModifierSequenceDao.java    |  6 +--
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
index e63b04c26..7d8504e61 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
@@ -108,10 +108,10 @@ public class CategoryDao {
     Category fromCursor(Cursor cursor) {
         // Hardcoding column positions!
         return new Category(
-                CategoryContentProvider.uriForId(cursor.getInt(0)),
-                cursor.getString(1),
-                new Date(cursor.getLong(2)),
-                cursor.getInt(3)
+                CategoryContentProvider.uriForId(cursor.getInt(cursor.getColumnIndex(Table.COLUMN_ID))),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME)),
+                    new Date(cursor.getLong(cursor.getColumnIndex(Table.COLUMN_LAST_USED))),
+                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_TIMES_USED))
         );
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
index 9d3038e03..079cf6477 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java
@@ -8,6 +8,7 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.Date;
 
@@ -115,23 +116,30 @@ public class ContributionDao {
         // Hardcoding column positions!
         //Check that cursor has a value to avoid CursorIndexOutOfBoundsException
         if (cursor.getCount() > 0) {
+            int index;
+            if (cursor.getColumnIndex(Table.COLUMN_LICENSE) == -1){
+                index = 15;
+            } else {
+                index = cursor.getColumnIndex(Table.COLUMN_LICENSE);
+            }
             return new Contribution(
-                    uriForId(cursor.getInt(0)),
-                    cursor.getString(1),
-                    parseUri(cursor.getString(2)),
-                    cursor.getString(3),
-                    parseTimestamp(cursor.getLong(4)),
-                    cursor.getInt(5),
-                    cursor.getLong(6),
-                    parseTimestamp(cursor.getLong(7)),
-                    cursor.getLong(8),
-                    cursor.getString(9),
-                    cursor.getString(10),
-                    cursor.getString(11),
-                    cursor.getInt(12) == 1,
-                    cursor.getInt(13),
-                    cursor.getInt(14),
-                    cursor.getString(15));
+                    uriForId(cursor.getInt(cursor.getColumnIndex(Table.COLUMN_ID))),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_FILENAME)),
+                    parseUri(cursor.getString(cursor.getColumnIndex(Table.COLUMN_LOCAL_URI))),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_IMAGE_URL)),
+                    parseTimestamp(cursor.getLong(cursor.getColumnIndex(Table.COLUMN_TIMESTAMP))),
+                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_STATE)),
+                    cursor.getLong(cursor.getColumnIndex(Table.COLUMN_LENGTH)),
+                    parseTimestamp(cursor.getLong(cursor.getColumnIndex(Table.COLUMN_UPLOADED))),
+                    cursor.getLong(cursor.getColumnIndex(Table.COLUMN_TRANSFERRED)),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_SOURCE)),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_DESCRIPTION)),
+                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_CREATOR)),
+                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_MULTIPLE)) == 1,
+                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_WIDTH)),
+                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_HEIGHT)),
+                    cursor.getString(index)
+            );
         }
 
         return null;
diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequenceDao.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequenceDao.java
index a23079b5e..957656a24 100644
--- a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequenceDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequenceDao.java
@@ -54,12 +54,12 @@ public class ModifierSequenceDao {
         // Hardcoding column positions!
         ModifierSequence ms;
         try {
-            ms = new ModifierSequence(Uri.parse(cursor.getString(1)),
-                    new JSONObject(cursor.getString(2)));
+            ms = new ModifierSequence(Uri.parse(cursor.getString(cursor.getColumnIndex(Table.COLUMN_MEDIA_URI))),
+                    new JSONObject(cursor.getString(cursor.getColumnIndex(Table.COLUMN_DATA))));
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }
-        ms.setContentUri( ModificationsContentProvider.uriForId(cursor.getInt(0)));
+        ms.setContentUri( ModificationsContentProvider.uriForId(cursor.getInt(cursor.getColumnIndex(Table.COLUMN_ID))));
 
         return ms;
     }

From 3e0e533882dcab99459b82d7f5db5f27fb9318ca Mon Sep 17 00:00:00 2001
From: Hassan <hismaeel@macalester.edu>
Date: Wed, 21 Feb 2018 14:46:24 -0500
Subject: [PATCH 02/22] White Spacing

---
 .../main/java/fr/free/nrw/commons/category/CategoryDao.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
index 7d8504e61..a5202046b 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
@@ -109,9 +109,9 @@ public class CategoryDao {
         // Hardcoding column positions!
         return new Category(
                 CategoryContentProvider.uriForId(cursor.getInt(cursor.getColumnIndex(Table.COLUMN_ID))),
-                    cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME)),
-                    new Date(cursor.getLong(cursor.getColumnIndex(Table.COLUMN_LAST_USED))),
-                    cursor.getInt(cursor.getColumnIndex(Table.COLUMN_TIMES_USED))
+                cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME)),
+                new Date(cursor.getLong(cursor.getColumnIndex(Table.COLUMN_LAST_USED))),
+                cursor.getInt(cursor.getColumnIndex(Table.COLUMN_TIMES_USED))
         );
     }
 

From 31008e5dc1ef880012f5a399aec925852a989276 Mon Sep 17 00:00:00 2001
From: harisankerPradeep <ep16b014@smail.iitm.ac.in>
Date: Sun, 25 Feb 2018 00:10:02 +0530
Subject: [PATCH 03/22] Partially fixes Bug#1004

---
 .../java/fr/free/nrw/commons/CommonsApplication.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index ab156bab7..d8f93097e 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.facebook.stetho.Stetho;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -24,7 +25,6 @@ import fr.free.nrw.commons.category.CategoryDao;
 import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
-import fr.free.nrw.commons.di.CommonsApplicationComponent;
 import fr.free.nrw.commons.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.utils.FileUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -71,8 +71,11 @@ public class CommonsApplication extends Application {
                 .getInstance(this)
                 .getCommonsApplicationComponent()
                 .inject(this);
-
-        Fresco.initialize(this);
+//        Set DownsampleEnabled to True to downsample the image in case it's heavy
+        ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
+                .setDownsampleEnabled(true)
+                .build();
+        Fresco.initialize(this,config);
         if (setupLeakCanary() == RefWatcher.DISABLED) {
             return;
         }

From 5315bf7efeefa4faca0f15f2eac3758f51da1098 Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Sun, 25 Feb 2018 22:33:45 +0530
Subject: [PATCH 04/22] 1.Added scroll view. 2.Added material design to edit
 text. 3.Limit title to single line (80 characters). Fixes #1179

---
 .../res/layout/fragment_single_upload.xml     | 131 ++++++++++--------
 1 file changed, 73 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index 87285fa5d..a340e0213 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -1,73 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="fill"
-    android:orientation="vertical"
     android:background="?attr/fragmentCategorisationBackground"
-    android:paddingBottom="@dimen/small_gap"
-    android:paddingLeft="@dimen/standard_gap"
-    android:paddingStart="@dimen/standard_gap"
-    android:paddingRight="@dimen/standard_gap"
-    android:paddingEnd="@dimen/standard_gap"
-    android:paddingTop="@dimen/small_gap"
-    android:theme="@style/DarkAppTheme"
     android:clickable="true"
+    android:focusable="true"
     android:focusableInTouchMode="true"
-    >
+    android:paddingBottom="@dimen/small_gap"
+    android:paddingEnd="@dimen/standard_gap"
+    android:paddingLeft="@dimen/standard_gap"
+    android:paddingRight="@dimen/standard_gap"
+    android:paddingStart="@dimen/standard_gap"
+    android:paddingTop="@dimen/small_gap"
+    android:theme="@style/DarkAppTheme">
 
-    <EditText
-        android:id="@+id/titleEdit"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableEnd="@drawable/mapbox_info_icon_default"
-        android:drawableRight="@drawable/mapbox_info_icon_default"
-        android:scrollHorizontally="false"
-        android:inputType="textMultiLine"
-        android:hint="@string/share_title_hint"
-        android:imeOptions="flagNoExtractUi" />
+        android:layout_gravity="fill"
+        android:orientation="vertical">
 
-    <EditText
-        android:id="@+id/descEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawableEnd="@drawable/mapbox_info_icon_default"
-        android:drawableRight="@drawable/mapbox_info_icon_default"
-        android:inputType="textMultiLine"
-        android:hint="@string/share_description_hint"
-        android:imeOptions="flagNoExtractUi" />
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <Spinner
-        android:id="@+id/licenseSpinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="?attr/spinnerTheme"
-        />
+            <EditText
+                android:id="@+id/titleEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableEnd="@drawable/mapbox_info_icon_default"
+                android:drawableRight="@drawable/mapbox_info_icon_default"
+                android:maxLines="1"
+                android:maxLength="80"
+                android:hint="@string/share_title_hint"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="text"
+                android:scrollHorizontally="false" />
+        </android.support.design.widget.TextInputLayout>
 
-    <Button
-        android:text="@string/use_previous"
-        android:background="?attr/buttonBackground"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/titleDescButton"
-        />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/share_license_summary"
-        android:id="@+id/share_license_summary"
-        android:gravity="center"
-        android:layout_marginTop="@dimen/standard_gap"
-        />
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <fr.free.nrw.commons.ui.widget.HtmlTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/media_upload_policy"
-        android:text="@string/media_upload_policy"
-        android:gravity="start"
-        android:layout_marginTop="@dimen/standard_gap"
-        />
+            <EditText
+                android:id="@+id/descEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableEnd="@drawable/mapbox_info_icon_default"
+                android:drawableRight="@drawable/mapbox_info_icon_default"
+                android:hint="@string/share_description_hint"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textMultiLine" />
+        </android.support.design.widget.TextInputLayout>
 
-</LinearLayout>
+
+        <Spinner
+            android:id="@+id/licenseSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="?attr/spinnerTheme" />
+
+        <Button
+            android:id="@+id/titleDescButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/buttonBackground"
+            android:text="@string/use_previous" />
+
+        <TextView
+            android:id="@+id/share_license_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_gap"
+            android:gravity="center"
+            android:text="@string/share_license_summary" />
+
+        <fr.free.nrw.commons.ui.widget.HtmlTextView
+            android:id="@+id/media_upload_policy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_gap"
+            android:gravity="start"
+            android:text="@string/media_upload_policy" />
+
+    </LinearLayout>
+</ScrollView>

From 01ad0c8c9148ca1f6fac8bba6d0ffc17807c72eb Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Mon, 26 Feb 2018 00:34:35 +0530
Subject: [PATCH 05/22] Notifications list retained across orientation change.
 Fixes #1198

---
 app/build.gradle                              |  4 +--
 .../notification/NotificationActivity.java    | 36 +++++++++++++------
 .../NotificationWorkerFragment.java           | 29 +++++++++++++++
 3 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java

diff --git a/app/build.gradle b/app/build.gradle
index c021e28ac..6f225dc2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     compile 'com.facebook.stetho:stetho:1.5.0'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.4'
+    testCompile 'org.robolectric:robolectric:3.7.1'
 
     testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
@@ -78,7 +78,7 @@ dependencies {
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.4'
+    testImplementation 'org.robolectric:robolectric:3.7.1'
     testImplementation 'org.mockito:mockito-all:1.10.19'
 
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
index 4b4ca3007..da9b60ba8 100644
--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.notification;
 
 import android.annotation.SuppressLint;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -10,7 +11,6 @@ import android.support.v7.widget.RecyclerView;
 
 import com.pedrogomez.renderers.RVRendererAdapter;
 
-import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -35,12 +35,16 @@ public class NotificationActivity extends NavigationBaseActivity {
 
     @Inject NotificationController controller;
 
+    private static final String TAG_NOTIFICATION_WORKER_FRAGMENT = "NotificationWorkerFragment";
+    private NotificationWorkerFragment mNotificationWorkerFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_notification);
         ButterKnife.bind(this);
+        mNotificationWorkerFragment = (NotificationWorkerFragment) getFragmentManager()
+                                      .findFragmentByTag(TAG_NOTIFICATION_WORKER_FRAGMENT);
         initListView();
         initDrawer();
     }
@@ -55,14 +59,18 @@ public class NotificationActivity extends NavigationBaseActivity {
     private void addNotifications() {
         Timber.d("Add notifications");
 
-        Observable.fromCallable(() -> controller.getNotifications())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(notificationList -> {
-                    Collections.reverse(notificationList);
-                    Timber.d("Number of notifications is %d", notificationList.size());
-                    setAdapter(notificationList);
-                }, throwable -> Timber.e(throwable, "Error occurred while loading notifications"));
+        if(mNotificationWorkerFragment == null){
+            Observable.fromCallable(() -> controller.getNotifications())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(notificationList -> {
+                        Timber.d("Number of notifications is %d", notificationList.size());
+                        initializeAndSetNotificationList(notificationList);
+                        setAdapter(notificationList);
+                    }, throwable -> Timber.e(throwable, "Error occurred while loading notifications"));
+        } else {
+            setAdapter(mNotificationWorkerFragment.getNotificationList());
+        }
     }
 
     private void handleUrl(String url) {
@@ -85,4 +93,12 @@ public class NotificationActivity extends NavigationBaseActivity {
         Intent intent = new Intent(context, NotificationActivity.class);
         context.startActivity(intent);
     }
-}
+
+    private void initializeAndSetNotificationList(List<Notification> notificationList){
+        FragmentManager fm = getFragmentManager();
+        mNotificationWorkerFragment = new NotificationWorkerFragment();
+        fm.beginTransaction().add(mNotificationWorkerFragment, TAG_NOTIFICATION_WORKER_FRAGMENT)
+                .commit();
+        mNotificationWorkerFragment.setNotificationList(notificationList);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java
new file mode 100644
index 000000000..bb85fc696
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationWorkerFragment.java
@@ -0,0 +1,29 @@
+package fr.free.nrw.commons.notification;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import java.util.List;
+
+/**
+ * Created by knightshade on 25/2/18.
+ */
+
+public class NotificationWorkerFragment extends Fragment {
+    private List<Notification> notificationList;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public void setNotificationList(List<Notification> notificationList){
+        this.notificationList = notificationList;
+    }
+
+    public List<Notification> getNotificationList(){
+        return notificationList;
+    }
+}

From ba49d0601aded74f79f6991e9028d488c7a9a9a2 Mon Sep 17 00:00:00 2001
From: hismaeel <hismaeel@macalester.edu>
Date: Sun, 25 Feb 2018 21:55:04 -0500
Subject: [PATCH 06/22] issue #1130 -(j). bad Token Exception from showDialog()
 in ExistingFileAsync

---
 .../nrw/commons/upload/ExistingFileAsync.java  | 18 ++++++++++++------
 .../free/nrw/commons/upload/ShareActivity.java |  5 ++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
index fee0765a4..f74c40867 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
@@ -1,11 +1,13 @@
 package fr.free.nrw.commons.upload;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.v7.app.AlertDialog;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
@@ -28,12 +30,14 @@ public class ExistingFileAsync extends AsyncTask<Void, Void, Boolean> {
         DUPLICATE_CANCELLED
     }
 
+    private final WeakReference<Activity> activity;
     private final MediaWikiApi api;
     private final String fileSha1;
-    private final Context context;
+    private final WeakReference<Context> context;
     private final Callback callback;
 
-    public ExistingFileAsync(String fileSha1, Context context, Callback callback, MediaWikiApi mwApi) {
+    public ExistingFileAsync(WeakReference<Activity> activity, String fileSha1, WeakReference<Context> context, Callback callback, MediaWikiApi mwApi) {
+        this.activity = activity;
         this.fileSha1 = fileSha1;
         this.context = context;
         this.callback = callback;
@@ -69,19 +73,21 @@ public class ExistingFileAsync extends AsyncTask<Void, Void, Boolean> {
         // If file exists, display warning to user.
         // Use soft warning for now (user able to choose to proceed) until have determined that implementation works without bugs
         if (fileExists) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            AlertDialog.Builder builder = new AlertDialog.Builder(context.get());
             builder.setMessage(R.string.file_exists)
                     .setTitle(R.string.warning);
             builder.setPositiveButton(R.string.no, (dialog, id) -> {
                 //Go back to ContributionsActivity
-                Intent intent = new Intent(context, ContributionsActivity.class);
-                context.startActivity(intent);
+                Intent intent = new Intent(context.get(), ContributionsActivity.class);
+                context.get().startActivity(intent);
                 callback.onResult(Result.DUPLICATE_CANCELLED);
             });
             builder.setNegativeButton(R.string.yes, (dialog, id) -> callback.onResult(Result.DUPLICATE_PROCEED));
 
             AlertDialog dialog = builder.create();
-            dialog.show();
+            if (!activity.get().isFinishing()) {
+                dialog.show();
+            }
         } else {
             callback.onResult(Result.NO_DUPLICATE);
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index a0b9102b6..eca66b3e5 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -1,7 +1,9 @@
 package fr.free.nrw.commons.upload;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -30,6 +32,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.ref.WeakReference;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -366,7 +369,7 @@ public class ShareActivity
                     Timber.d("File SHA1 is: %s", fileSHA1);
 
                     ExistingFileAsync fileAsyncTask =
-                            new ExistingFileAsync(fileSHA1, this, result -> {
+                            new ExistingFileAsync(new WeakReference<Activity>(this), fileSHA1, new WeakReference<Context>(this), result -> {
                                 Timber.d("%s duplicate check: %s", mediaUri.toString(), result);
                                 duplicateCheckPassed = (result == DUPLICATE_PROCEED
                                         || result == NO_DUPLICATE);

From 7c32f57c31ebb67e4f7726f9fd7fdc2c764c8c8c Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Tue, 6 Mar 2018 23:05:01 +0530
Subject: [PATCH 07/22] Fixed upload count to show correct number of pictures
 upload by user in beta version of app. Fixes #1262

---
 .../contributions/ContributionsActivity.java      | 15 +++------------
 .../contributions/ContributionsListFragment.java  |  3 +++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index 5c1ecfaa0..52f6da4c1 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -139,7 +139,6 @@ public  class       ContributionsActivity
         requestAuthToken();
         initDrawer();
         setTitle(getString(R.string.title_activity_contributions));
-        setUploadCount();
     }
 
     @Override
@@ -266,17 +265,9 @@ public  class       ContributionsActivity
     }
 
     @SuppressWarnings("ConstantConditions")
-    private void setUploadCount() {
-        compositeDisposable.add(mediaWikiApi
-                .getUploadCount(sessionManager.getCurrentAccount().name)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        uploadCount -> getSupportActionBar().setSubtitle(getResources()
-                                .getQuantityString(R.plurals.contributions_subtitle,
-                                        uploadCount, uploadCount)),
-                        t -> Timber.e(t, "Fetching upload count failed")
-                ));
+    public void setUploadCount(int uploadCount) {
+        getSupportActionBar().setSubtitle(getResources()
+                .getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount));
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 25bf6eb93..8878d13b9 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -56,6 +56,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     private ContributionController controller;
 
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_contributions, container, false);
@@ -87,6 +88,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     public void setAdapter(ListAdapter adapter) {
         this.contributionsList.setAdapter(adapter);
+        Timber.d("ContributionsListFragment -> " + adapter.getCount());
+        ((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount());
     }
 
     public void changeProgressBarVisibility(boolean isVisible) {

From 2ae46a4c337f6ef1586fbeec21b4f407d477690b Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Wed, 7 Mar 2018 16:06:36 +0530
Subject: [PATCH 08/22] Modified the code to only function in beta build
 variant.

---
 .../contributions/ContributionsActivity.java  | 28 +++++++++++++++++--
 .../ContributionsListFragment.java            |  9 ++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index 52f6da4c1..a84450275 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -26,6 +26,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import butterknife.ButterKnife;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.HandlerService;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
@@ -139,6 +140,12 @@ public  class       ContributionsActivity
         requestAuthToken();
         initDrawer();
         setTitle(getString(R.string.title_activity_contributions));
+
+        if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
+            Timber.d("setUploadCount()");
+            setUploadCount();
+        }
+
     }
 
     @Override
@@ -265,11 +272,26 @@ public  class       ContributionsActivity
     }
 
     @SuppressWarnings("ConstantConditions")
-    public void setUploadCount(int uploadCount) {
-        getSupportActionBar().setSubtitle(getResources()
-                .getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount));
+    private void setUploadCount() {
+        compositeDisposable.add(mediaWikiApi
+                .getUploadCount(sessionManager.getCurrentAccount().name)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        uploadCount -> getSupportActionBar().setSubtitle(getResources()
+                                .getQuantityString(R.plurals.contributions_subtitle,
+                                        uploadCount, uploadCount)),
+                        t -> Timber.e(t, "Fetching upload count failed")
+                ));
     }
 
+    public void betaSetUploadCount(int betaUploadCount){
+        Timber.d("" + betaUploadCount);
+        getSupportActionBar().setSubtitle(getResources()
+                .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount));
+    }
+
+
     @Override
     public void notifyDatasetChanged() {
         // Do nothing for now
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 8878d13b9..e95b83203 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -27,6 +27,7 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.nearby.NearbyActivity;
@@ -88,8 +89,12 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     public void setAdapter(ListAdapter adapter) {
         this.contributionsList.setAdapter(adapter);
-        Timber.d("ContributionsListFragment -> " + adapter.getCount());
-        ((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount());
+        Timber.d("" + adapter.getCount());
+
+        if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
+            Timber.d("betaBuild : adapter count -> " + adapter.getCount());
+            ((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount());
+        }
     }
 
     public void changeProgressBarVisibility(boolean isVisible) {

From 4ac8f88ec2ff7a3c6104b11e3c2002da17666005 Mon Sep 17 00:00:00 2001
From: maskara <maskara@zeta.tech>
Date: Sun, 11 Mar 2018 01:36:19 +0530
Subject: [PATCH 09/22] Fixes privacy policy link in Login page

---
 .../fr/free/nrw/commons/AboutActivity.java    | 42 +++----------------
 .../main/java/fr/free/nrw/commons/Utils.java  | 11 ++++-
 .../free/nrw/commons/auth/LoginActivity.java  |  5 +++
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index bb7b1fc1e..63622eff3 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -53,37 +53,18 @@ public class AboutActivity extends NavigationBaseActivity {
             intent.setPackage("com.facebook.katana");
             startActivity(intent);
         } catch (Exception e) {
-            intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985\\"));
-            if(intent.resolveActivity(this.getPackageManager()) != null){
-                Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985"));
-            } else {
-                Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
-                toast.show();
-            }
+            Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985"));
         }
     }
 
     @OnClick(R.id.github_launch_icon)
     public void launchGithub(View view) {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
-        //check if web browser available
-        if (browserIntent.resolveActivity(this.getPackageManager()) != null) {
-            Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
-        } else {
-            Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
-            toast.show();
-        }
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
     }
 
     @OnClick(R.id.website_launch_icon)
     public void launchWebsite(View view) {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\"));
-        if (browserIntent.resolveActivity(this.getPackageManager()) != null) {
-            Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
-        } else {
-            Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
-            toast.show();
-        }
+        Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
     }
 
     @OnClick(R.id.about_rate_us)
@@ -93,24 +74,11 @@ public class AboutActivity extends NavigationBaseActivity {
 
     @OnClick(R.id.about_credits)
     public void launchCredits(View view) {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
-        if (browserIntent.resolveActivity(this.getPackageManager()) != null) {
-            Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
-        } else {
-            Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
-            toast.show();
-        }
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
     }
 
     @OnClick(R.id.about_privacy_policy)
     public void launchPrivacyPolicy(View view) {
-      Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
-        if (browserIntent.resolveActivity(this.getPackageManager()) != null) {
-            Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
-        } else {
-            Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
-            toast.show();
-        }
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
     }
-
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 2b6ba9907..05873782c 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -7,6 +7,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
+import android.widget.Toast;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -15,7 +16,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -24,6 +24,8 @@ import java.util.regex.Pattern;
 import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
 
+import static android.widget.Toast.LENGTH_SHORT;
+
 public class Utils {
 
     /**
@@ -176,6 +178,13 @@ public class Utils {
     }
 
     public static void handleWebUrl(Context context,Uri url){
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, url);
+        if (browserIntent.resolveActivity(context.getPackageManager()) == null) {
+            Toast toast = Toast.makeText(context, context.getString(R.string.no_web_browser), LENGTH_SHORT);
+            toast.show();
+            return;
+        }
+
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
         builder.setToolbarColor(ContextCompat.getColor(context, R.color.primaryColor));
         builder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.primaryDarkColor));
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index 8a41664a9..7af3c05f6 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -37,6 +37,7 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
@@ -132,6 +133,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         Utils.handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL));
     }
 
+    @OnClick(R.id.about_privacy_policy)
+    void onPrivacyPolicyClicked() {
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
+    }
 
     public void hideKeyboard(View view) {
         InputMethodManager inputMethodManager =(InputMethodManager)this.getSystemService(Activity.INPUT_METHOD_SERVICE);

From 4861c4dfa3f767bac4530c69b16684ed91632a36 Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Sun, 11 Mar 2018 10:52:09 +0530
Subject: [PATCH 10/22] Sets the proper width to Navigation drawer in portrait
 and landscape mode.

Fixes #1275
---
 .../fr/free/nrw/commons/theme/NavigationBaseActivity.java  | 7 +++++--
 app/src/main/res/values-land/integer.xml                   | 4 ++++
 app/src/main/res/values/integer.xml                        | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-land/integer.xml
 create mode 100644 app/src/main/res/values/integer.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 81f56adea..b65d6aa25 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -88,8 +88,11 @@ public abstract class NavigationBaseActivity extends BaseActivity
 
     private void setDrawerPaneWidth() {
         ViewGroup.LayoutParams params = navigationView.getLayoutParams();
-        // set width to lowerBound of 80% of the screen size
-        params.width = (getResources().getDisplayMetrics().widthPixels * 70) / 100;
+        // set width to lowerBound of 70% of the screen size in portrait mode
+        // set width to lowerBound of 50% of the screen size in landscape mode
+        int percentageWidth = getResources().getInteger(R.integer.drawer_width);
+
+        params.width = (getResources().getDisplayMetrics().widthPixels * percentageWidth) / 100;
         navigationView.setLayoutParams(params);
     }
 
diff --git a/app/src/main/res/values-land/integer.xml b/app/src/main/res/values-land/integer.xml
new file mode 100644
index 000000000..5f10b23c3
--- /dev/null
+++ b/app/src/main/res/values-land/integer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="drawer_width">50</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integer.xml b/app/src/main/res/values/integer.xml
new file mode 100644
index 000000000..a7d66e24e
--- /dev/null
+++ b/app/src/main/res/values/integer.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="drawer_width">70</integer>
+</resources>
\ No newline at end of file

From cc02da85828a087331f3746fb904be48b0a6bde0 Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Sun, 11 Mar 2018 11:03:14 +0530
Subject: [PATCH 11/22] Removed debug logs used in development.

---
 .../free/nrw/commons/contributions/ContributionsActivity.java   | 2 --
 .../nrw/commons/contributions/ContributionsListFragment.java    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index a84450275..ad6cff606 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -142,7 +142,6 @@ public  class       ContributionsActivity
         setTitle(getString(R.string.title_activity_contributions));
 
         if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
-            Timber.d("setUploadCount()");
             setUploadCount();
         }
 
@@ -286,7 +285,6 @@ public  class       ContributionsActivity
     }
 
     public void betaSetUploadCount(int betaUploadCount){
-        Timber.d("" + betaUploadCount);
         getSupportActionBar().setSubtitle(getResources()
                 .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount));
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index e95b83203..12ced5f75 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -89,10 +89,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     public void setAdapter(ListAdapter adapter) {
         this.contributionsList.setAdapter(adapter);
-        Timber.d("" + adapter.getCount());
 
         if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
-            Timber.d("betaBuild : adapter count -> " + adapter.getCount());
             ((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount());
         }
     }

From c00f755492277f7c73879f232032fff6ebdfac13 Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Sun, 11 Mar 2018 12:36:59 +0530
Subject: [PATCH 12/22]  Removed No description label

---
 app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
index cf596e36e..b86eafdf6 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -45,7 +45,7 @@ class PlaceRenderer extends Renderer<Place> {
         tvName.setText(place.name);
         String descriptionText = place.getLongDescription();
         if (descriptionText.equals("?")) {
-            descriptionText = getContext().getString(R.string.no_description_found);
+            descriptionText = "";
         }
         tvDesc.setText(descriptionText);
         distance.setText(place.distance);

From 21e54ef3d291f3b1620d55366f9997c23baa0115 Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Sun, 11 Mar 2018 14:09:50 +0530
Subject: [PATCH 13/22]  Removed No description label

---
 .../main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
index b86eafdf6..26de3297a 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -44,8 +44,10 @@ class PlaceRenderer extends Renderer<Place> {
         Place place = getContent();
         tvName.setText(place.name);
         String descriptionText = place.getLongDescription();
+        tvDesc.setVisibility(View.VISIBLE);
         if (descriptionText.equals("?")) {
-            descriptionText = "";
+            descriptionText = getContext().getString(R.string.no_description_found);
+            tvDesc.setVisibility(View.INVISIBLE);
         }
         tvDesc.setText(descriptionText);
         distance.setText(place.distance);

From 1d8659e91d21a8c03ac051fba50bfb5695901b49 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Sun, 11 Mar 2018 20:58:40 +0530
Subject: [PATCH 14/22] Update Issue Template

---
 ISSUE_TEMPLATE.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d8ef17752..368e59b97 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -33,3 +33,7 @@ You can find this information by going to the navigation drawer in the app and t
 **Screen-shots:** 
 
 Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher.
+
+**Would you like to work on the issue?**
+
+Please let us know if you can work on it or the issue should be assigned to someone else.

From ad97ad24d4c05da90e5cc65a1c0930c6a15e0b0f Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Mon, 12 Mar 2018 02:54:59 +0530
Subject: [PATCH 15/22] Fixes app crash when tutorial mode in landscape mode.

Fixes #1287
---
 app/build.gradle                              |   1 +
 .../res/layout-land/welcome_do_upload.xml     | 152 ++++++++++--------
 .../res/layout-land/welcome_dont_upload.xml   | 122 ++++++++------
 .../res/layout-land/welcome_image_details.xml | 117 ++++++++------
 .../res/layout-land/welcome_wikipedia.xml     | 111 ++++++++-----
 5 files changed, 301 insertions(+), 202 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 550019cc5..15cb7c312 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,6 +99,7 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
 
     compile 'com.borjabravo:readmoretextview:2.1.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index d96b00675..01e5c2af3 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -1,163 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#0c609c"
-              android:gravity="center">
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#0c609c"
+    android:gravity="center"
+    android:orientation="horizontal">
 
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.55" />
 
     <GridLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
         android:columnCount="2"
-        >
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline">
 
         <ImageView
-            android:src="@drawable/mount_zao"
             android:id="@+id/mount_zao"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_mount_zao"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/mount_zao" />
 
         <ImageView
-            android:src="@drawable/llamas"
             android:id="@+id/llamas"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_llamas"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/llamas" />
 
         <ImageView
-            android:src="@drawable/rainbow_bridge"
             android:id="@+id/rainbow_bridge"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_rainbow_bridge"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/rainbow_bridge" />
 
         <ImageView
-            android:src="@drawable/tulip"
             android:id="@+id/tulip"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:scaleType="fitXY"
             android:contentDescription="@string/welcome_image_tulip"
-            />
+            android:scaleType="fitXY"
+            android:src="@drawable/tulip" />
 
     </GridLayout>
 
 
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center_vertical"
-            >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:layout_marginLeft="@dimen/standard_gap"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
         <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_2_text"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text"
-                android:textAlignment="center"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/normal_text"
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_2_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_2_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
-</LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index d950ffc1d..6d954e2d7 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -1,59 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#0c609c"
-    android:gravity="center"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#0c609c">
 
-    <RelativeLayout
-        android:layout_gravity="center"
-        android:layout_width="240dp"
-        android:layout_height="wrap_content"
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
         android:layout_marginEnd="@dimen/standard_gap"
         android:layout_marginRight="@dimen/standard_gap"
-        >
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.50" />
+
+    <LinearLayout
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap">
 
         <ImageView
-            android:src="@drawable/selfie_x"
             android:id="@+id/selfie_x"
             android:layout_width="110dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:contentDescription="@string/welcome_image_no_selfies"
-            />
+            android:src="@drawable/selfie_x" />
 
         <ImageView
-            android:src="@drawable/proprietary_x"
             android:id="@+id/proprietary_x"
-            android:layout_marginStart="@dimen/standard_gap"
-            android:layout_marginLeft="@dimen/standard_gap"
             android:layout_width="110dp"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/selfie_x"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             android:contentDescription="@string/welcome_image_proprietary"
-            />
+            android:src="@drawable/proprietary_x" />
 
-    </RelativeLayout>
+    </LinearLayout>
 
 
-    <LinearLayout android:orientation="vertical"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        >
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
             android:maxWidth="240dp"
             android:text="@string/tutorial_3_text"
-            android:layout_gravity="center"
-            android:textStyle="bold"
             android:textAlignment="center"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/normal_text"
-            android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -64,51 +87,49 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_3_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_3_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:layout_gravity="center"
+            android:maxWidth="240dp"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_3_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -121,24 +142,23 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_3_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index 79f48829b..e7d704e15 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -1,42 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#0c609c"
     android:gravity="center"
-    >
+    android:orientation="horizontal">
 
-    <ImageView
+    <TextView
+        android:id="@+id/welcomeYesButton"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/sydney_opera_house"
-        android:paddingLeft="@dimen/large_gap"
-        android:paddingRight="@dimen/standard_gap"
-        android:paddingTop="@dimen/large_gap"
-        android:paddingBottom="@dimen/large_gap"
-        android:adjustViewBounds="true"
-        android:layout_gravity="center"
-        android:contentDescription="@string/welcome_image_sydney_opera_house"
-        />
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout android:orientation="vertical"
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        >
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.60" />
+
+    <ImageView
+        android:layout_width="370dp"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"
+        android:paddingBottom="@dimen/large_gap"
+        android:paddingLeft="@dimen/tiny_gap"
+        android:paddingStart="@dimen/tiny_gap"
+        android:paddingRight="@dimen/standard_gap"
+        android:paddingEnd="@dimen/standard_gap"
+        android:paddingTop="@dimen/large_gap"
+        android:src="@drawable/sydney_opera_house"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
             android:maxWidth="240dp"
             android:text="@string/tutorial_4_text"
-            android:layout_gravity="center"
-            android:textStyle="bold"
             android:textAlignment="center"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/normal_text"
-            android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -47,23 +77,22 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
                 android:paddingTop="@dimen/standard_gap"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_4_subtext_1"
                 android:layout_gravity="center"
-                android:textAlignment="textStart"
-                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:maxWidth="240dp"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/tutorial_4_subtext_1"
+                android:textAlignment="textStart"
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -76,21 +105,20 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_4_subtext_2"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
@@ -103,24 +131,23 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/bullet"
                 android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
+                android:text="@string/bullet"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="start"
                 android:maxWidth="240dp"
                 android:text="@string/tutorial_4_subtext_3"
-                android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:gravity="start"
-                android:textColor="@android:color/white"
-                />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index b4fbe9048..73b96fc14 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -1,51 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#0c609c"
-              android:gravity="center"
-        >
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#0c609c">
+
+    <TextView
+        android:id="@+id/welcomeYesButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:text="@string/welcome_skip_button"
+        android:textColor="#fff"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.support.constraint.Guideline
+        android:id="@+id/center_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.50" />
+
 
     <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_welcome_wikipedia"
+        android:src="@drawable/welcome_wikipedia"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/center_guideline"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_1_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/normal_text"
+            android:textStyle="bold" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/welcome_wikipedia"
-            android:layout_marginEnd="@dimen/standard_gap"
-            android:layout_marginRight="@dimen/standard_gap"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/welcome_image_welcome_wikipedia"
-        />
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center_vertical"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_1_text"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text"
-                android:textAlignment="center"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"/>
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/tutorial_1_subtext"
-                android:layout_gravity="center"
-                android:textAlignment="center"
-                android:paddingTop="@dimen/standard_gap"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"
-            />
+            android:maxWidth="240dp"
+            android:paddingTop="@dimen/standard_gap"
+            android:text="@string/tutorial_1_subtext"
+            android:textAlignment="center"
+            android:textColor="@android:color/white" />
     </LinearLayout>
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>

From 87b794ce1f65baec423af0b91c6aea02877b0ca8 Mon Sep 17 00:00:00 2001
From: yashshah7197 <yash.shah7197@live.com>
Date: Mon, 12 Mar 2018 18:06:04 +0530
Subject: [PATCH 16/22] feat: Add checks for title and description in intent
 extras.

In case other apps want to send a title and description along with the
image, we check if those have been passed as intent extras and set the
EditText values accordingly.

Fixes: #1273
See also: #892
---
 .../fr/free/nrw/commons/upload/SingleUploadFragment.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 6a6083403..a11e7066c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -101,6 +101,14 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
         View rootView = inflater.inflate(R.layout.fragment_single_upload, container, false);
         ButterKnife.bind(this, rootView);
 
+        Intent activityIntent = getActivity().getIntent();
+        if (activityIntent.hasExtra("title")) {
+            titleEdit.setText(activityIntent.getStringExtra("title"));
+        }
+        if (activityIntent.hasExtra("description")) {
+            descEdit.setText(activityIntent.getStringExtra("description"));
+        }
+
         ArrayList<String> licenseItems = new ArrayList<>();
         licenseItems.add(getString(R.string.license_name_cc0));
         licenseItems.add(getString(R.string.license_name_cc_by));

From 57a2ce20cd915550ce7611816d554c47a44b87b8 Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Tue, 13 Mar 2018 16:11:28 +0530
Subject: [PATCH 17/22] Fixes orientation change canceling the ongoing login
 process.

Fixes #1294
---
 .../free/nrw/commons/auth/LoginActivity.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index 8a41664a9..8978b725c 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -83,6 +83,9 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     private AppCompatDelegate delegate;
     private LoginTextWatcher textWatcher = new LoginTextWatcher();
 
+    private Boolean loginCurrentlyInProgress = false;
+    private static final String LOGING_IN = "logingIn";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setTheme(Utils.isDarkTheme(this) ? R.style.DarkAppTheme : R.style.LightAppTheme);
@@ -175,6 +178,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     }
 
     private void performLogin() {
+        loginCurrentlyInProgress = true;
         Timber.d("Login to start!");
         final String username = canonicializeUsername(usernameEdit.getText().toString());
         final String password = passwordEdit.getText().toString();
@@ -205,6 +209,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         if (result.equals("PASS")) {
             handlePassResult(username, password);
         } else {
+            loginCurrentlyInProgress = false;
             handleOtherResults(result);
         }
     }
@@ -327,6 +332,21 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         return getDelegate().getMenuInflater();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(LOGING_IN, loginCurrentlyInProgress);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGING_IN, false);
+        if(loginCurrentlyInProgress){
+            performLogin();
+        }
+    }
+
     public void askUserForTwoFactorAuth() {
         progressDialog.dismiss();
         twoFactorContainer.setVisibility(VISIBLE);

From a984a302c0a26307de30a0384cc00a67f6283f54 Mon Sep 17 00:00:00 2001
From: Madhur Gupta <madhurgupta10@gmail.com>
Date: Tue, 13 Mar 2018 22:34:39 +0530
Subject: [PATCH 18/22] Fix Underline Tag Bug in About Page

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c7494751..4b343bce2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,8 +85,8 @@
   <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
   <string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
-  <string name="about_privacy_policy"><![CDATA[<u>Privacy policy</u>]]></string>
-  <string name="about_credits"><![CDATA[<u>Credits</u>]]></string>
+  <string name="about_privacy_policy"><u>Privacy policy</u></string>
+  <string name="about_credits"><u>Credits</u></string>
   <string name="title_activity_about">About</string>
   <string name="menu_feedback">Send Feedback (via Email)</string>
   <string name="no_email_client">No email client installed</string>

From 9f621539c7eff87a4ddfaf3387aec41842494ff2 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Wed, 14 Mar 2018 14:47:00 +0530
Subject: [PATCH 19/22] Added showSnackbar in ViewUtil and shown in
 NearbyActivity

---
 .../fr/free/nrw/commons/nearby/NearbyActivity.java    |  8 +++++---
 .../main/java/fr/free/nrw/commons/utils/ViewUtil.java | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index 7aecee337..9458c9367 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -274,7 +274,8 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         LatLng lastLocation = locationManager.getLastLocation();
         if (curLatLang != null && curLatLang.equals(lastLocation)) { //refresh view only if location has changed
             if (isHardRefresh) {
-                ViewUtil.showLongToast(this, R.string.nearby_location_has_not_changed);
+//                ViewUtil.showLongToast(this, R.string.nearby_location_has_not_changed);
+                ViewUtil.showSnackbar(findViewById(R.id.container), R.string.nearby_location_has_not_changed);
             }
             return;
         }
@@ -302,8 +303,9 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
 
         if (placeList.size() == 0) {
             int duration = Toast.LENGTH_SHORT;
-            Toast toast = Toast.makeText(this, R.string.no_nearby, duration);
-            toast.show();
+            ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby);
+//            Toast toast = Toast.makeText(this, R.string.no_nearby, duration);
+//            toast.show();
         }
 
         bundle.clear();
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
index f2a02398f..aa95006fc 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
@@ -2,6 +2,8 @@ package fr.free.nrw.commons.utils;
 
 import android.content.Context;
 import android.support.annotation.StringRes;
+import android.support.design.widget.Snackbar;
+import android.view.View;
 import android.widget.Toast;
 
 public class ViewUtil {
@@ -9,4 +11,13 @@ public class ViewUtil {
     public static void showLongToast(final Context context, @StringRes final int stringResId) {
         ExecutorUtils.uiExecutor().execute(() -> Toast.makeText(context, context.getString(stringResId), Toast.LENGTH_LONG).show());
     }
+
+    public static void showLongSnackbar(View view, String message) {
+        Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();
+    }
+
+    public static void showSnackbar(View view, int messageResourceId) {
+        Snackbar.make(view, messageResourceId, Snackbar.LENGTH_SHORT).show();
+    }
+
 }

From 72a384de92f91078310b309344af357657c47c40 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Wed, 14 Mar 2018 14:53:12 +0530
Subject: [PATCH 20/22] Update ISSUE_TEMPLATE.md

---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 368e59b97..691562b04 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -36,4 +36,4 @@ Can be created by pressing the Volume Down and Power Button at the same time on
 
 **Would you like to work on the issue?**
 
-Please let us know if you can work on it or the issue should be assigned to someone else.
+Please let us know whether you want to fix the issue by yourself. If not, anyone can get the issue assigned to them.

From 71535c312e8beca88f96b42fd84dfce1fed30db5 Mon Sep 17 00:00:00 2001
From: Meghna Gupta <meghnagupta64@gmail.com>
Date: Fri, 16 Mar 2018 00:31:46 +0530
Subject: [PATCH 21/22] Removes unsupported clients while sharing log

---
 .../commons/settings/SettingsFragment.java    | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
index c7ee3df48..741905e30 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
@@ -3,10 +3,13 @@ package fr.free.nrw.commons.settings;
 import android.Manifest;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,6 +24,8 @@ import android.support.v4.content.FileProvider;
 import android.widget.Toast;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -141,19 +146,24 @@ public class SettingsFragment extends PreferenceFragment {
                 appLogsFile
         );
 
-        Intent feedbackIntent = new Intent(Intent.ACTION_SEND);
-        feedbackIntent.setType("message/rfc822");
-        feedbackIntent.putExtra(Intent.EXTRA_EMAIL,
-                new String[]{CommonsApplication.LOGS_PRIVATE_EMAIL});
-        feedbackIntent.putExtra(Intent.EXTRA_SUBJECT,
-                String.format(CommonsApplication.FEEDBACK_EMAIL_SUBJECT,
-                        BuildConfig.VERSION_NAME));
-        feedbackIntent.putExtra(Intent.EXTRA_STREAM,appLogsFilePath);
+        //initialize the emailSelectorIntent
+        Intent emailSelectorIntent = new Intent(Intent.ACTION_SENDTO);
+        emailSelectorIntent.setData(Uri.parse("mailto:"));
+        //initialize the emailIntent
+        final Intent emailIntent = new Intent(Intent.ACTION_SEND);
+        emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{CommonsApplication.FEEDBACK_EMAIL});
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(CommonsApplication.FEEDBACK_EMAIL_SUBJECT, BuildConfig.VERSION_NAME));
+        emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        emailIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        emailIntent.setSelector( emailSelectorIntent );
+        //adding the attachment to the intent
+        emailIntent.putExtra(Intent.EXTRA_STREAM, appLogsFilePath);
 
         try {
-            startActivity(feedbackIntent);
+            startActivity(Intent.createChooser(emailIntent, "Send mail.."));
         } catch (ActivityNotFoundException e) {
             Toast.makeText(getActivity(), R.string.no_email_client, Toast.LENGTH_SHORT).show();
         }
     }
+
 }

From 9a85fb51f7f1059246b28ae36373a95d66426216 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Fri, 16 Mar 2018 15:35:58 +0530
Subject: [PATCH 22/22] Removed unnecessary functions

---
 .../fr/free/nrw/commons/nearby/NearbyActivity.java    |  4 ----
 .../main/java/fr/free/nrw/commons/utils/ViewUtil.java | 11 -----------
 2 files changed, 15 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index 9458c9367..399af35a9 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -274,7 +274,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         LatLng lastLocation = locationManager.getLastLocation();
         if (curLatLang != null && curLatLang.equals(lastLocation)) { //refresh view only if location has changed
             if (isHardRefresh) {
-//                ViewUtil.showLongToast(this, R.string.nearby_location_has_not_changed);
                 ViewUtil.showSnackbar(findViewById(R.id.container), R.string.nearby_location_has_not_changed);
             }
             return;
@@ -302,10 +301,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
         String gsonCurLatLng = gson.toJson(curLatLang);
 
         if (placeList.size() == 0) {
-            int duration = Toast.LENGTH_SHORT;
             ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby);
-//            Toast toast = Toast.makeText(this, R.string.no_nearby, duration);
-//            toast.show();
         }
 
         bundle.clear();
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
index aa95006fc..82227c59a 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
@@ -1,21 +1,10 @@
 package fr.free.nrw.commons.utils;
 
-import android.content.Context;
-import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.view.View;
-import android.widget.Toast;
 
 public class ViewUtil {
 
-    public static void showLongToast(final Context context, @StringRes final int stringResId) {
-        ExecutorUtils.uiExecutor().execute(() -> Toast.makeText(context, context.getString(stringResId), Toast.LENGTH_LONG).show());
-    }
-
-    public static void showLongSnackbar(View view, String message) {
-        Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();
-    }
-
     public static void showSnackbar(View view, int messageResourceId) {
         Snackbar.make(view, messageResourceId, Snackbar.LENGTH_SHORT).show();
     }