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

Tidying up code

Browse source
This commit is contained in:
misaochan 2018-05-15 20:41:15 +10:00
parent e62022ab55
commit b1c3e8a0ac
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -394,7 +394,7 @@ public class ShareActivity
private void showFABMenu() { private void showFABMenu() {
isFABOpen=true; isFABOpen=true;
if( imageObj != null && imageObj.imageCoordsExists == true) if( imageObj != null && imageObj.imageCoordsExists)
maps_fragment.setVisibility(View.VISIBLE); maps_fragment.setVisibility(View.VISIBLE);
zoomInButton.setVisibility(View.VISIBLE); zoomInButton.setVisibility(View.VISIBLE);
@ -482,12 +482,10 @@ public class ShareActivity
ExistingFileAsync fileAsyncTask = ExistingFileAsync fileAsyncTask =
new ExistingFileAsync(new WeakReference<Activity>(this), fileSHA1, new WeakReference<Context>(this), result -> { new ExistingFileAsync(new WeakReference<Activity>(this), fileSHA1, new WeakReference<Context>(this), result -> {
Timber.d("%s duplicate check: %s", mediaUri.toString(), result); Timber.d("%s duplicate check: %s", mediaUri.toString(), result);
duplicateCheckPassed = (result == DUPLICATE_PROCEED duplicateCheckPassed = (result == DUPLICATE_PROCEED || result == NO_DUPLICATE);
|| result == NO_DUPLICATE);
/* //TODO: 16/9/17 should we run DetectUnwantedPicturesAsync if DUPLICATE_PROCEED is returned? Since that means
TODO: 16/9/17 should we run DetectUnwantedPicturesAsync if DUPLICATE_PROCEED is returned? Since that means //we are processing images that are already on server???...
we are processing images that are already on server???...
*/
if (duplicateCheckPassed) { if (duplicateCheckPassed) {
//image can be uploaded, so now check if its a useless picture or not //image can be uploaded, so now check if its a useless picture or not
@ -500,7 +498,6 @@ public class ShareActivity
Timber.d(e, "IO Exception: "); Timber.d(e, "IO Exception: ");
} }
} }
getFileMetadata(locationPermitted); getFileMetadata(locationPermitted);
} else { } else {
Timber.w("not ready for preprocessing: useNewPermissions=%s storage=%s location=%s", Timber.w("not ready for preprocessing: useNewPermissions=%s storage=%s location=%s",