Fixes #1545 Top crashes on Play Store for v2.7.1 [A and E]

ISSUE_TEMPLATE.md

@@ -1,25 +1,18 @@
-_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
-
 **Summary:** 
 
 Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
 
+_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
+
 **Steps to reproduce:** 
 
-How can we reproduce the issue?
+How can we reproduce the issue? 
+What did you expect the app to do, and what did you see instead?
 
 **Add System logs:**
 
 Add logcat files here (if possible).
 
-**Expected behavior:** 
-
-What did you expect the App to do?
-
-**Observed behavior:** 
-
-What did you see instead?  Describe your issue in detail here.
-
 **Device and Android version:** 
 
 What make and model device (e.g., Samsung J7) did you encounter this on?  What Android
@@ -28,7 +21,7 @@ version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are yo
 
  **Commons app version:** 
 
-You can find this information by going to the navigation drawer in the app and tapping 'About'
+You can find this information by going to the navigation drawer in the app and tapping 'About'. If you are building from our codebase instead of downloading the app, please also mention the branch and build variant (e.g. master and prodDebug).
 
 **Screen-shots:** 
 

app/build.gradle

@@ -7,6 +7,8 @@ apply from: 'quality.gradle'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 dependencies {
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.prof.rssparser:rssparser:1.1'
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'in.yuvi:http.fluent:1.3'
@@ -23,44 +25,33 @@ dependencies {
     implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
         transitive = true
     }
-
-    implementation "com.github.deano2390:MaterialShowcaseView:1.2.0"
-
+    implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
-
     implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
-
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
-
     implementation 'com.squareup.okhttp3:okhttp:3.9.1'
     implementation 'com.squareup.okio:okio:1.13.0'
-
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
     implementation 'com.android.support:multidex:1.0.3'
-
     implementation 'io.reactivex.rxjava2:rxjava:2.1.2'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.0.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.0.0'
-
     implementation 'org.jsoup:jsoup:1.11.3'
-
     implementation 'com.facebook.fresco:fresco:1.5.0'
     implementation 'com.facebook.stetho:stetho:1.5.0'
-
     implementation "com.google.dagger:dagger:$DAGGER_VERSION"
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-
-    testImplementation "org.robolectric:multidex:3.4.2"
+    testImplementation 'org.robolectric:multidex:3.4.2'
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testImplementation 'junit:junit:4.12'
@@ -134,6 +125,7 @@ android {
     flavorDimensions 'tier'
     productFlavors {
         prod {
+            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
@@ -151,6 +143,7 @@ android {
 
         beta {
             // What values do we need to hit the BETA versions of the site / api ?
+            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""

app/src/main/AndroidManifest.xml

@@ -165,6 +165,16 @@
             android:label="@string/provider_categories"
             android:syncable="false" />
 
+        <receiver android:name=".widget.PicOfDayAppWidget">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/pic_of_day_app_widget_info" />
+        </receiver>
+
     </application>
 
 </manifest>

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

@@ -9,9 +9,6 @@
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.style.UnderlineSpan;
-import android.util.Log;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.content.ContextCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -20,16 +17,13 @@
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.ui.widget.HtmlTextView;
 
-import static android.widget.Toast.LENGTH_SHORT;
-
 /**
  * Represents about screen of this app
  */

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

@@ -20,14 +20,14 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.SessionManager;
 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.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.upload.FileUtils;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
@@ -69,7 +69,6 @@ public class CommonsApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-
         ApplicationlessInjection
                 .getInstance(this)
                 .getCommonsApplicationComponent()
@@ -82,6 +81,8 @@ public void onCreate() {
         if (setupLeakCanary() == RefWatcher.DISABLED) {
             return;
         }
+        // Empty temp directory in case some temp files are created and never removed.
+        ContributionUtils.emptyTemporaryDirectory();
 
         Timber.plant(new Timber.DebugTree());
 

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

@@ -4,7 +4,6 @@
 import android.accounts.AccountAuthenticatorActivity;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -24,7 +23,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;

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

@@ -14,7 +14,6 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
-import timber.log.Timber;
 
 /**
  * This activity displays pictures of a particular category

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

@@ -46,6 +46,7 @@ public Contribution[] newArray(int i) {
     private String decimalCoords;
     private boolean isMultiple;
     private String wikiDataEntityId;
+    private Uri contentProviderUri;
 
     public Contribution(Uri contentUri, String filename, Uri localUri, String imageUrl, Date timestamp,
                         int state, long dataLength, Date dateUploaded, long transferred,
@@ -236,4 +237,12 @@ public String getWikiDataEntityId() {
     public void setWikiDataEntityId(String wikiDataEntityId) {
         this.wikiDataEntityId = wikiDataEntityId;
     }
+
+    public void setContentProviderUri(Uri contentProviderUri) {
+        this.contentProviderUri = contentProviderUri;
+    }
+
+    public Uri getContentProviderUri() {
+        return contentProviderUri;
+    }
 }

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

@@ -7,6 +7,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.FileProvider;
@@ -29,7 +30,7 @@
 public class ContributionController {
 
     private static final int SELECT_FROM_GALLERY = 1;
-    private static final int SELECT_FROM_CAMERA = 2;
+    public static final int SELECT_FROM_CAMERA = 2;
 
     private Fragment fragment;
 
@@ -91,7 +92,7 @@ public void startGalleryPick() {
         fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
     }
 
-    public void handleImagePicked(int requestCode, Intent data, boolean isDirectUpload, String wikiDataEntityId) {
+    public void handleImagePicked(int requestCode, @Nullable Uri uri, boolean isDirectUpload, String wikiDataEntityId) {
         Timber.d("Is direct upload %s and the Wikidata entity ID is %s", isDirectUpload, wikiDataEntityId);
         FragmentActivity activity = fragment.getActivity();
         Timber.d("handleImagePicked() called with onActivityResult()");
@@ -100,7 +101,7 @@ public void handleImagePicked(int requestCode, Intent data, boolean isDirectUplo
         switch (requestCode) {
             case SELECT_FROM_GALLERY:
                 //Handles image picked from gallery
-                Uri imageData = data.getData();
+                Uri imageData = uri;
                 shareIntent.setType(activity.getContentResolver().getType(imageData));
                 shareIntent.putExtra(EXTRA_STREAM, imageData);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_GALLERY);

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

@@ -8,7 +8,6 @@
 import android.os.RemoteException;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 
 import java.util.Date;
 

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

@@ -36,6 +36,7 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.upload.UploadService;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -144,6 +145,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
             setUploadCount();
         }
+
     }
 
     @Override
@@ -188,6 +190,9 @@ public void deleteUpload(int i) {
         Contribution c = contributionDao.fromCursor(allContributions);
         if (c.getState() == STATE_FAILED) {
             Timber.d("Deleting failed contrib %s", c.toString());
+            // If upload fails and then user decides to cancel upload at all, which means contribution
+            // object will be deleted. So we have to delete temp file for that contribution.
+            ContributionUtils.removeTemporaryFile(c.getLocalUri());
             contributionDao.delete(c);
         } else {
             Timber.d("Skipping deletion for non-failed contrib %s", c.toString());

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

@@ -3,12 +3,13 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,6 +33,7 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.nearby.NearbyActivity;
+import fr.free.nrw.commons.utils.ContributionUtils;
 import timber.log.Timber;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -48,8 +50,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
     TextView waitingMessage;
     @BindView(R.id.loadingContributionsProgressBar)
     ProgressBar progressBar;
-    @BindView(R.id.swipeRefreshLayout)
-    SwipeRefreshLayout swipeRefreshLayout;
 
     @Inject
     @Named("prefs")
@@ -67,13 +67,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         ButterKnife.bind(this, v);
 
         contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
-        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                ((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged();
-                swipeRefreshLayout.setRefreshing(false);
-            }
-        });
         if (savedInstanceState != null) {
             Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position"));
             contributionsList.setSelection(savedInstanceState.getInt("grid-position"));
@@ -127,7 +120,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
-            controller.handleImagePicked(requestCode, data, false, null);
+            if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
+                // If coming from camera, pass null as uri. Because camera photos get saved to a
+                // fixed directory
+                controller.handleImagePicked(requestCode, null, false, null);
+            } else {
+                controller.handleImagePicked(requestCode, data.getData(), false, null);
+            }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);

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

@@ -6,20 +6,16 @@
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
 
-import com.google.gson.Gson;
-
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
 
-import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.location.LocationServiceManager;
-import fr.free.nrw.commons.mwapi.ApacheHttpClientMediaWikiApi;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.NearbyPlaces;
 import fr.free.nrw.commons.upload.UploadController;

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -35,9 +35,6 @@
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 import fr.free.nrw.commons.License;
 import fr.free.nrw.commons.LicenseList;
 import fr.free.nrw.commons.Media;