reindented code and added .editorconfig (#279)

amahi · Oct 17, 2017 · 041f4f7 · 041f4f7
1 parent b9b59a6
commit 041f4f7
Show file tree

Hide file tree

Showing 153 changed files with 7,880 additions and 8,070 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# It's recommended to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/fakeApi.properties b/fakeApi.properties
@@ -1,9 +1,8 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
-
 url.amahi=https://amahi.org
 url.proxy=https://amahi.org
 client.id=1234567890
 client.secret=abcdefghijklmnopqrstuvwxyz
-chromecast.app.id=CC1AD845
+chromecast.app.id=CC1AD845
diff --git a/fakeSigning.properties b/fakeSigning.properties
@@ -1,7 +1,6 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
-
 keystore.file=debug.keystore
 keystore.password=android
 key.alias=androiddebugkey

diff --git a/src/androidTest/java/org/amahi/anywhere/activity/AuthenticationActivityTest.java b/src/androidTest/java/org/amahi/anywhere/activity/AuthenticationActivityTest.java
@@ -20,18 +20,18 @@
 public class AuthenticationActivityTest {
     @Rule
     public ActivityTestRule<AuthenticationActivity> authenticationActivityTestRule =
-            new ActivityTestRule(AuthenticationActivity.class);
+        new ActivityTestRule(AuthenticationActivity.class);
 
     @Test
     public void testIsErrorMessageDisplayed_UsernameOrPasswordIsEmpty() {
         onView(withId(R.id.username_layout)).check(matches(isDisplayed()));
         onView(withId(R.id.password_layout)).check(matches(isDisplayed()));
 
         onView(withId(R.id.button_authentication))
-                .check(matches(isDisplayed()))
-                .perform(click());
+            .check(matches(isDisplayed()))
+            .perform(click());
 
         onView(withId(R.id.text_message_authentication_empty))
-                .check(matches(isDisplayed()));
+            .check(matches(isDisplayed()));
     }
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -16,22 +16,21 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with Amahi. If not, see <http ://www.gnu.org/licenses/>.
 -->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.amahi.anywhere"
     android:installLocation="auto">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
@@ -48,7 +47,7 @@
 
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false"/>
+        android:required="false" />
 
     <uses-feature
         android:name="android.software.leanback"
@@ -60,11 +59,11 @@
     <application
         android:name=".AmahiApplication"
         android:allowBackup="false"
+        android:banner="@drawable/tv_banner"
         android:icon="@drawable/ic_launcher"
         android:label="@string/application_name"
         android:resizeableActivity="true"
-        android:theme="@style/Theme.Amahi"
-        android:banner="@drawable/tv_banner">
+        android:theme="@style/Theme.Amahi">
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -73,31 +72,32 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"/>
+                android:resource="@xml/file_paths" />
         </provider>
 
         <activity
             android:name=".tv.activity.MainTVActivity"
             android:theme="@style/Theme.Leanback.Browse">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.SplashActivity"
+        <activity
+            android:name=".activity.SplashActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data
                 android:name="android.max_aspect"
                 android:value="2.1" />
         </activity>
 
-        <activity android:name=".activity.NavigationActivity"/>
-        <activity android:name=".activity.ServerAppActivity"/>
+        <activity android:name=".activity.NavigationActivity" />
+        <activity android:name=".activity.ServerAppActivity" />
         <activity android:name=".activity.ServerFilesActivity">
             <meta-data
                 android:name="android.app.searchable"
@@ -106,74 +106,75 @@
         <activity
             android:name=".activity.ServerFileAudioActivity"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.Amahi.Fullscreen"/>
+            android:theme="@style/Theme.Amahi.Fullscreen" />
         <activity
             android:name=".activity.ServerFileImageActivity"
-            android:theme="@style/Theme.Amahi.Fullscreen"/>
+            android:theme="@style/Theme.Amahi.Fullscreen" />
         <activity
             android:name=".activity.ServerFileVideoActivity"
-            android:theme="@style/Theme.Amahi.Fullscreen"/>
+            android:theme="@style/Theme.Amahi.Fullscreen" />
         <activity
             android:name=".activity.ExpandedControlsActivity"
-            android:theme="@style/Theme.CastVideosDark"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.CastVideosDark">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
             android:name=".activity.NativeVideoActivity"
-            android:theme="@style/Theme.Amahi.Fullscreen"
-            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|uiMode"/>
-        <activity android:name=".activity.ServerFileWebActivity"/>
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|uiMode"
+            android:theme="@style/Theme.Amahi.Fullscreen" />
+        <activity android:name=".activity.ServerFileWebActivity" />
         <activity
             android:name=".activity.SettingsActivity"
-            android:label="@string/title_settings"/>
-        <activity android:name=".activity.IntroductionActivity"
+            android:label="@string/title_settings" />
+        <activity
+            android:name=".activity.IntroductionActivity"
             android:label="@string/intro_desc_phone_1"
-            android:theme="@style/Theme.AppCompat.NoActionBar"/>
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
         <activity
             android:name=".activity.AuthenticationActivity"
             android:theme="@style/Theme.Amahi.Authentication"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize" />
 
         <service
             android:name=".account.AmahiAuthenticatorService"
             android:exported="false">
             <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator"/>
+                <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
 
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator"/>
+                android:resource="@xml/authenticator" />
         </service>
         <service
             android:name=".service.AudioService"
             android:exported="false">
             <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService"/>
+                <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
         </service>
-        <service android:name=".service.VideoService"/>
-        <service android:name=".service.UploadService"/>
+        <service android:name=".service.VideoService" />
+        <service android:name=".service.UploadService" />
 
         <receiver android:name=".receiver.AudioReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-                <action android:name="android.media.AUDIO_BECOMING_NOISY"/>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+                <action android:name="android.media.AUDIO_BECOMING_NOISY" />
             </intent-filter>
         </receiver>
         <receiver android:name="android.support.v4.media.session.MediaButtonReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-                <action android:name="android.media.AUDIO_BECOMING_NOISY"/>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+                <action android:name="android.media.AUDIO_BECOMING_NOISY" />
             </intent-filter>
         </receiver>
         <receiver android:name=".receiver.NetworkReceiver">
             <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
 
@@ -197,29 +198,35 @@
 
         <meta-data
             android:name="com.crashlytics.ApiKey"
-            android:value="d7b65346d3cf0028328f006bff447501d70f8996"/>
+            android:value="d7b65346d3cf0028328f006bff447501d70f8996" />
 
         <activity
             android:name=".activity.WebViewActivity"
-            android:label="@string/title_version_settings"/>
+            android:label="@string/title_version_settings" />
 
-        <activity android:name=".tv.activity.IntroActivity"
-            android:theme="@style/Theme.Leanback.Onboarding"/>
+        <activity
+            android:name=".tv.activity.IntroActivity"
+            android:theme="@style/Theme.Leanback.Onboarding" />
 
-        <activity android:name=".tv.activity.SettingsActivity"
-            android:theme="@style/Theme.Leanback.GuidedStep"/>
+        <activity
+            android:name=".tv.activity.SettingsActivity"
+            android:theme="@style/Theme.Leanback.GuidedStep" />
 
-        <activity android:name=".tv.activity.ServerFileTvActivity"
-            android:theme="@style/Theme.Leanback.VerticalGrid"/>
+        <activity
+            android:name=".tv.activity.ServerFileTvActivity"
+            android:theme="@style/Theme.Leanback.VerticalGrid" />
 
-        <activity android:name=".tv.activity.TVWebViewActivity"
-            android:theme="@style/Theme.Design.NoActionBar"/>
+        <activity
+            android:name=".tv.activity.TVWebViewActivity"
+            android:theme="@style/Theme.Design.NoActionBar" />
 
-        <activity android:name=".tv.activity.TvPlaybackVideoActivity"
-            android:theme="@style/Theme.Leanback"/>
+        <activity
+            android:name=".tv.activity.TvPlaybackVideoActivity"
+            android:theme="@style/Theme.Leanback" />
 
-        <activity android:name=".tv.activity.TvPlaybackAudioActivity"
-            android:theme="@style/Theme.Leanback"/>
+        <activity
+            android:name=".tv.activity.TvPlaybackAudioActivity"
+            android:theme="@style/Theme.Leanback" />
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"

diff --git a/src/main/java/org/amahi/anywhere/AmahiApplication.java b/src/main/java/org/amahi/anywhere/AmahiApplication.java
@@ -55,12 +55,12 @@ public void onCreate() {
 
         setUpInjections();
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-			setUpJobs();
-		}
-	}
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            setUpJobs();
+        }
+    }
 
-	private void setUpLogging() {
+    private void setUpLogging() {
         if (isDebugging()) {
             Timber.plant(new Timber.DebugTree());
         }
@@ -90,18 +90,18 @@ public void inject(Object injectionsConsumer) {
         injector.inject(injectionsConsumer);
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private void setUpJobs() {
+        if (!PhotosContentJob.isScheduled(this)) {
+            PhotosContentJob.scheduleJob(this);
+        }
+        if (!NetConnectivityJob.isScheduled(this)) {
+            NetConnectivityJob.scheduleJob(this);
+        }
+    }
+
     public static class JobIds {
         public static final int PHOTOS_CONTENT_JOB = 125;
-		public static final int NET_CONNECTIVITY_JOB = 126;
+        public static final int NET_CONNECTIVITY_JOB = 126;
     }
-
-	@RequiresApi(api = Build.VERSION_CODES.N)
-	private void setUpJobs() {
-		if (!PhotosContentJob.isScheduled(this)) {
-			PhotosContentJob.scheduleJob(this);
-		}
-		if (!NetConnectivityJob.isScheduled(this)) {
-			NetConnectivityJob.scheduleJob(this);
-		}
-	}
 }