Merge develop into Main (#367)

* New translations from Lokalize for 2.15.0  (Feb 27 ) - Added Tsonga and PT_Mozambique (#364)

* Fix 2.15.0 bugbash  (#365)

* Fix T-And-1608

T-And-1608 - Grid and List view layout brakes after going back from File Information while using Grid view

* Add - T-And-1620

T-And-1620 - Add support for Tsonga and Portuguese(Mozambique)

* Fix T-And-1607

T-And-1607 - Cannot select more than 1 favourite form

* Fix :T-And-1612 - The top banner visual on a video behaves incorrectly

* Fix T-And-1606 - Fix thumbnail

When taking a photo/video, the thumbnail of the photo taken does not load

* T-And-1618  Fix nextcloud date

T-And-1618 - Fix the date of Nextcloud reports (on nextcloud)

* Fix T-And-1604 - Correct the "Select files from Tella" button

* Bug bash 2.15.0 fixes (#366)

* fix T-And-1614 - Forms are not displayed in Outbox

* fix T-And-1617 - Selecting all Checkboxes doesn't work on forms

* Fix select mode

---------

Co-authored-by: wafa <[email protected]>
Co-authored-by: Ahlem <[email protected]>

* Release 2.15.0 "200"

* Restored README changes lost on merge (#306)

---------

Co-authored-by: raphmim <[email protected]>
Co-authored-by: wafa <[email protected]>
Co-authored-by: Ahlem <[email protected]>
Co-authored-by: Carolina Hadad <[email protected]>

Author: 5 people

README.md

@@ -22,24 +22,24 @@
 
 In challenging environments, with limited or no internet connectivity or in the face of repression, Tella is an app that makes it easier and safer to document human rights violations and collect data. Tella is available Android and iOS. 
 
-| ![Camouflage](docs/Camouflage.gif) | ![Encrypting](docs/Encrypting.gif) | ![Connection](docs/Server.gif) |
+More information about how to get Tella --including user guides-- can be found on our [documentation platform](https://tella-app.org/docs).
+
+| [![Camouflage](docs/Camouflage.gif)](https://tella-app.org/features#encryption/)  | [![Encrypting](docs/Encrypting.gif)](https://tella-app.org/) | [![Server Connections](docs/Server.gif)](https://tella-app.org/for-organizations) |
 |:---:|:---:|:---:|
 | [Tella camouflaged as a calculator](https://tella-app.org/features#camouflage) | [Taking and encrypting a video](https://tella-app.org/features#encryption) | [Sending data to a server](https://tella-app.org/for-organizations) |
 
 Tella:
-- encrypts photo, video, audio and PDF files in a separate gallery so it cannot be accessed from the phone's regular gallery or file explorer.
-- hides itself by changing its name and icon in the list of apps or behind a working calculator.
+- encrypts photo, video, documents and audio files in a separate gallery so it cannot be accessed from the phone's regular gallery or file explorer.
+- hides itself by changing its name and icon in the list of apps.
 - captures metadata when taking photos, videos, and audio recordings to verify the origin of the files.
-- allows users to quickly delete all files in Tella's encrypted vault.
+- allows users to quickly delete all files in Tella's encrypted Gallery.
 - enables users working with a group or organization to collect and send data to a server without relying on third-party apps or servers.
 
 You can watch a [short video demonstrating Tella's main features here](https://www.youtube.com/watch?v=aJIyWESxM_o&t=1s)
 
 
 ## Why Tella? <a id="why-tella"></a>
 
-Across the world, journalists and human rights defenders are facing increasing levels of physical repression, with mobile devices searched or seized at border crossings and airports, checkpoints, in the street, or in targeted raids. At the same time, digital surveillance and censorship threaten the flow of information out of repressive areas, particularly on violence, human rights abuse, or corruption.
-
 Tella's goal is to protect at-risk individuals and groups--advocates, journalists, human rights defenders--from repressive surveillance, whether physical or digital. Tella aims to provide a highly usable solution, accessible to all with minimal or no training, to collect, safeguard, and communicate sensitive information in highly repressive environments.
 
 Tella has three main objectives:
@@ -66,6 +66,26 @@ A detailed list of all Tella features can be found here: https://tella-app.org/f
 
 Tella is currently available on Android, iOS and the F-Droid store. We also share the Tella .apk to be installed manually. [Here there is more information](https://tella-app.org/faq#general). A step-by-step guide on how to use Tella can be found [here](https://tella-app.org/get-started-android).
 
+
+## Detailed list of features <a id="features"></a>
+
+A detailed list of features for Tella Android, Tella FOSS and Tella iOS can be found [on the documentation](https://tella-app.org/features).
+
+## How to get Tella and start using it? <a id="use-tella"></a>
+
+### Tella for Android
+Tella for Android can be downloaded:
+- directly from the [Google Play Store](https://play.google.com/store/apps/details?id=org.hzontal.tella).
+- from [this folder](https://web.tresorit.com/l/JgMjK#FV9IoIZdDxwAUPqtupJzsQ) or from our [Telegram channel](https://t.me/tellaapp), as an APK, to be installed manually.
+
+### Tella FOSS (F-droid)
+We also maintain a version of Tella in the [F-droid store](https://f-droid.org/en/packages/org.hzontal.tellaFOSS/). And the code for it can be found here: https://github.com/Horizontal-org/Tella-Android-FOSS
+
+
+### Get started on Tella Android
+A get started guide for Tella Android is available [here](https://tella-app.org/get-started-android).
+
+
 ## Tech & frameworks used <a id="tech-used"></a>
 
 This software uses the following open source packages:
@@ -78,7 +98,7 @@ This software uses the following open source packages:
 
 **Step 1: Get familiar with Tella.** The best way is simply to download Tella play with it and try the different features, or [read our documentation here](https://docs.tella-app.org).
 
-**Step 2: Find an issue to work on.** Please find an issue that you would like to take on and comment to assign yourself if no one else has done so already. [All issues with the label `good first issue`](https://github.com/Horizontal-org/Tella-Android/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) are good ways to get started. Also, feel free to ask questions in the issues, and we will get back to you ASAP!
+**Step 2: Find an issue to work on.** Please find an issue that you would like to take on and comment to assign yourself if no one else has done so already.  Also, feel free to ask us about priorities, general guidance, and we will get back to you ASAP!
 
 **Step 3: Fork the repo** Click the "fork" button in the upper right of the Github repo page. A fork is a copy of the repository that allows you to freely explore & experiment without changing the original project. You can learn more about forking a repo [in this article](https://help.github.com/articles/fork-a-repo/).
 
@@ -89,18 +109,15 @@ This software uses the following open source packages:
 **Step 6: Pushing your branch and creating a pull request** Push your branch up and create a pull request. Please indicate which issue your PR addresses in the title.
 
 ## Translating the app <a id="translating"></a>
-Tella is currently available in [17 languages](https://tella-app.org/translating-tella). We are always looking to translate Tella into more languages. 
+Tella is currently available in [20 languages](https://tella-app.org/translating-tella). We are always looking to translate Tella into more languages. 
 
 If you are interested in adding a new language, or if you noticed a mistake or a missing translation, you can join [follow our contributing guidelines](https://tella-app.org/translating-tella/#how-do-i-become-a-translator). 
 
-If you are interested in adding a new language, or if you noticed a mistake or a missing translation, you can join [follow our contributing guidelines](https://tella-app.org/translating-tella/#how-do-i-become-a-translator).
-
-
-
 ## Contact us <a id="contact"></a>
 We love hearing from users, designers, and developers!
 
 We host monthly [community meetings](https://tella-app.org/community-meetings) and we offer different ways to [contact-us](https://tella-app.org/contact-us). 
 
  If you have any question, ideas or suggestions on how we can improve or what new features we should add, or if you need support deploying Tella, don't hesitate to reach out!
 
+

build.gradle

@@ -55,7 +55,7 @@ buildscript {
     versions.cameraview = '2.7.2'
     versions.exifinterface = '1.3.3'
     versions.simplifyInk = '1.0.3'
-    versions.circularimageview = '4.3.0'
+    versions.circularimageview = '3.0.2'
     versions.ihsanbalLoggingInterceptor = '3.0.0'
     versions.cardview = '1.0.0'
     versions.buildGradle = '4.1.3'

docs/Camouflage.gif

@@ -14,7 +14,7 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 198
+        versionCode 200
         versionName "2.15.0"
         multiDexEnabled true
 
@@ -29,7 +29,7 @@ android {
         String dropboxKey = localProperties['DROPBOX_APP_KEY']
         if (dropboxKey == null) {
             logger.warn("No value provided for DROPBOX_APP_KEY.  Specify a value in a examples/android/local.properties file. You can register for one at https://developers.dropbox.com/")
-            dropboxKey = ""
+            dropboxKey = "PUT_YOUR_KEY_HERE"
         }
         buildConfigField "String", "DROPBOX_APP_KEY", "\"${dropboxKey}\""
         manifestPlaceholders = [dropboxKey: dropboxKey]

docs/Encrypting.gif

@@ -51,6 +51,7 @@
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/configure_localhost_media_file_http_server"
         android:roundIcon="@mipmap/tella_icon_round"
+        android:localeConfig="@xml/locales_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"

mobile/build.gradle

@@ -115,10 +115,11 @@ class NextCloudRepositoryImp(private val context: Context) : NextCloudRepository
 
                 val descriptionFilePath = "$finalFolderPath/description.txt"
 
-                val timeStamp: Long = System.currentTimeMillis()
+                val timeStamp: Long = System.currentTimeMillis() / 1000 // Convert to seconds if required
                 val uploadOperation = UploadFileRemoteOperation(
                     descriptionFile.absolutePath, descriptionFilePath, "text/plain", timeStamp
                 )
+
                 val result = uploadOperation.execute(client)
 
                 if (result.isSuccess) {
@@ -203,8 +204,8 @@ class NextCloudRepositoryImp(private val context: Context) : NextCloudRepository
             remoteFilePath,
             mimeType,
             tempUploadId,
-            System.currentTimeMillis(),
-            System.currentTimeMillis(),
+            System.currentTimeMillis() / 1000,
+            System.currentTimeMillis() / 1000,
             true,
             true
         )
@@ -267,5 +268,5 @@ class NextCloudRepositoryImp(private val context: Context) : NextCloudRepository
             )
         }
     }
-    
+
 }

mobile/src/main/AndroidManifest.xml

@@ -5,32 +5,32 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+
 import androidx.annotation.Nullable;
 
 import java.util.Locale;
 import java.util.concurrent.Callable;
 
 import io.reactivex.Completable;
 import io.reactivex.Single;
+import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import org.horizontal.tella.mobile.data.sharedpref.SharedPrefs;
 
-
 /**
  * Managing "forced" (non-system) locale in the app.
  */
 public class LocaleManager {
     private static LocaleManager instance;
     private Locale appLocale;
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private static final String NONE_LANGUAGE = "";
 
-
     public synchronized static LocaleManager getInstance() {
         if (instance == null) {
             instance = new LocaleManager();
         }
-
         return instance;
     }
 
@@ -39,62 +39,85 @@ private LocaleManager() {
     }
 
     public Context getLocalizedContext(Context context) {
-        if (appLocale == null) { // nothing to do..
+        if (appLocale == null) { // If no custom locale is set, return default context
             return context;
         }
-
-        // todo: ContextWrapper here?
         return getLocalizedContext(context, appLocale);
     }
 
+    /**
+     * Sets the app locale and saves it in SharedPreferences.
+     */
     public void setLocale(@Nullable final Locale newLocale) {
         if (newLocale != null) {
             appLocale = newLocale;
         } else {
             appLocale = getSystemLocale();
         }
 
-        setLanguageSetting(newLocale != null ? newLocale.getLanguage() : null);
+        // Store the FULL locale (language + region) instead of just the language.
+        String localeString = (newLocale != null) ? newLocale.toLanguageTag() : null;
+        setLanguageSetting(localeString);
     }
 
+    /**
+     * Gets the currently saved language setting.
+     */
     @Nullable
     public String getLanguageSetting() {
-        String language = Single.fromCallable(() -> {
-            String language1 = SharedPrefs.getInstance().getAppLanguage();
-            return language1 != null ? language1 : NONE_LANGUAGE;
+        String localeTag = Single.fromCallable(() -> {
+            String savedLocale = SharedPrefs.getInstance().getAppLanguage();
+            return savedLocale != null ? savedLocale : NONE_LANGUAGE;
         }).subscribeOn(Schedulers.io()).blockingGet();
 
-        return NONE_LANGUAGE.equals(language) ? null : language;
+        return NONE_LANGUAGE.equals(localeTag) ? null : localeTag;
     }
 
-    private void setLanguageSetting(@Nullable final String language) {
-        Completable.fromCallable((Callable<Void>) () -> {
-            SharedPrefs.getInstance().setAppLanguage(language);
+    /**
+     * Saves the full language setting (including region).
+     */
+    private void setLanguageSetting(@Nullable final String localeTag) {
+        disposables.add(Completable.fromCallable((Callable<Void>) () -> {
+            SharedPrefs.getInstance().setAppLanguage(localeTag);
             return null;
-        }).subscribeOn(Schedulers.io()).subscribe(); // leaks?
+        }).subscribeOn(Schedulers.io()).subscribeWith(new io.reactivex.observers.DisposableCompletableObserver() {
+            @Override
+            public void onComplete() {
+                // Successfully saved
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                e.printStackTrace();
+            }
+        }));
     }
 
+    /**
+     * Gets the system default locale.
+     */
     private Locale getSystemLocale() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return Resources.getSystem().getConfiguration().getLocales().get(0);
         } else {
-            //noinspection deprecation
             return Resources.getSystem().getConfiguration().locale;
         }
     }
 
+    /**
+     * Loads the saved locale from SharedPreferences.
+     */
     @Nullable
     private Locale loadSavedLocale() {
-        String language = getLanguageSetting();
-        return language != null ? new Locale(language) : null;
+        String localeTag = getLanguageSetting();
+        return (localeTag != null) ? Locale.forLanguageTag(localeTag) : null;
     }
 
     private Context getLocalizedContext(Context context, Locale locale) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 return updateResources(context, locale);
             }
-
             return updateResourcesLegacy(context, locale);
         } catch (Throwable ignored) {
             return context;
@@ -104,30 +127,27 @@ private Context getLocalizedContext(Context context, Locale locale) {
     @TargetApi(Build.VERSION_CODES.N)
     private static Context updateResources(Context context, Locale locale) {
         Locale.setDefault(locale);
-        //LocaleList localeList = new LocaleList(locale);
-        //LocaleList.setDefault(localeList);
-
         Configuration configuration = context.getResources().getConfiguration();
         configuration.setLocale(locale);
         configuration.setLayoutDirection(locale);
-        //configuration.setLocales(localeList);
-
         return context.createConfigurationContext(configuration);
     }
 
     @SuppressWarnings("deprecation")
     private static Context updateResourcesLegacy(Context context, Locale locale) {
         Locale.setDefault(locale);
-
         Resources resources = context.getResources();
-
         Configuration configuration = resources.getConfiguration();
         configuration.locale = locale;
-
         configuration.setLayoutDirection(locale);
-
         resources.updateConfiguration(configuration, resources.getDisplayMetrics());
-
         return context;
     }
+
+    /**
+     * Clean up resources.
+     */
+    public void dispose() {
+        disposables.clear();
+    }
 }

mobile/src/main/java/org/horizontal/tella/mobile/data/nextcloud/NextCloudRepositoryImp.kt

@@ -47,8 +47,8 @@ object VaultActionsHelper {
         vaultFile: VaultFile,
         viewModel: SharedMediaFileViewModel,
         unitFunction: () -> Unit,
-        toolbar: Toolbar
-    ) {
+        toolbar: Toolbar) {
+
         chosenVaultFile = vaultFile
         sharedViewModel = viewModel
         toolBar = toolbar
@@ -184,10 +184,7 @@ object VaultActionsHelper {
     }
 
     fun BaseActivity.shareMediaFile() {
-        if (chosenVaultFile == null) {
-            return
-        }
-        if (chosenVaultFile?.metadata != null) {
+        if (chosenVaultFile.metadata != null) {
             showShareWithMetadataDialog()
         } else {
             startShareActivity(false)

mobile/src/main/java/org/horizontal/tella/mobile/util/LocaleManager.java

@@ -383,4 +383,15 @@ class VideoViewerActivity : BaseLockActivity(), StyledPlayerView.ControllerVisib
         }
     }
 
+    override fun onBackPressed() {
+        super.onBackPressed()
+        if (isInfoShown) {
+            toolbar.menu.findItem(R.id.menu_item_more).isVisible = true
+            if (withMetadata){
+                toolbar.menu.findItem(R.id.menu_item_metadata).isVisible = true
+            }
+            toolbar.title = vaultFile?.name
+        }
+    }
+
 }