Don't let non-premium users delete files

astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java

@@ -31,6 +31,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
@@ -116,27 +117,32 @@ public class FilesControlSet extends PopupControlSet {
             setUpFileRow(m, fileRow, fileList, lp);
             View name = fileRow.findViewById(R.id.file_text);
             View clearFile = fileRow.findViewById(R.id.remove_file);
-            clearFile.setVisibility(View.VISIBLE);
 
             setupFileClickListener(name, m);
-            clearFile.setOnClickListener(new OnClickListener() {
+
-                @Override
+            if (ActFmPreferenceService.isPremiumUser()) {
-                public void onClick(View v) {
+                clearFile.setVisibility(View.VISIBLE);
-                    DialogUtilities.okCancelDialog(activity, activity.getString(R.string.premium_remove_file_confirm),
+                clearFile.setOnClickListener(new OnClickListener() {
-                            new DialogInterface.OnClickListener() {
+                    @Override
-                        @Override
+                    public void onClick(View v) {
-                        public void onClick(DialogInterface d, int which) {
+                        DialogUtilities.okCancelDialog(activity, activity.getString(R.string.premium_remove_file_confirm),
-                            File f = new File(m.getValue(FileMetadata.FILE_PATH));
+                                new DialogInterface.OnClickListener() {
-                            if (f.delete()) {
+                            @Override
-                                metadataService.delete(m);
+                            public void onClick(DialogInterface d, int which) {
-                                files.remove(m);
+                                if (m.containsNonNullValue(FileMetadata.FILE_PATH)) {
-                                refreshDisplayView();
+                                    File f = new File(m.getValue(FileMetadata.FILE_PATH));
-                                finalList.removeView(fileRow);
+                                    if (f.delete()) {
+                                        metadataService.delete(m);
+                                        files.remove(m);
+                                        refreshDisplayView();
+                                        finalList.removeView(fileRow);
+                                    }
+                                }
                             }
-                        }
+                        }, null);
-                    }, null);
+                    }
-                }
+                });
-            });
+            }
         }
     }
 

astrid/res/layout/file_display_row.xml

@@ -25,12 +25,4 @@
         android:paddingRight="4dip"
         android:gravity="center"
         android:textColor="?attr/asTextColorInverse"/>
-    <ImageView
-        android:id="@+id/remove_file"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_menu_close"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:visibility="gone"/>
 </LinearLayout>

astrid/res/layout/file_row.xml

@@ -24,6 +24,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/file_type_background"
         android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
         android:paddingLeft="4dip"
         android:paddingRight="4dip"
         android:gravity="center"
@@ -33,5 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_menu_close"
-        android:layout_marginRight="5dip"/>
+        android:layout_marginLeft="-5dip"
+        android:layout_marginRight="5dip"
+        android:visibility="gone"/>
 </LinearLayout>