Fixed dialog styles, added MP4 status to FileDetails, possibly fixed …

…Cast
DSteve595 · Oct 30, 2014 · f91d151 · f91d151
1 parent 3e30fae
commit f91d151
Show file tree

Hide file tree

Showing 47 changed files with 441 additions and 395 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,9 +11,6 @@ apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()
-    maven {
-        url "https://repo.commonsware.com.s3.amazonaws.com"
-    }
 }
 
 android {
@@ -22,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 69
-        versionName '2.1 beta 1'
+        versionCode 70
+        versionName 'L preview 2'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -56,7 +53,6 @@ dependencies {
     compile 'org.apache.httpcomponents:httpmime:4.3.+'
     compile 'org.apache.httpcomponents:httpcore:4.3.+'
     compile 'joda-time:joda-time:2.5'
-    //    compile 'com.commonsware.cwac:mediarouter:0.1.+'
     compile 'com.squareup.retrofit:retrofit:1.7.+'
     compile 'com.path:android-priority-jobqueue:1.1.2'
     compile 'com.squareup.okhttp:okhttp:2.0.+'

diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java b/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java
@@ -59,7 +59,6 @@ public class AddTransfers extends Activity implements DestinationFilesDialog.Cal
     @Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setTheme(R.style.Putio_Dialog);
 		setContentView(R.layout.dialog_addtransfer);
 
 		sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -74,16 +73,15 @@ public void onCreate(Bundle savedInstanceState) {
         addButton = (Button) findViewById(R.id.button_addtransfer_add);
         addButton.setOnClickListener(new OnClickListener() {
 			@Override
-			public void onClick(View arg0) {
+			public void onClick(View v) {
                 add();
 			}
 		});
 
 		Button cancelButton = (Button) findViewById(R.id.button_addtransfer_cancel);
 		cancelButton.setOnClickListener(new OnClickListener() {
-
 			@Override
-			public void onClick(View arg0) {
+			public void onClick(View v) {
 				finish();
 			}
 		});

diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/BaseCastActivity.java b/app/src/main/java/com/stevenschoen/putionew/activities/BaseCastActivity.java
@@ -79,7 +79,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
             MediaRouteActionProvider mediaRouteActionProvider = (MediaRouteActionProvider)
                     MenuItemCompat.getActionProvider(buttonMediaRoute);
             PutioApplication application = (PutioApplication) getApplication();
-//            mediaRouteActionProvider.setRouteSelector(application.getMediaRouteSelector()); TODO
+            mediaRouteActionProvider.setRouteSelector(application.getMediaRouteSelector());
         }
 
         return true;

diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/Putio.java b/app/src/main/java/com/stevenschoen/putionew/activities/Putio.java
@@ -106,25 +106,16 @@ public void onCreate(Bundle savedInstanceState) {
 
         this.savedInstanceState = savedInstanceState;
 
-//        if (UIUtils.isTablet(this)) {
-//            getSupportActionBar().setDisplayShowTitleEnabled(false);
-//        }
-
         if (getIntent() != null) {
             handleIntent(getIntent());
         }
 
         IntentFilter checkCacheSizeIntentFilter = new IntentFilter(
                 Putio.checkCacheSizeIntent);
-        IntentFilter fileDownloadUpdateIntentFilter = new IntentFilter(
-                Putio.fileDownloadUpdateIntent);
         IntentFilter noNetworkIntentFilter = new IntentFilter(
                 Putio.noNetworkIntent);
 
         registerReceiver(checkCacheSizeReceiver, checkCacheSizeIntentFilter);
-        if (UIUtils.isTablet(this)) {
-            registerReceiver(fileDownloadUpdateReceiver, fileDownloadUpdateIntentFilter);
-        }
         registerReceiver(noNetworkReceiver, noNetworkIntentFilter);
     }
 
@@ -642,16 +633,6 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
-    private BroadcastReceiver fileDownloadUpdateReceiver = new BroadcastReceiver() {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (fileDetailsFragment.getFileId() == intent.getExtras().getInt("id")) {
-                fileDetailsFragment.updatePercent(intent.getExtras().getInt("percent"));
-            }
-        }
-    };
-
     private BroadcastReceiver noNetworkReceiver = new BroadcastReceiver() {
 
         @Override
@@ -690,9 +671,6 @@ private void selectTab(int position) {
     @Override
     protected void onDestroy() {
         unregisterReceiver(checkCacheSizeReceiver);
-        if (UIUtils.isTablet(this)) {
-            unregisterReceiver(fileDownloadUpdateReceiver);
-        }
         unregisterReceiver(noNetworkReceiver);
 
         super.onDestroy();