Fixed merge conflicts

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

@@ -2,8 +2,10 @@ package fr.free.nrw.commons.contributions;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
@@ -27,6 +29,7 @@ import fr.free.nrw.commons.nearby.NearbyActivity;
 import timber.log.Timber;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 import static android.app.Activity.RESULT_OK;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -34,9 +37,12 @@ import static android.view.View.GONE;
 
 public class ContributionsListFragment extends Fragment {
 
-    @BindView(R.id.contributionsList) GridView contributionsList;
+    @BindView(R.id.contributionsList)
-    @BindView(R.id.waitingMessage) TextView waitingMessage;
+    GridView contributionsList;
-    @BindView(R.id.emptyMessage) TextView emptyMessage;
+    @BindView(R.id.waitingMessage)
+    TextView waitingMessage;
+    @BindView(R.id.emptyMessage)
+    TextView emptyMessage;
     private ContributionController controller;
 
     @Override
@@ -117,7 +123,7 @@ public class ContributionsListFragment extends Fragment {
                             // sees the explanation, try again to request the permission.
 
                             new AlertDialog.Builder(getActivity())
-                                    .setMessage(getString(R.string.storage_permission_rationale))
+                                    .setMessage(getString(R.string.read_storage_permission_rationale))
                                     .setPositiveButton("OK", (dialog, which) -> {
                                         requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1);
                                         dialog.dismiss();
@@ -149,7 +155,42 @@ public class ContributionsListFragment extends Fragment {
 
                 return true;
             case R.id.menu_from_camera:
-                controller.startCameraCapture();
+                SharedPreferences sharedPref = PreferenceManager
+                        .getDefaultSharedPreferences(CommonsApplication.getInstance());
+                boolean useExtStorage = sharedPref.getBoolean("useExternalStorage", true);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && useExtStorage) {
+                    // Here, thisActivity is the current activity
+                    if (ContextCompat.checkSelfPermission(getActivity(), WRITE_EXTERNAL_STORAGE)
+                            != PackageManager.PERMISSION_GRANTED) {
+                        if (shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) {
+                            // Show an explanation to the user *asynchronously* -- don't block
+                            // this thread waiting for the user's response! After the user
+                            // sees the explanation, try again to request the permission.
+                            new AlertDialog.Builder(getActivity())
+                                    .setMessage(getString(R.string.write_storage_permission_rationale))
+                                    .setPositiveButton("OK", (dialog, which) -> {
+                                        requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 3);
+                                        dialog.dismiss();
+                                    })
+                                    .setNegativeButton("Cancel", null)
+                                    .create()
+                                    .show();
+                        } else {
+                            // No explanation needed, we can request the permission.
+                            requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE},
+                                    3);
+                            // MY_PERMISSIONS_WRITE_EXTERNAL_STORAGE is an
+                            // app-defined int constant. The callback method gets the
+                            // result of the request.
+                        }
+                    } else {
+                        controller.startCameraCapture();
+                        return true;
+                    }
+                } else {
+                    controller.startCameraCapture();
+                    return true;
+                }
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -180,6 +221,12 @@ public class ContributionsListFragment extends Fragment {
                 }
             }
             break;
+            case 3: {
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    Timber.d("Call controller.startCameraCapture()");
+                    controller.startCameraCapture();
+                }
+            }
         }
     }
 

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

