소스 검색

Remove uploads menu

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 년 전
부모
커밋
006b62cd4e
2개의 변경된 파일1개의 추가작업 그리고 49개의 파일을 삭제
  1. 1 22
      src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
  2. 0 27
      src/main/res/menu/upload_list_menu.xml

+ 1 - 22
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -35,8 +35,6 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
@@ -54,8 +52,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.operations.CheckCurrentCredentialsOperation;
 import com.owncloud.android.ui.fragment.UploadListFragment;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.AnalyticsUtils;
+import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
 import java.io.File;
@@ -212,18 +210,6 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
                     openDrawer();
                 }
 
-            case R.id.action_clear_successfull_uploads:
-                storageManager = new UploadsStorageManager(getContentResolver(), getApplicationContext());
-                storageManager.clearSuccessfulUploads();
-                uploadListFragment.updateUploads();
-                break;
-
-            case R.id.action_clear_finished_uploads:
-                storageManager = new UploadsStorageManager(getContentResolver(), getApplicationContext());
-                storageManager.clearAllFinishedButNotDelayedUploads();
-                uploadListFragment.updateUploads();
-                break;
-
             default:
                 retval = super.onOptionsItemSelected(item);
         }
@@ -231,13 +217,6 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         return retval;
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.upload_list_menu, menu);
-        return true;
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

+ 0 - 27
src/main/res/menu/upload_list_menu.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:id="@+id/action_clear_successfull_uploads"
-        android:title="@string/action_clear_successful_uploads"/>
-    <item
-        android:id="@+id/action_clear_finished_uploads"
-        android:title="@string/action_clear_finished_uploads"/>
-</menu>