mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 05:43:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 2.10 with master & Fixed merge conflicts (#2844)

Browse source
This commit is contained in:
Ashish Kumar 2019-04-03 22:39:54 +05:30 • committed by Josephine Lim
parent 02ad3b2dc8
commit 08a555c095
18 changed files with 172 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -259,10 +259,6 @@ public class Contribution extends Media {
return "{{self|cc-by-sa-4.0}}";
case Prefs.Licenses.CC0:
return "{{self|cc-zero}}";
case Prefs.Licenses.CC_BY:
return "{{self|cc-by-3.0}}";
case Prefs.Licenses.CC_BY_SA:
return "{{self|cc-by-sa-3.0}}";
}
throw new RuntimeException("Unrecognized license value: " + license);

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

@ -9,10 +9,9 @@ import android.net.Uri;
import android.os.RemoteException;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import fr.free.nrw.commons.settings.Prefs;
import org.apache.commons.lang3.StringUtils;
import fr.free.nrw.commons.settings.Prefs;
import java.util.Date;
import javax.inject.Inject;
import javax.inject.Named;
@ -320,7 +319,7 @@ public class ContributionDao {
try {
db.execSQL(query);
} catch (SQLiteException e) {
Timber.e(e, "Exception performing query: " + query);
Timber.e("Exception performing query: " + query + " message: " + e.getMessage());
}
}