pd#100956 fix bug of androidL udisk path

Change-Id: Ib4b71ed6cac31f64ae582abd29a5e9ac16872500

3 files changed, 135 insertions, 238 deletions

diff --git a/src/com/droidlogic/otaupgrade/FileSelector.java b/src/com/droidlogic/otaupgrade/FileSelector.java
index a60618d..48a8ff9 100755
--- a/src/com/droidlogic/otaupgrade/FileSelector.java
+++ b/src/com/droidlogic/otaupgrade/FileSelector.java
@@ -52,247 +52,167 @@ import java.util.ArrayList;
  * @Version V1.0

  */

 public class FileSelector extends Activity implements OnItemClickListener {

-    private static final String TAG = "FileSelector";

-    public static final String FILE = "file";

-    private static final int JB2 = 17;

-    private static final int JB1 = 16;

-    private static final int ICS404 = 15;

-    private static final String LOCAL = "/sdcard";

-    private static final String UDISK_ICS = "/mnt/sd";

-    private static final String UDISK_JB1 = "/storage/sd";

-    private static final String UDISK_JB2 = "/storage/external_storage/sd";

-    private static final String SDCARD_JB = "/sdcard/external_sdcard";

-    private static final String SDCARD_JB1 = "/storage/external_storage/sdcard";

-    private static final int MSG_HIDE_SHOW_DIALOG = 1;

-    private static final int MSG_SHOW_WAIT_DIALOG = 2;

-    private static final int MSG_NOTIFY_DATACHANGE = 3;

-    private static final int WAITDIALOG_DISPALY_TIME = 500;

-    private File mCurrentDirectory;

-    private LayoutInflater mInflater;

-    private FileAdapter mAdapter = new FileAdapter();

-    private ListView mListView;

-    private ProgressDialog mPdWatingScan = null;

-    private Handler mHandler = new Handler() {

+        private static final String TAG = "FileSelector";

+        public static final String FILE = "file";

+        private static final String LOCAL = "/sdcard";

+        private static final String UDISK = "/storage/udisk";

+        private static final String SDCARD = "/storage/sdcard";

+        private static final int MSG_HIDE_SHOW_DIALOG = 1;

+        private static final int MSG_SHOW_WAIT_DIALOG = 2;

+        private static final int MSG_NOTIFY_DATACHANGE = 3;

+        private static final int WAITDIALOG_DISPALY_TIME = 500;

+        private File mCurrentDirectory;

+        private LayoutInflater mInflater;

+        private FileAdapter mAdapter = new FileAdapter();

+        private ListView mListView;

+        private ProgressDialog mPdWatingScan = null;

+        private Handler mHandler = new Handler() {

             @Override

-            public void handleMessage(Message msg) {

-                super.handleMessage(msg);

-

-                switch (msg.what) {

-                case MSG_SHOW_WAIT_DIALOG:

-                    mPdWatingScan = ProgressDialog.show(FileSelector.this,

-                            getResources().getString(R.string.scan_title),

-                            getResources().getString(R.string.scan_tip));

-

-                    break;

-

-                case MSG_HIDE_SHOW_DIALOG:

-                    removeMessages(MSG_SHOW_WAIT_DIALOG);

-

-                    if (mPdWatingScan != null) {

-                        mPdWatingScan.dismiss();

-                        mPdWatingScan = null;

-                    }

-

-                    break;

-

-                case MSG_NOTIFY_DATACHANGE:

-                    mAdapter.notifyDataSetChanged();

-

-                    break;

-

-                default:

-                    break;

+            public void handleMessage ( Message msg ) {

+                super.handleMessage ( msg );

+                switch ( msg.what ) {

+                    case MSG_SHOW_WAIT_DIALOG:

+                        mPdWatingScan = ProgressDialog.show ( FileSelector.this,

+                                                              getResources().getString ( R.string.scan_title ),

+                                                              getResources().getString ( R.string.scan_tip ) );

+                        break;

+                    case MSG_HIDE_SHOW_DIALOG:

+                        removeMessages ( MSG_SHOW_WAIT_DIALOG );

+                        if ( mPdWatingScan != null ) {

+                            mPdWatingScan.dismiss();

+                            mPdWatingScan = null;

+                        }

+                        break;

+                    case MSG_NOTIFY_DATACHANGE:

+                        mAdapter.notifyDataSetChanged();

+                        break;

+                    default:

+                        break;

                 }

             }

         };

 

-    private void startScanThread() {

-        Message nmsg = mHandler.obtainMessage(MSG_SHOW_WAIT_DIALOG);

-        mHandler.sendMessageDelayed(nmsg, WAITDIALOG_DISPALY_TIME);

-

-        new Thread() {

+        private void startScanThread() {

+            Message nmsg = mHandler.obtainMessage ( MSG_SHOW_WAIT_DIALOG );

+            mHandler.sendMessageDelayed ( nmsg, WAITDIALOG_DISPALY_TIME );

+            new Thread() {

                 public void run() {

                     File[] files = new File[2];

-                    files[0] = new File("/sdcard");

-

-                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {

-                        files[1] = new File("/mnt/");

-                    } else {

-                        files[1] = new File("/storage");

-                    }

-

-                    mAdapter.getList(files);

-                    mHandler.sendEmptyMessage(MSG_HIDE_SHOW_DIALOG);

+                    files[0] = new File ( "/sdcard" );

+                    files[1] = new File ( "/storage" );

+                    mAdapter.getList ( files );

+                    mHandler.sendEmptyMessage ( MSG_HIDE_SHOW_DIALOG );

                 }

-            }.start();

-    }

-

-    @Override

-    protected void onCreate(Bundle savedInstanceState) {

-        super.onCreate(savedInstanceState);

-        mInflater = LayoutInflater.from(this);

-        setContentView(R.layout.file_list);

-        mListView = (ListView) findViewById(R.id.file_list);

-        mListView.setAdapter(mAdapter);

-        startScanThread();

-        mListView.setOnItemClickListener(this);

-    }

-

-    @Override

-    public void onItemClick(AdapterView<?> adapterView, View view,

-        int position, long id) {

-        File selectFile = (File) adapterView.getItemAtPosition(position);

-

-        /*

-         * if (selectFile.isDirectory()) { mCurrentDirectory = selectFile;

-         * FileAdapter adapter = (FileAdapter) adapterView.getAdapter();

-         * adapter.setCurrentList(selectFile); } else

-         */

-        if (selectFile.isFile()) {

-            Intent intent = new Intent();

-            intent.putExtra(FILE, selectFile.getPath());

-            setResult(0, intent);

-            finish();

-        }

-    }

-

-    public static boolean isUdisk(String dir) {

-        if ((Build.VERSION.SDK_INT == ICS404) && dir.startsWith(UDISK_ICS) &&

-                !dir.contains("sdcard")) {

-            return true;

-        } else if ((Build.VERSION.SDK_INT == JB1) && dir.startsWith(UDISK_JB1) &&

-                !dir.contains("sdcard")) {

-            return true;

-        } else if ((Build.VERSION.SDK_INT >= JB2) && dir.startsWith(UDISK_JB2) &&

-                !dir.contains("sdcard")) {

-            return true;

+            } .start();

         }

 

-        return false;

-    }

-

-    public static boolean isSdcard(String dir) {

-        if ((Build.VERSION.SDK_INT == ICS404) && dir.startsWith(SDCARD_JB)) {

-            return true;

-        } else if ((Build.VERSION.SDK_INT == JB1) && dir.startsWith(SDCARD_JB)) {

-            return true;

-        } else if ((Build.VERSION.SDK_INT >= JB2) &&

-                dir.startsWith(SDCARD_JB1)) {

-            return true;

+        @Override

+        protected void onCreate ( Bundle savedInstanceState ) {

+            super.onCreate ( savedInstanceState );

+            mInflater = LayoutInflater.from ( this );

+            setContentView ( R.layout.file_list );

+            mListView = ( ListView ) findViewById ( R.id.file_list );

+            mListView.setAdapter ( mAdapter );

+            startScanThread();

+            mListView.setOnItemClickListener ( this );

         }

 

-        return false;

-    }

-

-    public static boolean isMediaPart(String dir) {

-        return ((Build.VERSION.SDK_INT < JB2) && dir.startsWith(LOCAL) &&

-        !dir.startsWith(SDCARD_JB));

-    }

-

-    public static boolean isICSupdate() {

-        return (Build.VERSION.SDK_INT == ICS404);

-    }

-

-    /*

-     * @Override public void onBackPressed() { if (mCurrentDirectory == null ||

-     * mCurrentDirectory.getPath().equals("/sdcard")) { super.onBackPressed(); }

-     * else { mCurrentDirectory = mCurrentDirectory.getParentFile();

-     * mAdapter.setCurrentList(mCurrentDirectory); } }

-     */

-

-    // @Override

-    // public boolean onKeyDown(int keyCode, KeyEvent event) {

-    // if (keyCode == KeyEvent.KEYCODE_BACK) {

-    // if (mCurrentDirectory == null ||

-    // mCurrentDirectory.getPath().equals("/sdcard")) {

-    // return super.onKeyDown(keyCode, event);

-    // } else {

-    // mAdapter.setCurrentList(mCurrentDirectory.getParentFile());

-    // return false;

-    // }

-    // }

-    // return super.onKeyDown(keyCode, event)

-    // }

-    private class FileAdapter extends BaseAdapter {

-        private File[] mFiles;

-        private ArrayList<File> files = new ArrayList();

-

-        public void setCurrentList(File directory) {

-            File[] tempFiles = directory.listFiles(new ZipFileFilter());

-

-            for (int i = 0; (tempFiles != null) && (i < tempFiles.length);

-                    i++) {

-                if (tempFiles[i].isDirectory()) {

-                    setCurrentList(tempFiles[i]);

-                } else {

-                    files.add(tempFiles[i]);

-                }

+        @Override

+        public void onItemClick ( AdapterView<?> adapterView, View view,

+                                  int position, long id ) {

+            File selectFile = ( File ) adapterView.getItemAtPosition ( position );

+            if ( selectFile.isFile() ) {

+                Intent intent = new Intent();

+                intent.putExtra ( FILE, selectFile.getPath() );

+                setResult ( 0, intent );

+                finish();

             }

         }

 

-        public void getList(File[] dir) {

-            for (int j = 0; j < dir.length; j++) {

-                setCurrentList(dir[j]);

-            }

-

-            mFiles = new File[files.size()];

-

-            for (int i = 0; i < files.size(); i++) {

-                mFiles[i] = (File) files.get(i);

+        public static boolean isUdisk ( String dir ) {

+            if ( dir.startsWith ( UDISK ) && !dir.contains ( "sdcard" ) ) {

+                return true;

             }

-

-            mHandler.sendEmptyMessage(MSG_NOTIFY_DATACHANGE);

+            return false;

         }

 

-        @Override

-        public int getCount() {

-            return (mFiles == null) ? 0 : mFiles.length;

+        public static boolean isSdcard ( String dir ) {

+            if ( dir.startsWith ( SDCARD ) ) {

+                return true;

+            }

+            return false;

         }

 

-        @Override

-        public File getItem(int position) {

-            File file = (mFiles == null) ? null : mFiles[position];

+        private class FileAdapter extends BaseAdapter {

+                private File[] mFiles;

+                private ArrayList<File> files = new ArrayList();

+

+                public void setCurrentList ( File directory ) {

+                    File[] tempFiles = directory.listFiles ( new ZipFileFilter() );

+                    for ( int i = 0; ( tempFiles != null ) && ( i < tempFiles.length );

+                            i++ ) {

+                        if ( tempFiles[i].isDirectory() ) {

+                            setCurrentList ( tempFiles[i] );

+                        } else {

+                            files.add ( tempFiles[i] );

+                        }

+                    }

+                }

 

-            return file;

-        }

+                public void getList ( File[] dir ) {

+                    for ( int j = 0; j < dir.length; j++ ) {

+                        setCurrentList ( dir[j] );

+                    }

+                    mFiles = new File[files.size()];

+                    for ( int i = 0; i < files.size(); i++ ) {

+                        mFiles[i] = ( File ) files.get ( i );

+                    }

+                    mHandler.sendEmptyMessage ( MSG_NOTIFY_DATACHANGE );

+                }

 

-        @Override

-        public long getItemId(int position) {

-            return position;

-        }

+                @Override

+                public int getCount() {

+                    return ( mFiles == null ) ? 0 : mFiles.length;

+                }

 

-        @Override

-        public View getView(int position, View convertView, ViewGroup parent) {

-            if (convertView == null) {

-                convertView = mInflater.inflate(R.layout.large_text, null);

-            }

+                @Override

+                public File getItem ( int position ) {

+                    File file = ( mFiles == null ) ? null : mFiles[position];

+                    return file;

+                }

 

-            TextView tv = (TextView) convertView;

-            File file = mFiles[position];

-            String name = file.getPath();

-            tv.setText(name);

+                @Override

+                public long getItemId ( int position ) {

+                    return position;

+                }

 

-            return tv;

+                @Override

+                public View getView ( int position, View convertView, ViewGroup parent ) {

+                    if ( convertView == null ) {

+                        convertView = mInflater.inflate ( R.layout.large_text, null );

+                    }

+                    TextView tv = ( TextView ) convertView;

+                    File file = mFiles[position];

+                    String name = file.getPath();

+                    tv.setText ( name );

+                    return tv;

+                }

         }

-    }

 

-    class ZipFileFilter implements FilenameFilter {

-        public boolean accept(File directory, String file) {

-            String dir = directory.getPath();

-

-            if (new File(directory, file).isDirectory()) {

-                return true;

-            } else if (file.toLowerCase().endsWith(".zip") && isSdcard(dir) &&

-                    !isUdisk(dir)) {

-                return true;

-            } else if (file.toLowerCase().endsWith(".zip") && isUdisk(dir) &&

-                    !isSdcard(dir)) {

-                return true;

-            } else if (file.toLowerCase().endsWith(".zip") && isMediaPart(dir)) {

-                return true;

-            } else {

-                return false;

-            }

+        class ZipFileFilter implements FilenameFilter {

+                public boolean accept ( File directory, String file ) {

+                    String dir = directory.getPath();

+                    if ( new File ( directory, file ).isDirectory() ) {

+                        return true;

+                    } else if ( file.toLowerCase().endsWith ( ".zip" ) && isSdcard ( dir ) &&

+                                !isUdisk ( dir ) ) {

+                        return true;

+                    } else if ( file.toLowerCase().endsWith ( ".zip" ) && isUdisk ( dir ) &&

+                                !isSdcard ( dir ) ) {

+                        return true;

+                    } else {

+                        return false;

+                    }

+                }

         }

-    }

 }

diff --git a/src/com/droidlogic/otaupgrade/MainActivity.java b/src/com/droidlogic/otaupgrade/MainActivity.java
index 60db134..bd43777 100755
--- a/src/com/droidlogic/otaupgrade/MainActivity.java
+++ b/src/com/droidlogic/otaupgrade/MainActivity.java
@@ -92,7 +92,6 @@ public class MainActivity extends Activity implements OnClickListener {
     protected void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

         setContentView(R.layout.main_view);

-        hideBackUp();

         mOnlineUpdateBtn = (Button) findViewById(R.id.updatebtn);

         mLocalUpdateBtn = (Button) findViewById(R.id.btn_update_locale);

         mUpdateCertern = (Button) findViewById(R.id.btn_locale_certern);

@@ -367,17 +366,10 @@ public class MainActivity extends Activity implements OnClickListener {
             res += "/sdcard/";

         } else if (FileSelector.isUdisk(fullpath)) {

             res += "/udisk/";

-        } else if (FileSelector.isMediaPart(fullpath)) {

-            res += "/media/";

-            UpdateMode = OtaUpgradeUtils.UPDATE_RECOVERY;

         } else {

             UpdateMode = OtaUpgradeUtils.UPDATE_UPDATE;

         }

 

-        if (FileSelector.isICSupdate() && !FileSelector.isMediaPart(fullpath)) {

-            UpdateMode = OtaUpgradeUtils.UPDATE_RECOVERY;

-        }

-

         res += filename.getText().toString();

         res += ("\n--locale=" + Locale.getDefault().toString());

         res += (mWipeDate.isChecked() ? "\n--wipe_data" : "");

@@ -412,15 +404,4 @@ public class MainActivity extends Activity implements OnClickListener {
 

         return result;

     }

-

-    public void hideBackUp() {

-        if (FileSelector.isICSupdate()) {

-            TextView tv = (TextView) findViewById(R.id.backuptitle);

-            ViewGroup backupViews = (ViewGroup) findViewById(R.id.backup_layout);

-            View div = (View) findViewById(R.id.divider1);

-            div.setVisibility(View.GONE);

-            tv.setVisibility(View.GONE);

-            backupViews.setVisibility(View.GONE);

-        }

-    }

 }

diff --git a/src/com/droidlogic/otaupgrade/UpdateActivity.java b/src/com/droidlogic/otaupgrade/UpdateActivity.java
index ce449f2..08a424e 100755
--- a/src/com/droidlogic/otaupgrade/UpdateActivity.java
+++ b/src/com/droidlogic/otaupgrade/UpdateActivity.java
@@ -413,11 +413,7 @@ public class UpdateActivity extends Activity {
                         int UpdateMode = OtaUpgradeUtils.UPDATE_OTA;

 

                         if (mPreference.getScriptAsk()) {

-                            if (FileSelector.isICSupdate()) {

-                                UpdateMode = OtaUpgradeUtils.UPDATE_REBOOT;

-                            } else {

                                 UpdateMode = OtaUpgradeUtils.UPDATE_UPDATE;

-                            }

                         }

 

                         final Dialog dlg = new Dialog(UpdateActivity.this);