FFSend: limit scaling

app/src/extra/java/eu/faircode/email/FFSend.java

@@ -51,7 +51,7 @@ public class FFSend {
     */
 
     static final int FF_DEFAULT_DLIMIT = 10;
-    static final int FF_DEFAULT_TLIMIT = 36; // hours
+    static final int FF_DEFAULT_TLIMIT = 24; // hours
     static final String FF_DEFAULT_SERVER = "https://send.vis.ee/";
     static final String FF_INSTANCES = "https://github.com/timvisee/send-instances/";
 

app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java

@@ -264,7 +264,8 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
         sbDLimit.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                tvDLimit.setText(getString(R.string.title_style_link_ffsend_dlimit, progress));
+                progress++;
+                tvDLimit.setText(getString(R.string.title_style_link_ffsend_dlimit, Integer.toString(progress)));
             }
 
             @Override
@@ -281,7 +282,16 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
         sbTLimit.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                tvTLimit.setText(getString(R.string.title_style_link_ffsend_tlimit, progress));
+                progress++;
+
+                if (progress < 24)
+                    tvTLimit.setText(getString(R.string.title_style_link_ffsend_tlimit,
+                            getResources().getQuantityString(R.plurals.title_hours, progress, progress)));
+                else {
+                    progress = (progress - 24 + 1);
+                    tvTLimit.setText(getString(R.string.title_style_link_ffsend_tlimit,
+                            getResources().getQuantityString(R.plurals.title_days, progress, progress)));
+                }
             }
 
             @Override
@@ -304,8 +314,8 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
             etTitle.setText(savedInstanceState.getString("fair:text"));
         }
 
-        sbDLimit.setProgress(FFSend.FF_DEFAULT_DLIMIT);
-        sbTLimit.setProgress(FFSend.FF_DEFAULT_TLIMIT);
+        sbDLimit.setProgress(FFSend.FF_DEFAULT_DLIMIT - 1);
+        sbTLimit.setProgress(FFSend.FF_DEFAULT_TLIMIT - 1);
 
         pbWait.setVisibility(View.GONE);
         pbUpload.setVisibility(View.GONE);
@@ -349,10 +359,16 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
     }
 
     private void onFFSend(Uri uri) {
+        int dlimit = sbDLimit.getProgress() + 1;
+        int tlimit = sbTLimit.getProgress() + 1;
+
+        if (tlimit >= 24)
+            tlimit = (tlimit - 24 + 1) * 24;
+
         Bundle args = new Bundle();
         args.putParcelable("uri", uri);
-        args.putInt("dlimit", sbDLimit.getProgress());
-        args.putInt("tlimit", sbTLimit.getProgress());
+        args.putInt("dlimit", dlimit);
+        args.putInt("tlimit", tlimit);
 
         new SimpleTask<String>() {
             @Override
@@ -392,6 +408,8 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
                 if (tlimit == 0)
                     tlimit = FFSend.FF_DEFAULT_TLIMIT;
 
+                Log.i("FFSend uri=" + uri + " dlimit=" + dlimit + " tlimit=" + tlimit);
+
                 args.putString("title", dfile.getName());
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

app/src/main/res/layout/dialog_insert_link.xml

@@ -150,7 +150,7 @@
             android:id="@+id/sbDLimit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:max="100"
+            android:max="99"
             android:min="0"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -171,7 +171,7 @@
             android:id="@+id/sbTLimit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:max="240"
+            android:max="52"
             android:min="0"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -112,6 +112,16 @@
         <item quantity="other">Block sender of %1$s messages?</item>
     </plurals>
 
+    <plurals name="title_hours">
+        <item quantity="one">%1$s hour</item>
+        <item quantity="other">%1$s hours</item>
+    </plurals>
+
+    <plurals name="title_days">
+        <item quantity="one">%1$s day</item>
+        <item quantity="other">%1$s days</item>
+    </plurals>
+
     <string name="title_junk_filter">Use local spam filter</string>
     <string name="title_junk_filter_hint">This can increase battery usage and incorrectly mark messages as spam</string>
     <string name="title_junk_blocklist">Use spam block lists</string>
@@ -1421,8 +1431,8 @@
     <string name="title_style_link_metadata">Fetch title</string>
     <string name="title_style_link_metadata_remark">This will fetch the title at the entered address</string>
     <string name="title_style_link_ffsend" translatable="false">FFSend</string>
-    <string name="title_style_link_ffsend_dlimit" translatable="false">Download limit (%1$d x)</string>
-    <string name="title_style_link_ffsend_tlimit" translatable="false">Time limit (%1$d hours)</string>
+    <string name="title_style_link_ffsend_dlimit" translatable="false">Download limit (%1$s)</string>
+    <string name="title_style_link_ffsend_tlimit" translatable="false">Time limit (%1$s)</string>
 
     <string name="title_add_image">Add image</string>
     <string name="title_add_image_inline">Insert</string>