Merge pull request #1861 from nextcloud/unusedResources

Lint: remove unused resources

src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -49,7 +49,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 
 
@@ -81,10 +80,10 @@ public class LogHistoryActivity extends ToolbarActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
-        Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
-        Button sendHistoryButton = (Button) findViewById(R.id.sendLogHistoryButton);
+        Button deleteHistoryButton = findViewById(R.id.deleteLogHistoryButton);
+        Button sendHistoryButton = findViewById(R.id.sendLogHistoryButton);
         sendHistoryButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(), PorterDuff.Mode.SRC_ATOP);
-        TextView logTV = (TextView) findViewById(R.id.logTV);
+        TextView logTV = findViewById(R.id.logTV);
 
         deleteHistoryButton.setOnClickListener(new OnClickListener() {
             
@@ -148,20 +147,8 @@ public class LogHistoryActivity extends ToolbarActivity {
      * Start activity for sending email with logs attached
      */
     private void sendMail() {
+        String emailAddress = getString(R.string.mail_logger);
 
-        // For the moment we need to consider the possibility that setup.xml
-        // does not include the "mail_logger" entry. This block prevents that
-        // compilation fails in this case.
-        String emailAddress;
-        try {
-            Class<?> stringClass = R.string.class;
-            Field mailLoggerField = stringClass.getField("mail_logger");
-            int emailAddressId = (Integer) mailLoggerField.get(null);
-            emailAddress = getString(emailAddressId);
-        } catch (Exception e) {
-            emailAddress = "";
-        }
-        
         ArrayList<Uri> uris = new ArrayList<>();
 
         // Convert from paths to Android friendly Parcelable Uri's

src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -120,8 +120,8 @@ public class NotificationsActivity extends FileActivity {
         // setup toolbar
         setupToolbar();
 
-        swipeEmptyListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_empty);
-        swipeListRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_containing_list);
+        swipeEmptyListRefreshLayout = findViewById(R.id.swipe_containing_empty);
+        swipeListRefreshLayout = findViewById(R.id.swipe_containing_list);
 
         // setup drawer
         setupDrawer(R.id.nav_notifications);
@@ -236,7 +236,7 @@ public class NotificationsActivity extends FileActivity {
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.addItemDecoration(dividerItemDecoration);
 
-        BottomNavigationView bottomNavigationView = (BottomNavigationView) findViewById(R.id.bottom_navigation_view);
+        BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
 
         if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
             bottomNavigationView.setVisibility(View.VISIBLE);
@@ -344,7 +344,7 @@ public class NotificationsActivity extends FileActivity {
     }
 
     private void setLoadingMessage() {
-        emptyContentHeadline.setText(R.string.file_list_loading);
+        emptyContentHeadline.setText(R.string.notifications_loading_activity);
         emptyContentMessage.setText("");
 
         emptyContentIcon.setVisibility(View.GONE);

src/main/res/values/strings.xml

@@ -110,9 +110,7 @@
     <string name="file_list_empty_text_photos_filter">Your search returned no photos.</string>
     <string name="file_list_empty_text_videos">Upload some videos or activate auto upload.</string>
     <string name="file_list_empty_text_videos_filter">Your search returned no videos.</string>
-    <string name="file_item_metadata_separator" translatable="false">,</string>
     <string name="upload_list_empty_headline">No uploads available</string>
-    <string name="upload_list_empty_text">Upload some content or activate instant uploading.</string>
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
     <string name="file_list_folder">folder</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>

src/main/res/values/styles.xml

@@ -18,8 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="Animations" />
-
 	<!-- General ownCloud app style -->
 	<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
@@ -233,19 +231,10 @@
   		    
     </style>
 	
-	<style name="OAuthDialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
-		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/color_accent</item>
-	</style>    
-		
-	<color name="setup_text_hint">#777777</color>
-	<color name="setup_text_typed">#000000</color>
     <style name="Theme.ownCloud.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
-    <style name="Theme.ownCloud.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-    <style name="Theme.ownCloud.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
 	<!-- Text styles -->
 	<style name="NextcloudTextAppearanceHeadline" parent="style/TextAppearance.AppCompat.Headline">

src/modified/res/values/setup.xml

@@ -26,7 +26,6 @@
     <string name="server_input_type">regular</string>
     <bool name="show_welcome_link">true</bool>
 	<string name="welcome_link_url">"https://nextcloud.com/providers"</string>
-	<string name="share_api_link"></string>
 
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
@@ -99,7 +98,6 @@
     <bool name="feedback_enabled">true</bool>
     <bool name="logger_enabled">false</bool>
     <string name="url_imprint"></string>
-    <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
     <string name="url_server_install">https://nextcloud.com/install</string>