Updated mobile app to work with new REST API

Wassup789 · Jul 26, 2017 · 3b48736 · 3b48736
1 parent 0c36909
commit 3b48736
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 70 deletions.
diff --git a/mobile/app/src/main/AndroidManifest.xml b/mobile/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
         android:icon="@drawable/ic_headset_black_48dp"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:versionCode="4"
-        android:versionName="1.0.1.0">
+        android:versionCode="5"
+        android:versionName="1.0.2.0">
         <activity
             android:configChanges="orientation|screenSize"
             android:name=".MainActivity"

diff --git a/mobile/app/src/main/java/com/wassup789/android/musicsync/BackgroundService.java b/mobile/app/src/main/java/com/wassup789/android/musicsync/BackgroundService.java
diff --git a/mobile/app/src/main/java/com/wassup789/android/musicsync/MainActivity.java b/mobile/app/src/main/java/com/wassup789/android/musicsync/MainActivity.java
@@ -214,7 +214,7 @@ public MyResultReceiver(Handler handler) {
         @Override
         protected void onReceiveResult(int resultCode, final Bundle resultData) {
 
-            if(resultCode == 100){//Update status information
+            if(resultCode == BackgroundService.STATUS_UPDATE){//Update status information
                 runOnUiThread( new Thread() {
                     public void run() {
                         String status = resultData.getString("data");
@@ -260,7 +260,7 @@ public void run() {
                         }
                     }
                 });
-            }else if(resultCode == 101){//Set download information
+            }else if(resultCode == BackgroundService.STATUS_DOWNLOADINFO){//Set download information
                 runOnUiThread( new Thread() {
                     public void run() {
                         String total = resultData.getString("data");
@@ -269,7 +269,7 @@ public void run() {
                             filesToDownloadValue.setText(total);
                     }
                 });
-            }else if(resultCode == 102){//Set current download information
+            }else if(resultCode == BackgroundService.STATUS_CURRENTDOWNLOADINFO){//Set current download information
                 runOnUiThread( new Thread() {
                     public void run() {
                         String currentDownload = resultData.getString("data");
@@ -278,7 +278,7 @@ public void run() {
                             currentDownloadValue.setText(currentDownload);
                     }
                 });
-            }else if(resultCode == 103){//Set current playlist
+            }else if(resultCode == BackgroundService.STATUS_CURRENTPLAYLIST){//Set current playlist
                 runOnUiThread( new Thread() {
                     public void run() {
                         String currentPlaylist = resultData.getString("data");

diff --git a/mobile/app/src/main/java/com/wassup789/android/musicsync/fragments/FilesFragment.java b/mobile/app/src/main/java/com/wassup789/android/musicsync/fragments/FilesFragment.java
@@ -87,21 +87,24 @@ protected void onPostExecute(Long result) {}
     public void setListViewDefault() {
         isViewingPlaylist = false;
 
-
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ListView filesList = (ListView) getActivity().findViewById(R.id.filesListView);
-                if (filesList != null)
-                    filesList.setVisibility(View.GONE);
-                TextView title = (TextView) getActivity().findViewById(R.id.title);
-                if (title != null)
-                    title.setText("Playlists:");
-                Button toggleButton = (Button) getActivity().findViewById(R.id.toggleButton);
-                if (toggleButton != null)
-                    toggleButton.setVisibility(View.GONE);
-            }
-        });
+        try {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    ListView filesList = (ListView) getActivity().findViewById(R.id.filesListView);
+                    if (filesList != null)
+                        filesList.setVisibility(View.GONE);
+                    TextView title = (TextView) getActivity().findViewById(R.id.title);
+                    if (title != null)
+                        title.setText("Playlists:");
+                    Button toggleButton = (Button) getActivity().findViewById(R.id.toggleButton);
+                    if (toggleButton != null)
+                        toggleButton.setVisibility(View.GONE);
+                }
+            });
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
 
         SharedPreferences settings = getActivity().getSharedPreferences("settings", Context.MODE_PRIVATE);
         ArrayList<DoubleListItem> data = new ArrayList<DoubleListItem>();

diff --git a/mobile/app/src/main/java/com/wassup789/android/musicsync/fragments/SettingsFragment.java b/mobile/app/src/main/java/com/wassup789/android/musicsync/fragments/SettingsFragment.java
@@ -9,6 +9,7 @@
 import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.text.InputType;
+import android.util.Base64;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -281,9 +282,9 @@ public void retrievePlaylistSelection() {
             ArrayList<PlaylistInformation> output = gson.fromJson(data, new TypeToken<ArrayList<PlaylistInformation>>() {}.getType());
             final String[] playlists = new String[output.size()];
             for(int i = 0; i < output.size(); i++) {
-                playlists[i] = output.get(i).name;
+                playlists[i] = new String(Base64.decode(output.get(i).name, Base64.DEFAULT), "UTF-8");
                 for(int ii = 0; ii < savedPlaylists.length; ii++){
-                    if(output.get(i).name.equals(savedPlaylists[ii])){
+                    if(playlists[i].equals(savedPlaylists[ii])){
                         playlistsToSelect.add(i);
                         break;
                     }

diff --git a/mobile/app/src/main/java/com/wassup789/android/musicsync/objectClasses/MediaInformation.java b/mobile/app/src/main/java/com/wassup789/android/musicsync/objectClasses/MediaInformation.java
@@ -2,6 +2,7 @@
 
 public class MediaInformation {
     public String name;
-    public String name_b64;
-    public int size;
+    public long size;
+    public long dateCreated;
+    public long dateModified;
 }
diff --git a/mobile/app/src/main/res/values/strings.xml b/mobile/app/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="dialog_outdatedVersion_title">Version Outdated</string>
     <string name="dialog_outdatedVersion_desc"><![CDATA[
         The version numbers of the server and the client do not match. Please update both the server and the client to the latest version.<br><br>
-        Continuing to use the outdated application(s) may result in crashes.<br><br>
+        Continuing to use the outdated application(s) may produce unexpected results.<br><br>
         <a href=\'https://github.com/Wassup789/Music-Sync/releases\'>Download via Github.com</a>
     ]]></string>
 </resources>