Merge branch 'master' of https://github.com/commons-app/apps-android-commons into notification_read

Author: vanshikaarora

app/build.gradle

@@ -66,6 +66,7 @@ dependencies {
     // Android testing
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.1'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.annotation:annotation:1.0.2'

app/proguard-rules.txt

@@ -5,9 +5,10 @@
 -dontwarn net.bytebuddy.**
 -dontwarn org.mockito.**
 
+# --- Apache ---
 -keep class org.apache.http.** { *; }
--dontwarn org.apache.http.**
--keep class android.support.v7.widget.ShareActionProvider { *; }
+-dontwarn org.apache.**
+# --- /Apache ---
 
 # --- Butter Knife ---
 # Finder.castParam() is stripped when not needed and ProGuard notes it

app/src/androidTest/java/fr/free/nrw/commons/NavigationBaseActivityTest.java

@@ -0,0 +1,67 @@
+package fr.free.nrw.commons;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.espresso.contrib.DrawerActions;
+import androidx.test.espresso.contrib.NavigationViewActions;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class NavigationBaseActivityTest {
+    @Rule
+    public ActivityTestRule activityRule = new ActivityTestRule<>(AboutActivity.class);
+
+    /**
+     * Goes through all the activities in the app and checks we don't crash
+     * NB: This is not realistic if we're not logged in; we can access 'home', 'notifications', 'settings' and 'achievements' which we wouldn't otherwise be able to.
+     */
+    @Test
+    public void goThroughNavigationBaseActivityActivities() {
+        // Home
+        openNavigationDrawerAndNavigateTo(R.id.action_home);
+
+        // Explore
+        openNavigationDrawerAndNavigateTo(R.id.action_explore);
+
+        // Bookmarks
+        openNavigationDrawerAndNavigateTo(R.id.action_bookmarks);
+
+        // About
+        openNavigationDrawerAndNavigateTo(R.id.action_about);
+
+        // Settings
+        openNavigationDrawerAndNavigateTo(R.id.action_settings);
+
+        // Achievements
+        openNavigationDrawerAndNavigateTo(R.id.action_login);
+    }
+
+    /**
+     * Clicks 'Explore' in the navigation drawer twice, then clicks 'home'
+     * Testing to avoid regression of #2200
+     */
+    @Test
+    public void doubleNavigateToExploreThenReturnHome() {
+        // Explore
+        openNavigationDrawerAndNavigateTo(R.id.action_explore);
+
+        // Explore
+        openNavigationDrawerAndNavigateTo(R.id.action_explore);
+
+        // Home
+        openNavigationDrawerAndNavigateTo(R.id.action_home);
+    }
+
+    public void openNavigationDrawerAndNavigateTo(int menuItemId) {
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
+        onView(withId(R.id.navigation_view)).perform(NavigationViewActions.navigateTo(menuItemId));
+    }
+}

app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt

@@ -0,0 +1,37 @@
+package fr.free.nrw.commons
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import fr.free.nrw.commons.utils.ConfigUtils
+import org.hamcrest.core.IsNot.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class WelcomeActivityTest {
+    @get:Rule
+    var activityRule: ActivityTestRule<*> = ActivityTestRule(WelcomeActivity::class.java)
+
+    @Test
+    fun ifBetaShowsSkipButton() {
+        if (ConfigUtils.isBetaFlavour()) {
+            onView(withId(R.id.finishTutorialButton))
+                    .check(matches(isDisplayed()))
+        }
+    }
+
+    @Test
+    fun ifProdHidesSkipButton() {
+        if (!ConfigUtils.isBetaFlavour()) {
+            onView(withId(R.id.finishTutorialButton))
+                    .check(matches(not(isDisplayed())))
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -109,6 +109,11 @@
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.MainActivity" />
 
+        <activity
+            android:name=".explore.categories.ExploreActivity"
+            android:label="@string/title_activity_explore"
+            android:parentActivityName=".contributions.MainActivity" />
+
         <activity
             android:name=".explore.SearchActivity"
             android:label="@string/title_activity_search"

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -39,6 +39,7 @@ public Media[] newArray(int i) {
     protected String imageUrl;
     protected String filename;
     protected String description; // monolingual description on input...
+    protected String discussion;
     protected long dataLength;
     protected Date dateCreated;
     protected @Nullable Date dateUploaded;
@@ -195,6 +196,22 @@ public void setFilename(String filename) {
         this.filename = filename;
     }
 
+    /**
+     * Sets the discussion of the file.
+     * @param discussion
+     */
+    public void setDiscussion(String discussion) {
+        this.discussion = discussion;
+    }
+
+    /**
+     * Gets the file discussion as a string.
+     * @return file discussion as a string
+     */
+    public String getDiscussion() {
+        return discussion;
+    }
+
     /**
      * Gets the file description.
      * @return file description as a string

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons;
 
+import android.text.Html;
 import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
@@ -39,6 +40,7 @@ public class MediaDataExtractor {
     private boolean deletionStatus;
     private ArrayList<String> categories;
     private Map<String, String> descriptions;
+    private String discussion;
     private String license;
     private @Nullable LatLng coordinates;
 
@@ -48,6 +50,7 @@ public MediaDataExtractor(MediaWikiApi mwApi) {
         this.descriptions = new HashMap<>();
         this.fetched = false;
         this.mediaWikiApi = mwApi;
+        this.discussion = new String();
     }
 
     /*
@@ -70,6 +73,9 @@ public void fetch(String filename, LicenseList licenseList) throws IOException {
         }
 
         MediaResult result = mediaWikiApi.fetchMediaByFilename(filename);
+        MediaResult discussion = mediaWikiApi.fetchMediaByFilename(filename.replace("File", "File talk"));
+        setDiscussion(discussion.getWikiSource());
+
 
         // In-page category links are extracted from source, as XML doesn't cover [[links]]
         extractCategories(result.getWikiSource());
@@ -94,6 +100,14 @@ private void extractCategories(String source) {
         }
     }
 
+    private void setDiscussion(String source) {
+        try {
+            discussion = Html.fromHtml(mediaWikiApi.parseWikicode(source)).toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void processWikiParseTree(String source, LicenseList licenseList) throws IOException {
         Document doc;
         try {
@@ -307,6 +321,7 @@ public void fill(Media media) {
         media.setCategories(categories);
         media.setDescriptions(descriptions);
         media.setCoordinates(coordinates);
+        media.setDiscussion(discussion);
         if (license != null) {
             media.setLicense(license);
         }

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

@@ -363,8 +363,7 @@ private void inflateAchievements(Achievements achievements) {
      */
     public static void startYourself(Context context) {
         Intent intent = new Intent(context, AchievementsActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         context.startActivity(intent);
     }
 

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -41,10 +41,9 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
-import fr.free.nrw.commons.category.CategoryImagesActivity;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
@@ -63,8 +62,6 @@
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
-    private static final String FEATURED_IMAGES_CATEGORY = "Category:Featured_pictures_on_Wikimedia_Commons";
-
     @Inject MediaWikiApi mwApi;
     @Inject SessionManager sessionManager;
     @Inject
@@ -155,7 +152,7 @@ public void onCreate(Bundle savedInstanceState) {
      */
     private void skipLogin() {
         applicationKvStore.putBoolean("login_skipped", true);
-        CategoryImagesActivity.startYourself(this, getString(R.string.title_activity_explore), FEATURED_IMAGES_CATEGORY);
+        ExploreActivity.startYourself(this);
         finish();
 
     }

app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java

@@ -25,6 +25,7 @@
 import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
@@ -251,6 +252,11 @@ private void handleSuccess(List<Media> collection) {
             }catch (Exception e){
                 e.printStackTrace();
             }
+            try {
+                ((ExploreActivity) getContext()).viewPagerNotifyDataSetChanged();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
         progressBar.setVisibility(GONE);
         isLoading = false;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java

@@ -42,6 +42,10 @@ public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {
     private static final ContentValues[] EMPTY = {};
     private static int COMMIT_THRESHOLD = 10;
 
+    // Arbitrary limit to cap the number of contributions to ever load. This is a maximum built
+    // into the app, rather than the user's setting. Also see Github issue #52.
+    public static final int ABSOLUTE_CONTRIBUTIONS_LOAD_LIMIT = 500;
+
     @SuppressWarnings("WeakerAccess")
     @Inject MediaWikiApi mwApi;
     @Inject
@@ -52,13 +56,6 @@ public ContributionsSyncAdapter(Context context, boolean autoInitialize) {
         super(context, autoInitialize);
     }
 
-    private int getLimit() {
-
-        int limit = 500;
-        Timber.d("Max number of uploads set to %d", limit);
-        return limit; // FIXME: Parameterize!
-    }
-
     private boolean fileExists(ContentProviderClient client, String filename) {
         if (filename == null) {
             return false;
@@ -100,7 +97,7 @@ public void onPerformSync(Account account, Bundle bundle, String authority,
         while (!done) {
 
             try {
-                result = mwApi.logEvents(user, lastModified, queryContinue, getLimit());
+                result = mwApi.logEvents(user, lastModified, queryContinue, ABSOLUTE_CONTRIBUTIONS_LOAD_LIMIT);
             } catch (IOException e) {
                 // There isn't really much we can do, eh?
                 // FIXME: Perhaps add EventLogging?

app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java

@@ -13,6 +13,7 @@
 import fr.free.nrw.commons.category.CategoryImagesActivity;
 import fr.free.nrw.commons.explore.SearchActivity;
 
+import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
 import fr.free.nrw.commons.upload.UploadActivity;
@@ -54,6 +55,9 @@ public abstract class ActivityBuilderModule {
     @ContributesAndroidInjector
     abstract CategoryDetailsActivity bindCategoryDetailsActivity();
 
+    @ContributesAndroidInjector
+    abstract ExploreActivity bindExploreActivity();
+
     @ContributesAndroidInjector
     abstract AchievementsActivity bindAchievementsActivity();