@@ -158,7 +158,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                 && !(ContextCompat.checkSelfPermission(getContext(),
                 READ_EXTERNAL_STORAGE) == PERMISSION_GRANTED)) {
-            Snackbar.make(getView(), R.string.storage_permission_rationale,
+            Snackbar.make(getView(), R.string.read_storage_permission_rationale,
                     Snackbar.LENGTH_INDEFINITE).setAction(R.string.ok,
                     view -> ActivityCompat.requestPermissions(getActivity(),
                             new String[]{READ_EXTERNAL_STORAGE}, 1)).show();

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

@@ -3,12 +3,14 @@ package fr.free.nrw.commons.upload;
 import android.Manifest;
 import android.content.ContentResolver;
 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.os.Environment;
 import android.os.ParcelFileDescriptor;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
@@ -24,6 +26,7 @@ import android.widget.Toast;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,9 +55,9 @@ import static fr.free.nrw.commons.upload.ExistingFileAsync.Result.NO_DUPLICATE;
  * Activity for the title/desc screen after image is selected. Also starts processing image
  * GPS coordinates or user location (if enabled in Settings) for category suggestions.
  */
-public  class       ShareActivity
+public  class      ShareActivity
-        extends     AuthenticatedActivity
+        extends    AuthenticatedActivity
-        implements  SingleUploadFragment.OnUploadActionInitiated,
+        implements SingleUploadFragment.OnUploadActionInitiated,
         OnCategoriesSaveHandler {
 
     private static final int REQUEST_PERM_ON_CREATE_STORAGE = 1;
@@ -118,7 +121,7 @@ public  class       ShareActivity
         // and permission is not obtained.
         return !FileUtils.isSelfOwned(getApplicationContext(), mediaUri)
                 && (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
-                        != PackageManager.PERMISSION_GRANTED);
+                != PackageManager.PERMISSION_GRANTED);
     }
 
     private void uploadBegins() {
@@ -144,7 +147,7 @@ public  class       ShareActivity
     }
 
     private void showPostUpload() {
-        if(categorizationFragment == null) {
+        if (categorizationFragment == null) {
             categorizationFragment = new CategorizationFragment();
         }
         getSupportFragmentManager().beginTransaction()
@@ -154,7 +157,7 @@ public  class       ShareActivity
 
     @Override
     public void onCategoriesSave(List<String> categories) {
-        if(categories.size() > 0) {
+        if (categories.size() > 0) {
             ModifierSequence categoriesSequence = new ModifierSequence(contribution.getContentUri());
 
             categoriesSequence.queueModifier(new CategoryModifier(categories.toArray(new String[]{})));
@@ -180,7 +183,7 @@ public  class       ShareActivity
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        if(contribution != null) {
+        if (contribution != null) {
             outState.putParcelable("contribution", contribution);
         }
     }
@@ -188,7 +191,7 @@ public  class       ShareActivity
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if(categorizationFragment != null && categorizationFragment.isVisible()) {
+        if (categorizationFragment != null && categorizationFragment.isVisible()) {
             EventLog.schema(CommonsApplication.EVENT_CATEGORIZATION_ATTEMPT)
                     .param("username", app.getCurrentAccount().name)
                     .param("categories-count", categorizationFragment.getCurrentSelectedCount())
@@ -227,7 +230,7 @@ public  class       ShareActivity
         ButterKnife.bind(this);
         initBack();
         app = CommonsApplication.getInstance();
-        backgroundImageView = (SimpleDraweeView)findViewById(R.id.backgroundImage);
+        backgroundImageView = (SimpleDraweeView) findViewById(R.id.backgroundImage);
         backgroundImageView.setHierarchy(GenericDraweeHierarchyBuilder
                 .newInstance(getResources())
                 .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
@@ -253,7 +256,7 @@ public  class       ShareActivity
             backgroundImageView.setImageURI(mediaUri);
         }
 
-        if (savedInstanceState != null)  {
+        if (savedInstanceState != null) {
             contribution = savedInstanceState.getParcelable("contribution");
         }
 
@@ -278,7 +281,7 @@ public  class       ShareActivity
         if (useNewPermissions && (!storagePermitted || !locationPermitted)) {
             if (!storagePermitted && !locationPermitted) {
                 String permissionRationales =
-                        getResources().getString(R.string.storage_permission_rationale) + "\n"
+                        getResources().getString(R.string.read_storage_permission_rationale) + "\n"
                                 + getResources().getString(R.string.location_permission_rationale);
                 snackbar = requestPermissionUsingSnackBar(
                         permissionRationales,
@@ -291,7 +294,7 @@ public  class       ShareActivity
                 textView.setMaxLines(3);
             } else if (!storagePermitted) {
                 requestPermissionUsingSnackBar(
-                        getString(R.string.storage_permission_rationale),
+                        getString(R.string.read_storage_permission_rationale),
                         new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
                         REQUEST_PERM_ON_CREATE_STORAGE);
             } else if (!locationPermitted) {
@@ -306,7 +309,7 @@ public  class       ShareActivity
 
         SingleUploadFragment shareView = (SingleUploadFragment) getSupportFragmentManager().findFragmentByTag("shareView");
         categorizationFragment = (CategorizationFragment) getSupportFragmentManager().findFragmentByTag("categorization");
-        if(shareView == null && categorizationFragment == null) {
+        if (shareView == null && categorizationFragment == null) {
             shareView = new SingleUploadFragment();
             getSupportFragmentManager()
                     .beginTransaction()
@@ -416,12 +419,27 @@ public  class       ShareActivity
             // in older devices getPath() may fail depending on the source URI
             // creating and using a copy of the file seems to work instead.
             // TODO: there might be a more proper solution than this
-            String copyPath = getApplicationContext().getCacheDir().getAbsolutePath()
+            String copyPath = null;
-                    + "/" + new Date().getTime() + ".jpg";
             try {
                 ParcelFileDescriptor descriptor
                         = getContentResolver().openFileDescriptor(mediaUri, "r");
                 if (descriptor != null) {
+                    SharedPreferences sharedPref = PreferenceManager
+                            .getDefaultSharedPreferences(CommonsApplication.getInstance());
+                    boolean useExtStorage = sharedPref.getBoolean("useExternalStorage", true);
+                    if (useExtStorage) {
+                        copyPath = Environment.getExternalStorageDirectory().toString()
+                                + "/CommonsApp/" + new Date().getTime() + ".jpg";
+                        File newFile = new File(Environment.getExternalStorageDirectory().toString() + "/CommonsApp");
+                        newFile.mkdir();
+                        FileUtils.copy(
+                                descriptor.getFileDescriptor(),
+                                copyPath);
+                        Timber.d("Filepath (copied): %s", copyPath);
+                        return copyPath;
+                    }
+                    copyPath = getApplicationContext().getCacheDir().getAbsolutePath()
+                            + "/" + new Date().getTime() + ".jpg";
                     FileUtils.copy(
                             descriptor.getFileDescriptor(),
                             copyPath);
@@ -438,6 +456,7 @@ public  class       ShareActivity
 
     /**
      * Gets coordinates for category suggestions, either from EXIF data or user location
+     *
      * @param gpsEnabled if true use GPS
      */
     private void getFileMetadata(boolean gpsEnabled) {
@@ -473,7 +492,7 @@ public  class       ShareActivity
      * Then initiates the calls to MediaWiki API through an instance of MwVolleyApi.
      */
     public void useImageCoords() {
-        if(decimalCoords != null) {
+        if (decimalCoords != null) {
             Timber.d("Decimal coords of image: %s", decimalCoords);
 
             // Only set cache for this point if image has coords
@@ -507,8 +526,7 @@ public  class       ShareActivity
         try {
             imageObj.unregisterLocationManager();
             Timber.d("Unregistered locationManager");
-        }
+        } catch (NullPointerException e) {
-        catch (NullPointerException e) {
             Timber.d("locationManager does not exist, not unregistered");
         }
     }
@@ -523,7 +541,7 @@ public  class       ShareActivity
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                if(categorizationFragment!=null && categorizationFragment.isVisible()) {
+                if (categorizationFragment != null && categorizationFragment.isVisible()) {
                     categorizationFragment.showBackButtonDialog();
                 } else {
                     onBackPressed();

app/src/main/res/values-ast/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Ensin descripción</string>
   <string name="detail_license_empty">Llicencia desconocida</string>
   <string name="menu_refresh">Refrescar</string>
-  <string name="storage_permission_rationale">Permisu riquíu: llectura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él.</string>
+  <string name="read_storage_permission_rationale">Permisu riquíu: llectura d\'almacenamientu esternu. L\'aplicación nun puede funcionar ensin él.</string>
   <string name="location_permission_rationale">Permisu opcional: llograr l\'allugamientu actual pa suxerir categoríes</string>
   <string name="ok">Aceutar</string>
   <string name="title_activity_nearby">Llugares cercanos</string>

app/src/main/res/values-bn/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">বিবরণ নেই</string>
   <string name="detail_license_empty">অজানা লাইসেন্স</string>
   <string name="menu_refresh">পুনঃসতেজ</string>
-  <string name="storage_permission_rationale">প্রয়োজনীয় অনুমতি: বহিঃস্ত সঞ্চয়স্থান পড়া। এটি ছাড়া অ্যাপ কাজ করবে না।</string>
+  <string name="read_storage_permission_rationale">প্রয়োজনীয় অনুমতি: বহিঃস্ত সঞ্চয়স্থান পড়া। এটি ছাড়া অ্যাপ কাজ করবে না।</string>
   <string name="location_permission_rationale">ঐচ্ছিক অনুমতি: বিষয়শ্রেণী পরামর্শের জন্য বর্তমান অবস্থান নেয়</string>
   <string name="ok">ঠিক আছে</string>
   <string name="title_activity_nearby">কাছাকাছি স্থান</string>

app/src/main/res/values-br/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Deskrivadur ebet</string>
   <string name="detail_license_empty">Aotre-implijout dizanv</string>
   <string name="menu_refresh">Freskaat</string>
-  <string name="storage_permission_rationale">Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro.</string>
+  <string name="read_storage_permission_rationale">Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro.</string>
   <string name="location_permission_rationale">Aotre diret : kaout al lec\'hiadur red evit kinnig rummadoù</string>
   <string name="ok">Mat eo</string>
   <string name="title_activity_nearby">Lec\'hioù nes</string>

app/src/main/res/values-bs/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Nema opisa</string>
   <string name="detail_license_empty">Nepoznata licenca</string>
   <string name="menu_refresh">Osvježi</string>
-  <string name="storage_permission_rationale">Potrebna dozvola: Čitanje vanjske memorije. Aplikacija ne može raditi bez ovog.</string>
+  <string name="read_storage_permission_rationale">Potrebna dozvola: Čitanje vanjske memorije. Aplikacija ne može raditi bez ovog.</string>
   <string name="location_permission_rationale">Neobavezna dozvola: Dobavljanje trenutne lokacije za predlaganje kategorija</string>
   <string name="ok">U redu</string>
   <string name="title_activity_nearby">Mjesta u blizini</string>

app/src/main/res/values-cs/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Bez popisu</string>
   <string name="detail_license_empty">Neznámá licence</string>
   <string name="menu_refresh">Obnovit</string>
-  <string name="storage_permission_rationale">Požadováno oprávnění ke čtení externího úložiště. Aplikace bez toho nemůže pracovat.</string>
+  <string name="read_storage_permission_rationale">Požadováno oprávnění ke čtení externího úložiště. Aplikace bez toho nemůže pracovat.</string>
   <string name="location_permission_rationale">Volitelně: Umožněte aplikaci, aby získávala aktuální polohu a nabízela na jejím základě kategorie</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Místa v okolí</string>

app/src/main/res/values-de/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Keine Beschreibung</string>
   <string name="detail_license_empty">Unbekannte Lizenz</string>
   <string name="menu_refresh">Aktualisieren</string>
-  <string name="storage_permission_rationale">Erforderliche Berechtigung: Externen Speicher lesen. Die App funktioniert ohne diese Berechtigung nicht.</string>
+  <string name="read_storage_permission_rationale">Erforderliche Berechtigung: Externen Speicher lesen. Die App funktioniert ohne diese Berechtigung nicht.</string>
   <string name="location_permission_rationale">Optionale Berechtigung: Ruft den aktuellen Standort für Kategorievorschläge ab</string>
   <string name="ok">Okay</string>
   <string name="title_activity_nearby">Orte in der Nähe</string>

app/src/main/res/values-el/strings.xml

@@ -129,7 +129,7 @@
   <string name="detail_description_empty">Καμία περιγραφή</string>
   <string name="detail_license_empty">Άγνωστη άδεια</string>
   <string name="menu_refresh">Ανανέωση</string>
-  <string name="storage_permission_rationale">Απαιτούμενη άδεια: Ανάγνωση εξωτερικής αποθήκευσης. Η εφαρμογή δεν μπορεί να λειτουργήσει χωρίς αυτή.</string>
+  <string name="read_storage_permission_rationale">Απαιτούμενη άδεια: Ανάγνωση εξωτερικής αποθήκευσης. Η εφαρμογή δεν μπορεί να λειτουργήσει χωρίς αυτή.</string>
   <string name="location_permission_rationale">Προαιρετική άδεια: Ανάκτηση τρέχουσας θέσης σας για προτάσεις κατηγοριών</string>
   <string name="ok">Εντάξει</string>
   <string name="title_activity_nearby">Κοντινοί Τόποι</string>

app/src/main/res/values-es/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Sin descripción</string>
   <string name="detail_license_empty">Licencia desconocida</string>
   <string name="menu_refresh">Actualizar</string>
-  <string name="storage_permission_rationale">Permiso obligatorio: lectura de almacenamiento externo. La aplicación no puede funcionar sin él.</string>
+  <string name="read_storage_permission_rationale">Permiso obligatorio: lectura de almacenamiento externo. La aplicación no puede funcionar sin él.</string>
   <string name="location_permission_rationale">Permiso opcional: obtener la ubicación actual para sugerir categorías</string>
   <string name="ok">Aceptar</string>
   <string name="title_activity_nearby">Lugares cercanos</string>

app/src/main/res/values-fa/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">بدون توضیحات</string>
   <string name="detail_license_empty">مجوز ناشناخته</string>
   <string name="menu_refresh">تازه‌کردن</string>
-  <string name="storage_permission_rationale">اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند.</string>
+  <string name="read_storage_permission_rationale">اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند.</string>
   <string name="location_permission_rationale">اجازه‌های اختیاری: دریافت موقعیت برای پیشنهاد رده</string>
   <string name="ok">تأیید</string>
   <string name="title_activity_nearby">مکان‌‌های اطراف</string>

app/src/main/res/values-fi/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Ei kuvausta</string>
   <string name="detail_license_empty">Tuntematon lisenssi</string>
   <string name="menu_refresh">Päivitä</string>
-  <string name="storage_permission_rationale">Vaadittu oikeus: Ulkoisen tallennustilan luku. Appi ei toimi ilman tätä oikeutta.</string>
+  <string name="read_storage_permission_rationale">Vaadittu oikeus: Ulkoisen tallennustilan luku. Appi ei toimi ilman tätä oikeutta.</string>
   <string name="location_permission_rationale">Valinnainen lupa: Saada tämänhetkinen sijainti loukkasuosituksia varten.</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Lähellä olevat paikat</string>

app/src/main/res/values-fr/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Aucune description</string>
   <string name="detail_license_empty">Licence inconnue</string>
   <string name="menu_refresh">Rafraîchir</string>
-  <string name="storage_permission_rationale">Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas fonctionner sans cela.</string>
+  <string name="read_storage_permission_rationale">Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas fonctionner sans cela.</string>
   <string name="location_permission_rationale">Autorisation facultative : Obtenir l’emplacement actuel pour des suggestions de catégorie</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Endroits à proximité</string>

app/src/main/res/values-frr/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Nian beskriiwang</string>
   <string name="detail_license_empty">Ünbekäänd lisens</string>
   <string name="menu_refresh">Nei loose</string>
-  <string name="storage_permission_rationale">Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke.</string>
+  <string name="read_storage_permission_rationale">Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke.</string>
   <string name="location_permission_rationale">Mögelk rocht: Rept di aktuel plak för kategoriiföörslacher ap.</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Steeden naibi</string>

app/src/main/res/values-gl/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Sen descrición</string>
   <string name="detail_license_empty">Licenza descoñecida</string>
   <string name="menu_refresh">Refrescar</string>
-  <string name="storage_permission_rationale">Permiso necesarioː ler un almacenamento externo. A aplicación non pode funcionar sen isto.</string>
+  <string name="read_storage_permission_rationale">Permiso necesarioː ler un almacenamento externo. A aplicación non pode funcionar sen isto.</string>
   <string name="location_permission_rationale">Permiso opcionalː obter a localización actual para suxerir categorías</string>
   <string name="ok">Aceptar</string>
   <string name="title_activity_nearby">Lugares próximos</string>

app/src/main/res/values-hi/strings.xml

@@ -129,7 +129,7 @@
   <string name="detail_description_empty">कोई विवरण नहीं</string>
   <string name="detail_license_empty">अज्ञात लाइसेन्स</string>
   <string name="menu_refresh">ताजा करें</string>
-  <string name="storage_permission_rationale">अनिवार्य अनुमति: बाहरी स्मृति पढ़ें। एप इसके बिना कार्य नहीं करेगा।</string>
+  <string name="read_storage_permission_rationale">अनिवार्य अनुमति: बाहरी स्मृति पढ़ें। एप इसके बिना कार्य नहीं करेगा।</string>
   <string name="location_permission_rationale">वैकल्पिक अनुमति: श्रेणी सुझाव हेतु वर्तमान स्थान ज्ञात करें</string>
   <string name="ok">ठीक है</string>
   <string name="title_activity_nearby">आसपास के स्थान</string>

app/src/main/res/values-hu/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Nincs leírás</string>
   <string name="detail_license_empty">Ismeretlen licenc</string>
   <string name="menu_refresh">Frissítés</string>
-  <string name="storage_permission_rationale">Szükséges engedély: Külső tárhely olvasása. Az alkalmazás nem működik enélkül.</string>
+  <string name="read_storage_permission_rationale">Szükséges engedély: Külső tárhely olvasása. Az alkalmazás nem működik enélkül.</string>
   <string name="location_permission_rationale">Lehetséges engedély: Jelenlegi hely megszerzése, a kategóriajavaslatok lehetőségéért.</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Közeli helyek</string>

app/src/main/res/values-iw/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">אין תיאור</string>
   <string name="detail_license_empty">רישיון לא ידוע</string>
   <string name="menu_refresh">רענון</string>
-  <string name="storage_permission_rationale">הרשאה מחייבת: אחסון. היישום לא יכול לעבוד בלי זה.</string>
+  <string name="read_storage_permission_rationale">הרשאה מחייבת: אחסון. היישום לא יכול לעבוד בלי זה.</string>
   <string name="location_permission_rationale">הרשאה לא מחייבת: קבלת מיקום נוכחי בשביל הצעות קטגוריות</string>
   <string name="ok">אישור</string>
   <string name="title_activity_nearby">מקומות בסביבה</string>

app/src/main/res/values-ja/strings.xml

@@ -125,7 +125,7 @@
   <string name="detail_description_empty">説明はありません。</string>
   <string name="detail_license_empty">不明なライセンス</string>
   <string name="menu_refresh">更新</string>
-  <string name="storage_permission_rationale">必要な権限：外部ストレージを読み込みます。これがなければアプリは機能しません。</string>
+  <string name="read_storage_permission_rationale">必要な権限：外部ストレージを読み込みます。これがなければアプリは機能しません。</string>
   <string name="location_permission_rationale">オプションの権限：カテゴリ候補の現在の位置を取得する</string>
   <string name="ok">承認</string>
   <string name="title_activity_nearby">周りの場所</string>

app/src/main/res/values-jv/strings.xml

@@ -119,7 +119,7 @@
   <string name="detail_description_empty">Tanpa katerangan</string>
   <string name="detail_license_empty">Lisènsi ora kaweruhan</string>
   <string name="menu_refresh">Anyarana</string>
-  <string name="storage_permission_rationale">Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki.</string>
+  <string name="read_storage_permission_rationale">Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki.</string>
   <string name="location_permission_rationale">Palilah manasuka: Njupuk pernah saiki kanggo saran ing kategori</string>
   <string name="ok">Oké</string>
   <string name="title_activity_nearby">Papan Cedhak Kéné</string>

app/src/main/res/values-ko/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">설명 없음</string>
   <string name="detail_license_empty">알 수 없는 라이선스</string>
   <string name="menu_refresh">새로 고침</string>
-  <string name="storage_permission_rationale">권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 동작하지 않습니다.</string>
+  <string name="read_storage_permission_rationale">권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 동작하지 않습니다.</string>
   <string name="location_permission_rationale">선택적 권한: 분류 추천을 위해 현재 위치 정보를 가져옵니다.</string>
   <string name="ok">확인</string>
   <string name="title_activity_nearby">근처의 장소</string>

app/src/main/res/values-lb/strings.xml

@@ -132,7 +132,7 @@
   <string name="detail_description_empty">Keng Beschreiwung</string>
   <string name="detail_license_empty">Onbekannt Lizenz</string>
   <string name="menu_refresh">Aktualiséieren</string>
-  <string name="storage_permission_rationale">Obligatoresch Autorisatioun: Externe Späicher liesen. D\'App kann net ouni dat funktionéieren.</string>
+  <string name="read_storage_permission_rationale">Obligatoresch Autorisatioun: Externe Späicher liesen. D\'App kann net ouni dat funktionéieren.</string>
   <string name="location_permission_rationale">Fakultativ Autorisatioun: Déi aktuell Plaz kréie fir Propose fir Kategorien</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Plazen nobäi</string>

app/src/main/res/values-lt/strings.xml

@@ -106,7 +106,7 @@
   <string name="detail_description_empty">Nėra aprašymo</string>
   <string name="detail_license_empty">Nežinoma licencija</string>
   <string name="menu_refresh">Atnaujinti</string>
-  <string name="storage_permission_rationale">Reikalinga teisė: Skaityti išorinę talpyklą. Programėle be to negali funkcionuoti.</string>
+  <string name="read_storage_permission_rationale">Reikalinga teisė: Skaityti išorinę talpyklą. Programėle be to negali funkcionuoti.</string>
   <string name="location_permission_rationale">Neprivaloma teisė: Gauti dabartinę vietovę, kad būtų pasiūlomos kategorijos</string>
   <string name="ok">Gerai</string>
   <string name="title_activity_nearby">Netoliese Esančios Vietos</string>

app/src/main/res/values-mk/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Нема опис</string>
   <string name="detail_license_empty">Непозната лиценца</string>
   <string name="menu_refresh">Превчитај</string>
-  <string name="storage_permission_rationale">Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот не може да работи без ова.</string>
+  <string name="read_storage_permission_rationale">Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот не може да работи без ова.</string>
   <string name="location_permission_rationale">Дозвола по желба: Утврдување на тековната местоположба за предлагање категории</string>
   <string name="ok">ОК</string>
   <string name="title_activity_nearby">Околни места</string>

app/src/main/res/values-mr/strings.xml

@@ -117,7 +117,7 @@
   <string name="detail_description_empty">वर्णन नाही.</string>
   <string name="detail_license_empty">अनोळखी परवाना</string>
   <string name="menu_refresh">ताजेतवाने करा</string>
-  <string name="storage_permission_rationale">परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॲप काम करू शकत नाही.</string>
+  <string name="read_storage_permission_rationale">परवानगी आवश्यक:बाह्य भंडारण वाचन. याशिवाय अॲप काम करू शकत नाही.</string>
   <string name="location_permission_rationale">ऐच्छिक परवानगी:वर्ग सुचवण्यांसाठी सध्याचे स्थान मिळवा</string>
   <string name="ok">ठीक आहे</string>
   <string name="title_activity_nearby">जवळपासची स्थाने</string>

app/src/main/res/values-nb/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Ingen beskrivelse</string>
   <string name="detail_license_empty">Ukjent lisens</string>
   <string name="menu_refresh">Gjenoppfrisk</string>
-  <string name="storage_permission_rationale">Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette.</string>
+  <string name="read_storage_permission_rationale">Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette.</string>
   <string name="location_permission_rationale">Valgfri tillatelse: Hent nåværende posisjon for kategoriforslag</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Plasser i nærheten</string>

app/src/main/res/values-nl/strings.xml

@@ -129,7 +129,7 @@
   <string name="detail_description_empty">Geen beschrijving</string>
   <string name="detail_license_empty">Onbekende licentie</string>
   <string name="menu_refresh">Vernieuwen</string>
-  <string name="storage_permission_rationale">Benodigde toestemming: Lees externe opslag. Zonder deze toestemming kan de app niet functioneren.</string>
+  <string name="read_storage_permission_rationale">Benodigde toestemming: Lees externe opslag. Zonder deze toestemming kan de app niet functioneren.</string>
   <string name="location_permission_rationale">Optionele toestemming: Huidige locatie ophalen voor categoriesuggesties</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Plaatsen in de buurt</string>

app/src/main/res/values-pl/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Brak opisu</string>
   <string name="detail_license_empty">Nieznana licencja</string>
   <string name="menu_refresh">Odśwież</string>
-  <string name="storage_permission_rationale">Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego.</string>
+  <string name="read_storage_permission_rationale">Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego.</string>
   <string name="location_permission_rationale">Opcjonalne zezwolenie: uzyskiwanie bieżącej lokalizacji dla wygenerowania propozycji kategorii</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Pobliskie miejsca</string>

app/src/main/res/values-pms/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Gnun-a descrission</string>
   <string name="detail_license_empty">Licensa sconossùa</string>
   <string name="menu_refresh">Rinfrësché</string>
-  <string name="storage_permission_rationale">Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn.</string>
+  <string name="read_storage_permission_rationale">Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn.</string>
   <string name="location_permission_rationale">Autorisassion facoltativa: Oten-e la posission atual për dij sugeriment ëd categorìa</string>
   <string name="ok">Va bin</string>
   <string name="title_activity_nearby">Pòst davzin</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Sem descrição</string>
   <string name="detail_license_empty">Licença desconhecida</string>
   <string name="menu_refresh">Atualizar</string>
-  <string name="storage_permission_rationale">Permissão necessária: Ler armazenamento externo. O aplicativo não pode funcionar sem isso.</string>
+  <string name="read_storage_permission_rationale">Permissão necessária: Ler armazenamento externo. O aplicativo não pode funcionar sem isso.</string>
   <string name="location_permission_rationale">Permissão opcional: Obter a localização atual de sugestões de categoria</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Lugares próximos</string>

app/src/main/res/values-ru/strings.xml

@@ -137,7 +137,7 @@
   <string name="detail_description_empty">Нет описания</string>
   <string name="detail_license_empty">Неизвестная лицензия</string>
   <string name="menu_refresh">Обновить</string>
-  <string name="storage_permission_rationale">Требуемые разрешения: чтение с внешнего накопителя. Приложение не сможет функционировать без этого.</string>
+  <string name="read_storage_permission_rationale">Требуемые разрешения: чтение с внешнего накопителя. Приложение не сможет функционировать без этого.</string>
   <string name="location_permission_rationale">Необязательное разрешение: получение текущего местоположения для предложения категорий</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Места поблизости</string>

app/src/main/res/values-sd/strings.xml

@@ -128,7 +128,7 @@
   <string name="detail_description_empty">ڪا تشريح ناھي</string>
   <string name="detail_license_empty">اڻڄاتل لائسنس</string>
   <string name="menu_refresh">تازو ڪريو</string>
-  <string name="storage_permission_rationale">گھربل اجازت: خارجي اسٽوريج پڙھڻ. ايپ ھن کانسواءِ فنڪشن نٿي ڪري سگھي.</string>
+  <string name="read_storage_permission_rationale">گھربل اجازت: خارجي اسٽوريج پڙھڻ. ايپ ھن کانسواءِ فنڪشن نٿي ڪري سگھي.</string>
   <string name="location_permission_rationale">چونڊ اجازت: زمرن جي تجويزن لاءِ ھاڻوڪي مڪانيت وٺو</string>
   <string name="ok">ٺيڪ</string>
   <string name="title_activity_nearby">ويجھڙائيءَ ۾ جڳھون</string>

app/src/main/res/values-sr/strings.xml

@@ -133,7 +133,7 @@
   <string name="detail_description_empty">Нема описа</string>
   <string name="detail_license_empty">Непозната лиценца</string>
   <string name="menu_refresh">Освежи</string>
-  <string name="storage_permission_rationale">Потребна дозвола: Провера спољашње меморије. Апликација без овога не може да функционише.</string>
+  <string name="read_storage_permission_rationale">Потребна дозвола: Провера спољашње меморије. Апликација без овога не може да функционише.</string>
   <string name="location_permission_rationale">Опциона дозвола: Преузми тренутну локацију за предлоге категорија</string>
   <string name="ok">У реду</string>
   <string name="title_activity_nearby">Места у близини</string>

app/src/main/res/values-su/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Tanpa pedaran</string>
   <string name="detail_license_empty">Lisénsi teu dipikanyaho</string>
   <string name="menu_refresh">Segerkeun</string>
-  <string name="storage_permission_rationale">Merlukeun widi: Baca simpenan éksternal. Aplikasi teu bisa jalan tanpa ieu.</string>
+  <string name="read_storage_permission_rationale">Merlukeun widi: Baca simpenan éksternal. Aplikasi teu bisa jalan tanpa ieu.</string>
   <string name="location_permission_rationale">Idin pilihan: Paké lokasi kiwari pikeun usulan kategori</string>
   <string name="ok">Oké</string>
   <string name="title_activity_nearby">Tempat Sabudeureun</string>

app/src/main/res/values-sv/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">Ingen beskrivning</string>
   <string name="detail_license_empty">Okänd licens</string>
   <string name="menu_refresh">Uppdatera</string>
-  <string name="storage_permission_rationale">Nödvändig behörighet: Läsa extern lagring. Appen fungerar inte utan detta.</string>
+  <string name="read_storage_permission_rationale">Nödvändig behörighet: Läsa extern lagring. Appen fungerar inte utan detta.</string>
   <string name="location_permission_rationale">Valfri behörighet: Hämta aktuell plats för kategoriförslag</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Platser i närheten</string>

app/src/main/res/values-uk/strings.xml

@@ -142,7 +142,7 @@
   <string name="detail_description_empty">Немає опису</string>
   <string name="detail_license_empty">Невідома ліцензія</string>
   <string name="menu_refresh">Оновити</string>
-  <string name="storage_permission_rationale">Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього.</string>
+  <string name="read_storage_permission_rationale">Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього.</string>
   <string name="location_permission_rationale">Додатковий дозвіл: отримувати поточне розташування для підказок категорій</string>
   <string name="ok">Гаразд</string>
   <string name="title_activity_nearby">Місця поблизу</string>

app/src/main/res/values-vi/strings.xml

@@ -124,7 +124,7 @@
   <string name="detail_description_empty">Không miêu tả</string>
   <string name="detail_license_empty">Giấy phép không rõ</string>
   <string name="menu_refresh">Làm tươi</string>
-  <string name="storage_permission_rationale">Yêu cầu cấp phép: Đọc thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép đọc thiết bị lưu trữ bên ngoài để hoạt động.</string>
+  <string name="read_storage_permission_rationale">Yêu cầu cấp phép: Đọc thiết bị lưu trữ bên ngoài. Ứng dụng cần được phép đọc thiết bị lưu trữ bên ngoài để hoạt động.</string>
   <string name="location_permission_rationale">Tùy chọn cấp phép: Định vị hiện tại để nhận gợi ý thể loại</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Nơi Lân cận</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">無說明</string>
   <string name="detail_license_empty">不明授權</string>
   <string name="menu_refresh">重新整理</string>
-  <string name="storage_permission_rationale">必要權限：讀取外部存儲裝置。應用程式必須此功能，才能進行正確運作。</string>
+  <string name="read_storage_permission_rationale">必要權限：讀取外部存儲裝置。應用程式必須此功能，才能進行正確運作。</string>
   <string name="location_permission_rationale">可有可無的權限：獲取目前的地理位置，以用於分類建議</string>
   <string name="ok">好</string>
   <string name="title_activity_nearby">附近地點</string>

app/src/main/res/values-zh/strings.xml

@@ -134,7 +134,7 @@
   <string name="detail_description_empty">没有说明</string>
   <string name="detail_license_empty">未知许可协议</string>
   <string name="menu_refresh">刷新</string>
-  <string name="storage_permission_rationale">需要权限：读取外部存储。应用不能在没有它的情况下运行。</string>
+  <string name="read_storage_permission_rationale">需要权限：读取外部存储。应用不能在没有它的情况下运行。</string>
   <string name="location_permission_rationale">可选权限：获取当前位置以提供分类建议</string>
   <string name="ok">确定</string>
   <string name="title_activity_nearby">附近地点</string>

app/src/main/res/values/strings.xml

@@ -139,7 +139,8 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="detail_description_empty">No description</string>
   <string name="detail_license_empty">Unknown license</string>
   <string name="menu_refresh">Refresh</string>
-  <string name="storage_permission_rationale">Required permission: Read external storage. App cannot function without this.</string>
+  <string name="read_storage_permission_rationale">Required permission: Read external storage. App cannot function without this.</string>
+  <string name="write_storage_permission_rationale">Required permission: Write external storage. App cannot function without this.</string>
   <string name="location_permission_rationale">Optional permission: Get current location for category suggestions</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Nearby Places</string>
@@ -203,5 +204,6 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="error_while_cache">Error while caching pictures</string>
   <string name="title_info">A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension</string>
   <string name="description_info">Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual.</string>
-
+  <string name="use_external_storage">Use external storage</string>
+  <string name="use_external_storage_summary">Save pictures taken with the in-app camera on your device</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -46,4 +46,11 @@
         android:maxLength="3"
         />
 
+    <CheckBoxPreference
+        android:key="useExternalStorage"
+        android:title="@string/use_external_storage"
+        android:defaultValue="true"
+        android:summary="@string/use_external_storage_summary"
+        />
+
 </PreferenceScreen>